Changeset 5621

Timestamp:

2003-10-14T14:04:11+13:00 (21 years ago)

Author:

mdewsnip

Message:

Added some special code to fix the javac version detection with the new Java 1.4.2 compiler.

File:

• trunk/gli/makegli.sh (modified) (1 diff)

trunk/gli/makegli.sh

@@ -33 +33 @@
 javacOK=`$javacpath -target 1.4 2>&1`
 if [ ! "$javacOK" = "" ]; then
-    echo
-    echo "The version of the Java Development Kit you have installed is too old"
-    echo "to compile the Greenstone Librarian Interface. Please install a new"
-    echo "version of the Java SDK (version 1.4 or newer) and rerun this script."
-    exit 1
+    # Special code for javac 1.4.2, since it complains about "no source files"
+    javacOK142=`$javacpath -target 1.4 2>&1 | grep "javac: no source files"`
+    if [ "$javacOK142" = "" ]; then
+    echo
+    echo "The version of the Java Development Kit you have installed is too old"
+    echo "to compile the Greenstone Librarian Interface. Please install a new"
+    echo "version of the Java SDK (version 1.4 or newer) and rerun this script."
+    exit 1
+    fi
 fi