Changeset 20767


Ignore:
Timestamp:
2009-09-30T16:46:59+13:00 (13 years ago)
Author:
ak19
Message:

The file used to make reference to a winutil folder containing setvar.exe, but that only exists in the GLI folder. Now will have a copy of setvar.exe in win bin, so we will refer to that one (setup.bat needs to have been called first to know the location of win bim).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/findjava.bat

    r20656 r20767  
    2424        set HINT=%GSDLHOME%\packages\jre
    2525    )
    26         if "%_VERSION%" == "3" (
     26    if "%_VERSION%" == "3" (
    2727        set SEARCH4J_EXECUTABLE=%GSDL3SRCHOME%\bin\search4j.exe
    2828        set HINT=%GSDL3SRCHOME%\packages\jre
     
    3030    if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava
    3131
    32 :setJexec   
    33     "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat
     32:setJexec
     33    "%SEARCH4J_EXECUTABLE%" -e -m "%MIN_VERSION%" -p "%HINT%" | setvar.exe JAVA_EXECUTABLE > %TMP%\set_java_executable.bat
    3434    call "%TMP%\set_java_executable.bat"
    3535    del "%TMP%\set_java_executable.bat"
     
    4141
    4242    :: we know that works, so we can set the local javahome (for Greenstone) as well
    43     "%SEARCH4J_EXECUTABLE%" -m "%MIN_VERSION%" -p "%HINT%" | winutil\setvar.exe GS_JAVA_HOME > %TMP%\set_java_home.bat
     43    "%SEARCH4J_EXECUTABLE%" -m "%MIN_VERSION%" -p "%HINT%" | setvar.exe GS_JAVA_HOME > %TMP%\set_java_home.bat
    4444    call "%TMP%\set_java_home.bat"
    4545    del "%TMP%\set_java_home.bat"
Note: See TracChangeset for help on using the changeset viewer.