Skip to content

Commit 73e0577

Browse files
baltzellNathan Baltzell
andauthored
New tarball location, cleanup installer script (JeffersonLab#242)
* cleanup * switch to new clara tarball location * stop selective copy * switch to temporary version for now * fix warning message --------- Co-authored-by: Nathan Baltzell <[email protected]>
1 parent 56c7f6d commit 73e0577

File tree

2 files changed

+7
-14
lines changed

2 files changed

+7
-14
lines changed

build-coatjava.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,12 @@ cp -r etc coatjava/
9292
which python3 >& /dev/null && python=python3 || python=python
9393
$python etc/bankdefs/util/bankSplit.py coatjava/etc/bankdefs/hipo4 || exit 1
9494
mkdir -p coatjava/lib/clas
95-
#cp external-dependencies/JEventViewer-1.1.jar coatjava/lib/clas/
96-
#cp external-dependencies/vecmath-1.3.1-2.jar coatjava/lib/clas/
9795
mkdir -p coatjava/lib/utils
98-
cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils
99-
#cp external-dependencies/jaw-1.0.jar coatjava/lib/utils
10096
mkdir -p coatjava/lib/services
10197

98+
# FIXME: this is still needed by one of the tests
99+
cp external-dependencies/jclara-4.3-SNAPSHOT.jar coatjava/lib/utils
100+
102101
### clean up any cache copies ###
103102
cd common-tools/coat-lib; $mvn clean; cd -
104103

install-clara

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# Default versions:
44
grapes=2.17
5-
clara=5.0.2
5+
clara=v0
66
coatjava=10.0.8
77

88
# Abort on any non-zero exit codes:
@@ -94,7 +94,7 @@ if compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
9494
then
9595
coatjava=$(cd $coatjava && pwd)
9696
echo -e "\nUsing local COATJAVA installation:\n\t$coatjava"
97-
elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]\.[0-9]$ ]]
97+
elif ! [[ "$coatjava" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]
9898
then
9999
echo -e "\n\nWARNING: COATJAVA doesn't look like a local installation nor version number: $coatjava"
100100
fi
@@ -109,7 +109,7 @@ cd $tmp_dir
109109

110110
# CLARA:
111111
echo -e "\nRetrieving CLARA version $clara ..."
112-
get https://userweb.jlab.org/~gurjyan/clara-cre/clara-cre-$clara.tar.gz
112+
get https://clasweb.jlab.org/clas12offline/distribution/clara/clara-cre-$clara.tar.gz
113113

114114
# COATJAVA:
115115
if ! compgen -G "$coatjava/lib/clas/coat-libs-*.jar" > /dev/null
@@ -118,14 +118,8 @@ then
118118
get https://clasweb.jlab.org/clas12offline/distribution/coatjava/coatjava-$coatjava.tar.gz
119119
coatjava=./coatjava
120120
fi
121-
mkdir -p clara-cre/plugins/clas12/lib/clas
122-
mkdir -p clara-cre/plugins/clas12/lib/services
123121
mkdir -p clara-cre/plugins/clas12/config
124-
cp -Lr $coatjava/etc clara-cre/plugins/clas12/.
125-
cp -Lr $coatjava/bin clara-cre/plugins/clas12/.
126-
cp -Lr $coatjava/lib/utils clara-cre/plugins/clas12/lib/.
127-
cp -Lr $coatjava/lib/clas/* clara-cre/plugins/clas12/lib/clas/.
128-
cp -Lr $coatjava/lib/services/* clara-cre/plugins/clas12/lib/services/.
122+
cp -Lr $coatjava/etc $coatjava/bin $coatjava/lib clara-cre/plugins/clas12
129123

130124
# GRAPES:
131125
echo -e "\nRetrieving GRAPES version $grapes ..."

0 commit comments

Comments
 (0)