Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion build-coatjava.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ usage='''build-coatjava.sh [OPTIONS]... [MAVEN_OPTIONS]...
--xrootd use xrootd to download field maps
--cvmfs use cvmfs to download field maps

--clara install clara too

--help show this message

MAVEN_OPTIONS
Expand All @@ -38,6 +40,7 @@ downloadMaps="yes"
runUnitTests="no"
useXrootd=false
useCvmfs=false
installClara=false
mvnArgs=()
wgetArgs=()
for xx in $@
Expand All @@ -59,6 +62,7 @@ do
;;
--xrootd) useXrootd=true ;;
--cvmfs) useCvmfs=true ;;
--clara) installClara=true ;;
-h|--help)
echo "$usage"
exit 2
Expand All @@ -69,6 +73,7 @@ done

src_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
prefix_dir=$src_dir/coatjava
clara_home=$src_dir/clara

# working directory should be the source code directory
cd $src_dir
Expand Down Expand Up @@ -129,7 +134,7 @@ if [ $cleanBuild == "no" ] && [ $downloadMaps == "yes" ]; then
fi

# always clean the installation prefix
rm -rf $prefix_dir
rm -rf $prefix_dir $clara_home

# clean up any cache copies
if [ $cleanBuild == "yes" ]; then
Expand Down Expand Up @@ -210,4 +215,6 @@ for pom in $(find common-tools -name pom.xml); do
done
echo "installed coatjava to: $prefix_dir"

if $installClara; then ./install-clara -c $prefix_dir $clara_home; fi

echo "COATJAVA SUCCESSFULLY BUILT !"
2 changes: 1 addition & 1 deletion install-clara
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function litter() {
function check() {
if compgen -G "$clara_home/lib/jclara-*.jar" > /dev/null
then
echo -e "\n\$CLARA_HOME installed at:\n\t$clara_home"
echo -e "\n\$CLARA_HOME installed at:\n\t$clara_home\n"
else
echo -e "\n\$CLARA_HOME installed but looks broken:\n\t$clara_home"
fi
Expand Down