Skip to content

Commit

Permalink
Merge pull request #12 from JeffersonLab/use_jlab_version_file_with_tags
Browse files Browse the repository at this point in the history
Use version_jlab.xml rather than version.xml. Puts in directory tags …
  • Loading branch information
markito3 authored Nov 25, 2018
2 parents 4d67573 + 43e49b6 commit ac65ead
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions gluex_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,17 @@ export BUILD_SCRIPTS=$GLUEX_TOP/build_scripts
rm -fv setup.sh
echo export GLUEX_TOP=$pwd_string > setup.sh
echo export BUILD_SCRIPTS=\$GLUEX_TOP/build_scripts >> setup.sh
echo source \$BUILD_SCRIPTS/gluex_env_version.sh $pwd_string/version.xml >> setup.sh
echo source \$BUILD_SCRIPTS/gluex_env_version.sh $pwd_string/version_jlab.xml >> setup.sh
rm -fv setup.csh
echo setenv GLUEX_TOP $pwd_string > setup.csh
echo setenv BUILD_SCRIPTS \$GLUEX_TOP/build_scripts >> setup.csh
echo source \$BUILD_SCRIPTS/gluex_env_version.csh $pwd_string/version.xml >> setup.csh
if [ -f version.xml ]
echo source \$BUILD_SCRIPTS/gluex_env_version.csh $pwd_string/version_jlab.xml >> setup.csh
if [ -f version_jlab.xml ]
then
echo version.xml exists, skip download
echo version_jlab.xml exists, skip download
else
echo getting version.xml from halldweb.jlab.org
wget --no-check-certificate https://halldweb.jlab.org/dist/version.xml
echo getting version_jlab.xml from halldweb.jlab.org
wget --no-check-certificate https://halldweb.jlab.org/dist/version_jlab.xml
fi
source setup.sh
make -f $BUILD_SCRIPTS/Makefile_all gluex_pass1
Expand Down

0 comments on commit ac65ead

Please sign in to comment.