Changeset 6183 for trunk

Timestamp:

2003-12-09T13:58:30+13:00 (20 years ago)

Author:

mdewsnip

Message:

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

File:

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

trunk/gli/makegli.bat

@@ -59 +59 @@
 
 :checkVer
-
 :: Check that the version of Javac is new enough (1.4.0 or higher) to compile the GLI
-"%JAVACPATH%\javac.exe" -Xstdout nul -target 1.4
+"%JAVACPATH%\javac.exe" -Xstdout javacchk.tmp -target 1.4
 if not errorlevel 1 goto makeGLI
-    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.
-    goto exit
+    :: Nasty special code for javac 1.4.2, since it complains about "no source files"
+    find "javac: no source files" javacchk.tmp >nul
+    if not errorlevel 1 goto makeGLI
+        del javacchk.tmp
+        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.
+        goto exit
 
 
 :makeGLI
 :: ---- Compile the GLI ----
+del javacchk.tmp
 echo.