Changeset 19353
- Timestamp:
- 2009-05-08T12:42:48+12:00 (15 years ago)
- Location:
- gli/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gli/trunk/client-gli.bat
r19346 r19353 68 68 69 69 :findJava 70 :: ---- Check Java exists ---- 71 set JAVAPATH= 72 73 :: Some users may set the above line manually 74 if not "%JAVAPATH%" == "" goto testJava 75 76 :: If it is set, use the JAVA_HOME environment variable 77 if not "%JAVA_HOME%" == "" goto javahome 78 79 :: Check if Java is on the search path 80 echo %PATH%| winutil\which.exe java.exe | winutil\setvar.exe JAVAPATH > setjava.bat 81 call setjava.bat 82 del setjava.bat 83 if not "%JAVAPATH%" == "" goto testJava 84 85 :: Still haven't found anything, so try looking in the registry (gulp!) 86 type nul > jdk.reg 87 regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit" 88 type jdk.reg > jdk.txt 89 del jdk.reg 90 type nul > jre.reg 91 regedit /E jre.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Runtime Environment" 92 type jre.reg > jre.txt 93 del jre.reg 94 95 winutil\findjava.exe jdk.txt jre.txt | winutil\setvar.exe JAVAPATH > setjava.bat 96 del jdk.txt 97 del jre.txt 98 call setjava.bat 99 del setjava.bat 100 101 :: If nothing was found in the registry, we're stuck 102 if "%JAVAPATH%" == "" goto noJava 103 104 set JAVAPATH=%JAVAPATH%\bin 105 goto testJava 106 107 :javahome 108 set JAVAPATH=%JAVA_HOME%\bin 109 110 :testJava 111 :: Check that a Java executable has been found 112 if "%GLILANG%" == "en" echo Checking Java: %JAVAPATH% 113 if "%GLILANG%" == "es" echo Revisando Java: %JAVAPATH% 114 if "%GLILANG%" == "fr" echo Vrification de Java: %JAVAPATH% 115 if "%GLILANG%" == "ru" echo ஢¥àª Java: %JAVAPATH% 116 if exist "%JAVAPATH%\java.exe" goto checkGLI 117 118 :noJava 119 echo. 120 if "%GLILANG%" == "en" echo Failed to locate an appropriate version of Java. You must install a 121 if "%GLILANG%" == "en" echo Java Runtime Environment (version 1.4 or greater) before running the 122 if "%GLILANG%" == "en" echo %PROGNAME_EN%. 123 124 if "%GLILANG%" == "es" echo No se pudo localizar una versi¢n apropiada de Java. Usted deber 125 if "%GLILANG%" == "es" echo instalar un Ambiente de Ejecuci¢n Java (versi¢n 1.4 o superior) 126 if "%GLILANG%" == "es" echo antes de correr la Interfaz de la %PROGFULLNAME%. 127 128 if "%GLILANG%" == "fr" echo Une version adquate de Java n'a pas pu tre localise. Vous devez 129 if "%GLILANG%" == "fr" echo installer un Java Runtime Environment (version 1.4 ou suprieur) 130 if "%GLILANG%" == "fr" echo avant de dmarrer %PROGNAME_EN%. 131 132 if "%GLILANG%" == "ru" echo ¥ 〠«®áì ®¯à¥€¥«šâì ¬¥á⮠宊€¥š¥ ᮮ⢥âáâ¢ãî饩 ¢¥àášš Java. 133 if "%GLILANG%" == "ru" echo ë €®«Šë ãáâ ®¢šâì Java Runtime Environment (¢¥àášî 1.4 š«š ¢ëè¥) ¯¥à¥€ ¢¢®€®¬ 134 if "%GLILANG%" == "ru" echo ¡š¡«š®â¥ç®£® šâ¥à䥩á %PROGNAME%. 135 goto exit 136 70 :: Need to find Java. If found, JAVA_EXECUTABLE will be set 71 call findjava.bat 72 if "%JAVA_EXECUTABLE%" == "" goto exit 137 73 138 74 :checkGLI … … 177 113 :: on the client side. If we have Perl, pass the gs2build dir with the -gsdl flag and the PERLPATH. 178 114 if "%PERLPATH%" == "" goto :nogsdl 179 "%JAVA PATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl %~dp0gs2build -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9115 "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl %~dp0gs2build -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9 180 116 goto finish 181 117 182 118 :nogsdl 183 "%JAVA PATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone %1 %2 %3 %4 %5 %6 %7 %8 %9119 "%JAVA_EXECUTABLE%" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone %1 %2 %3 %4 %5 %6 %7 %8 %9 184 120 185 121 :finish … … 198 134 set PERLPATH= 199 135 set JAVAPATH= 136 set JAVA_EXECUTABLE= 200 137 popd -
gli/trunk/findjava.bat
r19336 r19353 1 1 @echo off 2 2 3 :: Environment Variables passed in: _VERSION and GLILANG 3 :: Environment Variables passed in: _VERSION, GLILANG and 4 :: possibly also GSDLHOME and/or GSDL3SRCHOME. 4 5 :: As a result of executing this script, the JAVA_EXECUTABLE variable 5 6 :: will be set, but only if Perl was found. 6 7 8 :findJava 7 9 8 :findJava 9 if "%_VERSION%" == "2" ( 10 :: We will already be in the correct folder (GLI folder), which would 11 :: contain a compiled up search4j.exe if this GLI is part of an installation. 12 :: If search4j.exe is not there, then it means this is an SVN checkout. 13 :: In such a case, it's up to the user checking things out to ensure JAVA_HOME 14 :: is set and moreover points to the correct version of the Java. 15 16 set DISPLAY_MIN_VERSION=1.4 17 set MIN_VERSION=1.4.0_00 18 set SEARCH4J_EXECUTABLE=search4j.exe 19 if exist %SEARCH4J_EXECUTABLE% goto setJexec 20 if "%_VERSION%" == "" goto tryJava 21 :: else we look for a compiled version of search4j in a GS installation 22 if "%_VERSION%" == "2" ( 10 23 set SEARCH4J_EXECUTABLE=%GSDLHOME%\bin\windows\search4j.exe 11 24 set HINT=%GSDLHOME%\packages\jre 12 25 ) 13 if "%_VERSION%" == "3" (26 if "%_VERSION%" == "3" ( 14 27 set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe 15 28 set HINT=%GSDL3SRCHOME%\packages\jre 16 29 ) 17 18 "%SEARCH4J_EXECUTABLE%" -e -m "1.4.0_00" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat 30 if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava 31 32 :setJexec 33 "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat 19 34 call "%TMP%\set_java_executable.bat" 20 35 del "%TMP%\set_java_executable.bat" … … 28 43 goto exit 29 44 45 :tryJava 46 if "%JAVA_HOME%" == "" goto noJava 47 if not exist "%JAVA_HOME%\bin\java.exe" goto noJava 48 if "%GLILANG%" == "en" ( 49 echo. 50 echo *************************************************************************** 51 echo WARNING: 52 echo Found a JAVA_HOME at %JAVA_HOME%. Attempting to use this. 53 echo However, you need to have a Java %DISPLAY_MIN_VERSION% or higher installed. 54 echo *************************************************************************** 55 echo. 56 ) 57 :: Try to use this version 58 set JAVA_EXECUTABLE=%JAVA_HOME%\bin\java 59 goto exit 60 30 61 :noJava 31 62 echo. 32 63 if "%GLILANG%" == "en" ( 33 64 echo Failed to locate an appropriate version of Java. You must install a 34 echo Java Runtime Environment ^(version 1.4or greater^) before running the65 echo Java Runtime Environment ^(version %DISPLAY_MIN_VERSION% or greater^) before running the 35 66 echo Greenstone Librarian Interface. 36 67 ) … … 38 69 if "%GLILANG%" == "es" ( 39 70 echo No se pudo localizar una versi¢n apropiada de Java. Usted deber 40 echo instalar un Ambiente de Ejecuci¢n Java ^(versi¢n 1.4o superior^)71 echo instalar un Ambiente de Ejecuci¢n Java ^(versi¢n %DISPLAY_MIN_VERSION% o superior^) 41 72 echo antes de correr la Interfaz de la Biblioteca Digital Greenstone. 42 73 ) … … 44 75 if "%GLILANG%" == "fr" ( 45 76 echo Une version ad?quate de Java n'a pas pu ?tre localis?e. Vous devez 46 echo installer un Java Runtime Environment ^(version 1.4ou sup?rieur^)77 echo installer un Java Runtime Environment ^(version %DISPLAY_MIN_VERSION% ou sup?rieur^) 47 78 echo avant de d?marrer Greenstone Librarian Interface. 48 79 ) … … 50 81 if "%GLILANG%" == "ru" ( 51 82 echo ¥ ã «®áì ®¯à¥¥«âì ¬¥á⮠宥¥ ᮮ⢥âáâ¢ãî饩 ¢¥àá Java. 52 echo ?ë ®«ë ãáâ ®¢âì Java Runtime Environment ^(¢¥àáî 1.4« ¢ëè¥^) ¯¥à¥ ¢¢®®¬83 echo ?ë ®«ë ãáâ ®¢âì Java Runtime Environment ^(¢¥àáî %DISPLAY_MIN_VERSION% « ¢ëè¥^) ¯¥à¥ ¢¢®®¬ 53 84 echo ¡¡«®â¥ç®£® â¥à䥩á Greenstone. 54 85 ) … … 57 88 :exit 58 89 set SEARCH4J_EXECUTABLE= 90 set MIN_VERSION= 91 set DISPLAY_MIN_VERSION=
Note:
See TracChangeset
for help on using the changeset viewer.