Skip to content

Commit f049e3e

Browse files
authored
install clara from coatjava build script (#876)
1 parent 04906a3 commit f049e3e

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

build-coatjava.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ usage='''build-coatjava.sh [OPTIONS]... [MAVEN_OPTIONS]...
2424
--xrootd use xrootd to download field maps
2525
--cvmfs use cvmfs to download field maps
2626
27+
--clara install clara too
28+
2729
--help show this message
2830
2931
MAVEN_OPTIONS
@@ -38,6 +40,7 @@ downloadMaps="yes"
3840
runUnitTests="no"
3941
useXrootd=false
4042
useCvmfs=false
43+
installClara=false
4144
mvnArgs=()
4245
wgetArgs=()
4346
for xx in $@
@@ -59,6 +62,7 @@ do
5962
;;
6063
--xrootd) useXrootd=true ;;
6164
--cvmfs) useCvmfs=true ;;
65+
--clara) installClara=true ;;
6266
-h|--help)
6367
echo "$usage"
6468
exit 2
@@ -69,6 +73,7 @@ done
6973

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

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

131136
# always clean the installation prefix
132-
rm -rf $prefix_dir
137+
rm -rf $prefix_dir $clara_home
133138

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

218+
if $installClara; then ./install-clara -c $prefix_dir $clara_home; fi
219+
213220
echo "COATJAVA SUCCESSFULLY BUILT !"

install-clara

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ function litter() {
4242
function check() {
4343
if compgen -G "$clara_home/lib/jclara-*.jar" > /dev/null
4444
then
45-
echo -e "\n\$CLARA_HOME installed at:\n\t$clara_home"
45+
echo -e "\n\$CLARA_HOME installed at:\n\t$clara_home\n"
4646
else
4747
echo -e "\n\$CLARA_HOME installed but looks broken:\n\t$clara_home"
4848
fi

0 commit comments

Comments
 (0)