diff options
| author | Mikko Rantalainen <mikko.rantalainen@peda.net> | 2010-05-05 16:51:40 +0300 |
|---|---|---|
| committer | Mikko Rantalainen <mikko.rantalainen@peda.net> | 2010-05-06 11:30:22 +0300 |
| commit | 7951bb92074d58feef3682e9ee89237b0dc8440f (patch) | |
| tree | 72ec1eb45ea3ce52707d664e798eb1ad7f672b70 /infrastructure | |
| parent | eae8518d5db31cc70856cf9845c6974caee04bf3 (diff) | |
| download | etherpad-7951bb92074d58feef3682e9ee89237b0dc8440f.tar.gz etherpad-7951bb92074d58feef3682e9ee89237b0dc8440f.tar.xz etherpad-7951bb92074d58feef3682e9ee89237b0dc8440f.zip | |
Make scala library JAR location configurable
scala-library.jar may be in $SCALA_HOME/lib or in $SCALA_HOME.
Make it possible to point directly to scala-library.jar anywhere.
Diffstat (limited to 'infrastructure')
| -rwxr-xr-x | infrastructure/bin/makejar.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/infrastructure/bin/makejar.sh b/infrastructure/bin/makejar.sh index feace68..46b4609 100755 --- a/infrastructure/bin/makejar.sh +++ b/infrastructure/bin/makejar.sh @@ -32,11 +32,11 @@ fi TMPSTORE=/tmp/ajbuild-tmpstore-`date +%s` -JARFILES=`echo $SCALA_HOME/scala-library.jar lib/*.jar lib/manifest` +JARFILES=`echo $SCALA_LIBRARY_JAR lib/*.jar lib/manifest` function genjar { echo "unzipping JARs..." pushd $1 >> /dev/null - $JAR xf $SCALA_HOME/scala-library.jar + $JAR xf $SCALA_LIBRARY_JAR rm -rf META-INF for a in ../../lib/*.jar; do $JAR xf $a |