Show
Ignore:
Timestamp:
03.12.2013 16:20:10 (6 years ago)
Author:
ak19
Message:

Expeditee team (jts21). Add shared/windows folder with self-extracting Java 8 JRE, moved windows_wrapper.cpp to shared/windows/wrapper/wrapper.cpp, fixed run/findjava scripts

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/expeditee-release-kits/scripts/bin/findjava.bat

    r28721 r28740  
    1818set MIN_VERSION=1.8.0_00 
    1919set SEARCH4J_EXECUTABLE=search4j.exe 
     20::set HINT=%EXPEDITEE_HOME%\packages\jre 
     21set HINT=packages\jre 
    2022if exist %SEARCH4J_EXECUTABLE% goto setJexec 
    21 set SEARCH4J_EXECUTABLE=!EXPEDITEE_HOME!\bin\search4j.exe 
    22 set HINT=!EXPEDITEE_HOME!\packages\jre 
     23set SEARCH4J_EXECUTABLE=%EXPEDITEE_HOME%\bin\search4j.exe 
    2324if not exist "%SEARCH4J_EXECUTABLE%" goto tryJava 
    2425 
    2526:: JAVA_EXECUTABLE is the value returned by running search4j -e -m MIN_VERSION -p HINT 
    26 :: for /f "tokens=*" %%G in ('"%SEARCH4J_EXECUTABLE% -e -m %MIN_VERSION% -p %HINT%"') do set JAVA_EXECUTABLE=%%G 
    2727:setJexec 
    28     for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -e -m '%MIN_VERSION%' -p '%HINT%'`) do set JAVA_EXECUTABLE=%%G 
     28    for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -e -m '%MIN_VERSION%' -p %HINT%`) do set JAVA_EXECUTABLE=%%G 
     29     
    2930    if "%JAVA_EXECUTABLE%" == "" goto noJava 
    3031    echo Java: 
     
    3334 
    3435    :: we know that works, so we can set the local javahome (for Expeditee) as well 
    35     for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -m '%MIN_VERSION%' -p '%HINT%'`) do set EXP_JAVA_HOME=%%G 
     36    for /f "tokens=* usebackq" %%G in (`"%SEARCH4J_EXECUTABLE%" -m '%MIN_VERSION%' -p %HINT%`) do set EXP_JAVA_HOME=%%G 
    3637 
    3738:: found java, JAVA_EXECUTABLE and EXP_JAVA_HOME env vars set, can exit this script