Changeset 23359 for main/trunk/gli

Timestamp:

2010-11-30T14:25:11+13:00 (13 years ago)

Author:

sjm84

Message:

makegli.sh will now use the JAVAC and JAVACFLAGS environment variables if they are set. JAVACFLAGS will default to "-target 1.4 and -source 1.4" by default

File:

• main/trunk/gli/makegli.sh (modified) (4 diffs)

main/trunk/gli/makegli.sh

@@ -35 +35 @@
 if [ "x$javacpath" = "x" ]; then
 
+    # If the JAVAC environment variable is set then use it
+    if [ "x$JAVAC" != "x" ] ; then
+    javacpath=$JAVAC
     # If it is set, use the JAVA_HOME environment variable
-    if [ "x$JAVA_HOME" != "x" ]; then
+    elif [ "x$JAVA_HOME" != "x" ]; then
     javacpath="$JAVA_HOME/bin/javac"
-
     # Check if Javac is on the search path
     else
     javacpath=`which javac 2> /dev/null`
     fi
+fi
+
+if [ "xJAVACFLAGS" = "x" ] ; then
+    JAVACFLAGS="-source 1.4 -target 1.4"
 fi
 
@@ -93 +99 @@
     fi
 
-    $javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar $*
+    $javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar $*
 
     if [ "$glilang" = "es" ]; then
@@ -123 +129 @@
 
 # Compile the GLI
-$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar src/org/greenstone/gatherer/GathererProg.java
-$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar src/org/greenstone/gatherer/GathererApplet.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar src/org/greenstone/gatherer/GathererProg.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar src/org/greenstone/gatherer/GathererApplet.java
 #$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/qfslib.jar src/org/greenstone/gatherer/GathererApplet4gs3.java
 # Compile the GEMS
@@ -130 +136 @@
 
 # Compile the standalone programs needed on the server for remote building
-$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/ src/org/greenstone/gatherer/remote/Zip*.java
-$javacpath -deprecation -d classes/ -sourcepath src/ -classpath classes/ src/org/greenstone/gatherer/remote/Unzip.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/ src/org/greenstone/gatherer/remote/Zip*.java
+$javacpath $JAVACFLAGS -deprecation -d classes/ -sourcepath src/ -classpath classes/ src/org/greenstone/gatherer/remote/Unzip.java
 
 if [ "$glilang" = "es" ]; then