diff --git a/bin/build_detector.sh b/bin/build_detector.sh index 827ea2873f731a47e7574a619fb1b2e263bc605d..7d9ef36a50b0c009f34be1a229209bfa81a1ae6b 100755 --- a/bin/build_detector.sh +++ b/bin/build_detector.sh @@ -11,9 +11,9 @@ ## - DETECTOR: the detector package we want to use for this benchmark ## - LOCAL_PREFIX: location where local packages should be installed ## - LOCAL_DATA_PATH: local storage for pipeline jobs -## - DETECTOR_PREFIX: prefix for the detector definitions +## - DETECTOR_PREFIX: prefix for the detector definition repositories ## - DETECTOR_PATH: full path for the detector definitions -## this is the same as ${DETECTOR_PREFIX}/${DETECTOR} +## this is the same as ${LOCAL_PREFIX}/share/${DETECTOR} if [ -n "${LOCAL_PREFIX}" ] ; then source .local/bin/env.sh diff --git a/bin/env.sh b/bin/env.sh index 1763a48d9d77872a8b7089aa44ff1cd50b8b7326..9db3a4d1664ca1fabc68470e7a160dcc6fa86aaa 100755 --- a/bin/env.sh +++ b/bin/env.sh @@ -18,7 +18,7 @@ ## - LOCAL_PREFIX: prefix for packages installed during the benchmark ## - LOCAL_DATA_PATH: local storage for pipeline jobs ## - DETECTOR_PREFIX: prefix for the detector definitions -## - DETECTOR_PATH: actual path with the detector definitions +## - DETECTOR_PATH: root path to locally installed detector definition xml files ## ## Finally, it makes sure LOCAL_PREFIX and JUGGLER_PREFIX are added to PATH ## and LD_LIBRARY_PATH @@ -121,12 +121,12 @@ LOCAL_PREFIX=".local" mkdir -p "${LOCAL_PREFIX}" export LOCAL_PREFIX=`realpath ${LOCAL_PREFIX}` -## detector prefix: prefix for the detector definitions +## detector prefix: prefix for the detector definition repositories export DETECTOR_PREFIX="${LOCAL_PREFIX}/detector" mkdir -p ${DETECTOR_PREFIX} -## detector path: actual detector definition path -export DETECTOR_PATH="${DETECTOR_PREFIX}/${DETECTOR}" +## detector path: root path to locally installed detector definition xml files +export DETECTOR_PATH="${LOCAL_PREFIX}/share/${DETECTOR}" ## build dir for ROOT to put its binaries etc. export ROOT_BUILD_DIR=$LOCAL_PREFIX/root_build