Changeset 4947

Timestamp:

2003-07-16T13:58:56+12:00 (21 years ago)

Author:

mdewsnip

Message:

Added check for correct version of javac before attempting to compile.

Location:

trunk/gli

Files:

• makegli.bat (modified) (3 diffs)
• makegli.sh (modified) (2 diffs)

trunk/gli/makegli.bat

@@ -1 +1 @@
 @echo off
+
+REM Check that javac exists
+javac 2> nul
+if not errorlevel 3 goto javacExists
+
+echo Failed to locate Javac. You must install a Java Software Development Kit
+echo (version 1.4 or greater) before compiling the Greenstone Librarian Interface.
+goto End
+
+:javacExists
+
+REM Check that the version of javac is new enough (1.4.0 or higher) to compile the GLI
+javac -target 1.4 2> nul
+if not errorlevel 1 goto javacOK
+
+echo The version of the Java Software Development Kit you have installed is too
+echo old to compile the Greenstone Librarian Interface. Please install a new version
+echo of the Java SDK (version 1.4 or newer) and rerun this script.
+goto End
+
+:javacOK
 
 if "%1" == "" goto CompileAll
@@ -5 +26 @@
 :CompileDependant
 
+REM If a file has been specified at the command-line, just compile that file
 echo Compiling %1 and dependant classes
-
 javac -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar;lib/nanoxml.jar %1
-
 goto End
 
 :CompileAll
 
-echo Compiling GLI...
+REM Otherwise compile the lot...
+echo Compiling the Greenstone Librarian Interface...
 javac -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar;lib/nanoxml.jar src/org/greenstone/gatherer/*.java
 javac -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar;lib/nanoxml.jar src/org/greenstone/gatherer/cdm/*.java
@@ -33 +54 @@
 javac -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar;lib/nanoxml.jar src/org/greenstone/gatherer/util/*.java
 javac -d classes/ -sourcepath src/ -classpath classes/;lib/apache.jar;lib/calpa.jar;lib/jp.jar;lib/polloxml.jar;lib/qfslib.jar;lib/skinlf.jar;lib/nanoxml.jar src/org/greenstone/gatherer/valuetree/*.java
+echo Done!
 
 :End
-echo Done.
-

trunk/gli/makegli.sh

@@ -18 +18 @@
 fi
 
-# If a command-line argument has been specified, just compile that file
+# If a file has been specified at the command-line, just compile that file
 if [ ! "x$*" = "x" ] ; then
     echo "Compiling $*"
@@ -26 +26 @@
 
 # Otherwise compile the lot...
-echo "Compiling The Greenstone Librarian Interface..."
+echo "Compiling the Greenstone Librarian Interface..."
 javac -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/calpa.jar:lib/jp.jar:lib/polloxml.jar:lib/qfslib.jar:lib/skinlf.jar:lib/nanoxml.jar src/org/greenstone/gatherer/*.java
 javac -d classes/ -sourcepath src/ -classpath classes/:lib/apache.jar:lib/calpa.jar:lib/jp.jar:lib/polloxml.jar:lib/qfslib.jar:lib/skinlf.jar:lib/nanoxml.jar src/org/greenstone/gatherer/cdm/*.java