From 4fe688dae02de29efeec0875457249a4a03dbb16 Mon Sep 17 00:00:00 2001 From: Joschka Lingemann Date: Mon, 20 Mar 2017 18:24:04 +0100 Subject: [PATCH 1/2] Add checks for DAG, show errors also on Mac --- init.sh | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/init.sh b/init.sh index ceff5e00..59b6bba2 100644 --- a/init.sh +++ b/init.sh @@ -10,18 +10,27 @@ fi if [[ "$unamestr" == 'Linux' ]]; then platform='Linux' if [[ -d /cvmfs/fcc.cern.ch/sw ]] ; then - #should check domain to make sure we're at CERN - #or is this software available somewhere in Lyon? - source /cvmfs/fcc.cern.ch/sw/0.8/init_fcc_stack.sh + #should check domain to make sure we're at CERN + #or is this software available somewhere in Lyon? + source /cvmfs/fcc.cern.ch/sw/0.8/init_fcc_stack.sh else - if [ -z "$PODIO" ]; then - echo "[ERROR] no podio setup detected, make sure it is setup" - exit 1 + if [ ! -z "$PODIO" ]; then + export LD_LIBRARY_PATH=$FCCEDM/lib:$PODIO/lib:$LD_LIBRARY_PATH fi - export LD_LIBRARY_PATH=$FCCEDM/lib:$PODIO/lib:$LD_LIBRARY_PATH fi elif [[ "$unamestr" == 'Darwin' ]]; then platform='Darwin' - export DYLD_LIBRARY_PATH=$FCCEDM/lib:$DYLD_LIBRARY_PATH:$PODIO/lib + if [ ! -z "$PODIO" ]; then + export DYLD_LIBRARY_PATH=$FCCEDM/lib:$DYLD_LIBRARY_PATH:$PODIO/lib + fi +fi +if [ -z "$PODIO" ]; then + echo "[ERROR] no podio setup detected, make sure it is setup" + exit 1 fi +if [ -z "$FCCDAG" ]; then + echo "[ERROR] no dag setup detected, make sure it is setup by setting the FCCDAG environment variable or adding it to your cmake prefix path" + exit 1 +fi + echo platform detected: $platform From 0765dbe39110c2e94948c4e9be4615d0ae6a2c6c Mon Sep 17 00:00:00 2001 From: Joschka Lingemann Date: Mon, 20 Mar 2017 18:24:45 +0100 Subject: [PATCH 2/2] Add dag dependency to README. --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 18e822c7..394f3e02 100644 --- a/README.md +++ b/README.md @@ -31,13 +31,19 @@ On Mac OS or Ubuntu, you need to install the following software. https://github.com/HEP-FCC/podio +### Directed Acyclic Graph + +https://github.com/HEP-FCC/dag + Setting up -- Before compiling or using: -1. If on Mac OS, Ubuntu or using a custom PODIO installation, set up the PODIO environment. +1. If on Mac OS, Ubuntu or using a custom installations: + - set up the PODIO environment (sourcing the PODIO `init.sh`) + - set up the dag environment (set the FCCDAG environment variable to the install directory) 2. Set up the FCC-EDM environment: ```