Changeset 9862

Timestamp:

2005-05-12T16:17:38+12:00 (19 years ago)

Author:

mdewsnip

Message:

Removed the javac version check -- this was starting to get out of control and new versions of Java always make it worse. Not many people will be compiling the GLI and you know pretty quickly if your version of Javac isn't appropriate, so I don't think it's a big loss.

Location:

trunk/gli

Files:

• makegli.bat (modified) (2 diffs)
• makegli.sh (modified) (1 diff)

trunk/gli/makegli.bat

@@ -82 +82 @@
 if "%GLILANG%" == "fr" echo V‚rification de Javac: %JAVACPATH%
 if "%GLILANG%" == "ru" echo à®¢¥àª  Javac: %JAVACPATH%
-if exist "%JAVACPATH%\javac.exe" goto checkVer
+if exist "%JAVACPATH%\javac.exe" goto makeGLI
 
 :noJavac
@@ -104 +104 @@
     if "%GLILANG%" == "ru" echo š­â¥àä¥©á  Greenstone.
     goto exit
-
-:checkVer
-:: Check that the version of Javac is new enough (1.4.0 or higher) to compile the GLI
-"%JAVACPATH%\javac.exe" -Xstdout javacchk.tmp -target 1.4
-if not errorlevel 1 goto makeGLI
-    :: 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.
-        if "%GLILANG%" == "en" echo The version of the Java Development Kit you have installed is too old
-        if "%GLILANG%" == "en" echo to compile the Greenstone Librarian Interface. Please install a new
-        if "%GLILANG%" == "en" echo version of the Java SDK (version 1.4 or newer) and rerun this script.
-
-    if "%GLILANG%" == "es" echo La versi¢n del Kit de Desarrollo de Software de Java (SDK por sus siglas
-    if "%GLILANG%" == "es" echo en ingl‚s) que usted tiene instalada es demasiado vieja para poder compilar
-    if "%GLILANG%" == "es" echo la Interfaz de la Biblioteca Digital Greenstone. Por favor instale una nueva
-    if "%GLILANG%" == "es" echo versi¢n del Kit de Desarrollo de Software Java (versi¢n 1.4 o posterior)
-    if "%GLILANG%" == "es" echo y ejecute nuevamente este gui¢n.
-
-        if "%GLILANG%" == "fr" echo La version de Java Development Kit que vous avez install‚e est trop vieille
-        if "%GLILANG%" == "fr" echo pour compiler Greenstone Librarian Interface. Veuillez installer une nouvelle
-        if "%GLILANG%" == "fr" echo version de Java SDK (version 1.4 ou plus r‚cente) et red‚marrez ce script.
-
-        if "%GLILANG%" == "ru" echo ‚¥àášï Java Runtime Environment, ª®â®àãî ‚ë ãáâ ­®¢š«š, ®ç¥­ì áâ à , ç⮡ë ã¯à ¢«ïâì
-        if "%GLILANG%" == "ru" echo ¡š¡«š®â¥ç­ë¬ š­â¥à䥩ᮬ Greenstone. ®Š «ã©áâ , ãáâ ­®¢šâ¥ ­®¢ãî
-    if "%GLILANG%" == "ru" echo ¢¥àášî JRE (¢¥àášî 1.4 š«š ¡®«¥¥ ­®¢ãî) š ¯¥à¥ãáâ ­®¢šâ¥ íâ®â áªàš¯â
-        goto exit
 
 

trunk/gli/makegli.sh

@@ -78 +78 @@
 fi
 
-# Check that the version of javac is new enough (1.4.0 or higher) to compile the GLI
-javacOK=`$javacpath -target 1.4 2>&1`
-if [ ! "$javacOK" = "" ]; then
-    # 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"`
-    # Special code for javac 1.5, since it is different again
-    javacOK15=`$javacpath -target 1.5 2>&1 | grep "javac: no source files"`
-    if [ "$javacOK142" = "" ] && [ "$javacOK15" = "" ]; then
-    echo
-    if [ "$glilang" == "es" ]; then
-        echo "La versión del Kit de Desarrollo de Software de Java (SDK por "
-        echo "sus siglas en inglés) que usted tiene instalada es demasiado "
-        echo "vieja para poder compilar la Interfaz de la Biblioteca Digital "
-        echo "Greenstone. Por favor instale una nueva versión del Kit de "
-        echo "Desarrollo de Software Java (versión 1.4 o posterior) y ejecute "
-        echo "nuevamente este guión."
-    elif [ "$glilang" == "fr" ]; then
-        echo "La version de Java Development Kit que vous avez installée est trop"
-        echo "vieille pour compiler Greenstone Librarian Interface. Veuillez "
-        echo "installer une nouvelle version de Java SDK (version 1.4 ou plus"
-        echo "récente) et redémarrez ce script."
-    elif [ "$glilang" == "ru" ]; then
-        echo "÷ÅÒÓÉÑ Java Development Kit, ËÏÔÏÒÕÀ ÷Ù ÕÓÔÁÎÏ×ÉÌÉ, ÓÌÉÛËÏÍ ÓÔÁÒÁ,"
-        echo "ÞÔÏÂÙ ÄÁÔØ ×ÏÚÍÏÖÎÏÓÔØ ËÏÍÐÉÌÉÒÏ×ÁÔØ ÂÉÌÉÏÔÅÞÎÙÊ ÉÎÔÅÒÆÅÊÓ Greenstone."
-        echo "ðÏÖÁÌÕÊÓÔÁ, ÕÓÔÁÎÏ×ÉÔÅ ÎÏ×ÕÀ ×ÅÒÓÉÀ Java SDK (×ÅÒÓÉÀ 1.4 ÉÌÉ ÂÏÌÅÅ"
-        echo "ÎÏ×ÕÀ) É ÐÅÒÅÕÓÔÁÎÏ×ÉÔÅ ÜÔÏÔ ÓËÒÉÐÔ."
-    else
-        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."
-    fi
-    exit 1
-    fi
-fi
-
-
 ## ---- Compile the GLI ----
 echo