Skip to content
Snippets Groups Projects
Commit 39c14811 authored by Whitney Armstrong's avatar Whitney Armstrong
Browse files

DETECTOR_PATH now $LOCAL_PREFIX/share/$DETECTOR

parent 50f7515c
No related branches found
No related tags found
1 merge request!78DETECTOR_PATH now $LOCAL_PREFIX/share/$DETECTOR
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
## - DETECTOR: the detector package we want to use for this benchmark ## - DETECTOR: the detector package we want to use for this benchmark
## - LOCAL_PREFIX: location where local packages should be installed ## - LOCAL_PREFIX: location where local packages should be installed
## - LOCAL_DATA_PATH: local storage for pipeline jobs ## - 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 ## - 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 if [ -n "${LOCAL_PREFIX}" ] ; then
source .local/bin/env.sh source .local/bin/env.sh
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
## - LOCAL_PREFIX: prefix for packages installed during the benchmark ## - LOCAL_PREFIX: prefix for packages installed during the benchmark
## - LOCAL_DATA_PATH: local storage for pipeline jobs ## - LOCAL_DATA_PATH: local storage for pipeline jobs
## - DETECTOR_PREFIX: prefix for the detector definitions ## - 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 ## Finally, it makes sure LOCAL_PREFIX and JUGGLER_PREFIX are added to PATH
## and LD_LIBRARY_PATH ## and LD_LIBRARY_PATH
...@@ -121,12 +121,12 @@ LOCAL_PREFIX=".local" ...@@ -121,12 +121,12 @@ LOCAL_PREFIX=".local"
mkdir -p "${LOCAL_PREFIX}" mkdir -p "${LOCAL_PREFIX}"
export LOCAL_PREFIX=`realpath ${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" export DETECTOR_PREFIX="${LOCAL_PREFIX}/detector"
mkdir -p ${DETECTOR_PREFIX} mkdir -p ${DETECTOR_PREFIX}
## detector path: actual detector definition path ## detector path: root path to locally installed detector definition xml files
export DETECTOR_PATH="${DETECTOR_PREFIX}/${DETECTOR}" export DETECTOR_PATH="${LOCAL_PREFIX}/share/${DETECTOR}"
## build dir for ROOT to put its binaries etc. ## build dir for ROOT to put its binaries etc.
export ROOT_BUILD_DIR=$LOCAL_PREFIX/root_build export ROOT_BUILD_DIR=$LOCAL_PREFIX/root_build
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment