Changeset 6441 for trunk/gsdl3


Ignore:
Timestamp:
2004-01-12T12:40:37+13:00 (20 years ago)
Author:
mdewsnip
Message:

Moved Java checking from gs3-launch.bat into gs3-setup.bat.

Location:
trunk/gsdl3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/gsdl3/gs3-launch.bat

    r6439 r6441  
    1313call gs3-setup.bat
    1414echo.
     15if "%JAVA_HOME%" == "" goto exit
     16
    1517set CATALINA_HOME=%GSDL3HOME%\comms\jakarta\tomcat
    1618set CATALINA_OPTS="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=%GSDL3HOME% -DGSDLOS=%GSDLOS% -DGSDLHOME= -DPATH=%PATH%"
    1719
    18 
    19 :findJava
    20 :: ---- Check Java SDK exists ----
    21 set JAVAPATH=
    22 
    23 :: Some users may set the above line manually
    24 if not "%JAVAPATH%" == "" goto testJava
    25 
    26     :: If it is set, use the JAVA_HOME environment variable
    27     if not "%JAVA_HOME%" == "" goto startTomcat
    28 
    29     :: Look in the registry for Java SDK installations
    30     type nul > jdk.reg
    31     regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
    32     type jdk.reg > jdk.txt
    33     del jdk.reg
    34 
    35     winutil\findjava.exe jdk.txt | winutil\setvar.exe JAVAPATH > setjava.bat
    36     del jdk.txt
    37     call setjava.bat
    38     del setjava.bat
    39 
    40     :: If a suitable installation was found in the registry, check it
    41     if not "%JAVAPATH%" == "" goto testJava
    42 
    43 :noJava
    44     echo.
    45     echo Failed to locate an appropriate version of Java. You must install a
    46     echo Java Development Kit (version 1.4 or greater) before running the
    47     echo Greenstone 3 Digital Library Software.
    48     pause
    49     goto exit
    50 
    51 :testJava
    52 set JAVA_HOME=%JAVAPATH%
    53 
    54 
    55 :startTomcat
    5620:: ---- Start the Tomcat server ----
    5721call "%GSDL3HOME%\comms\jakarta\tomcat\bin\startup.bat"
    58 
    5922
    6023:: ---- Launch a web browser ----
    6124start http://localhost:8080/gsdl3
    6225
    63 
    6426:exit

  • trunk/gsdl3/gs3-setup.bat

    r6413 r6441  
    2727cd %GSDL3HOME%
    2828
     29:findJava
     30:: ---- Check Java SDK exists ----
     31set JAVAPATH=
     32
     33:: Some users may set the above line manually
     34if not "%JAVAPATH%" == "" goto testJava
     35
     36    :: If it is set, use the JAVA_HOME environment variable
     37    if not "%JAVA_HOME%" == "" goto exit
     38
     39    :: Look in the registry for Java SDK installations
     40    type nul > jdk.reg
     41    regedit /E jdk.reg "HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit"
     42    type jdk.reg > jdk.txt
     43    del jdk.reg
     44
     45    winutil\findjava.exe jdk.txt | winutil\setvar.exe JAVAPATH > setjava.bat
     46    del jdk.txt
     47    call setjava.bat
     48    del setjava.bat
     49
     50    :: If a suitable installation was found in the registry, check it
     51    if not "%JAVAPATH%" == "" goto testJava
     52
     53:noJava
     54    echo.
     55    echo Failed to locate an appropriate version of Java. You must install a
     56    echo Java Development Kit (version 1.4 or greater) before running the
     57    echo Greenstone 3 Digital Library Software.
     58    pause
     59    goto exit
     60
     61:testJava
     62set JAVA_HOME=%JAVAPATH%
     63
    2964:exit
Note: See TracChangeset for help on using the changeset viewer.