Changeset 28740


Ignore:
Timestamp:
2013-12-03T16:20:10+13:00 (10 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

Location:
other-projects/expeditee-release-kits
Files:
168 added
2 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • other-projects/expeditee-release-kits/bin/rke.bat

    r28695 r28740  
    1 cho off
     1@echo off
    22set RK_NAME=%0
    33%~dp0\rk.bat %*

  • 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

  • other-projects/expeditee-release-kits/scripts/run.bat

    r28721 r28740  
    1515:: JRE_HOME or JAVA_HOME must be set correctly to run Expeditee
    1616
    17 set java_min_version=1.8.0_00
    18 bin\windows\search4j -m %java_min_version% > nul
    19 echo.
    20 if not %ERRORLEVEL% equ 0 goto :exit
    21 
    2217:: ---- Check Java ----
    2318:chkjava
    … …  
    2621:: Need to find Java. If found, JAVA_EXECUTABLE will be set
    2722:: call findjava.bat %EXP_LANG% %PROGNAME%
    28 call "%EXPEDITEE_HOME%\findjava.bat"
     23call "%EXPEDITEE_HOME%\bin\findjava.bat"
    2924if "%JAVA_EXECUTABLE%" == "" echo **** No Java executable found& goto exit
    3025set PATH=%EXP_JAVA_HOME%\bin;%PATH%

  • other-projects/expeditee-release-kits/scripts/run.sh

    r28721 r28740  
    3030##  ---- Determine JAVA_HOME ----
    3131# JRE_HOME or JAVA_HOME must be set correctly to run this program
    32 java_min_version=1.8.0_00
    33 bin/search4j -m $java_min_version &> /dev/null
    34 # for some reason, Mac requires an echo after the above
    35 echo
    36 if [ "$?" == "0" ]; then
     32#CLASSPATH
     33# if setting classpath, see gs2-server.sh, then export it
    3734
    38     #CLASSPATH
    39     # if setting classpath, see gs2-server.sh, then export it
     35## ---- Check Java ----
     36# call the script with source, so that we have the variables it sets ($javapath)
     37exit_status=0
     38source bin/findjava.sh "$exp_lang" "$PROGNAME"
     39exit_status=$?
     40if [ "$exit_status" -eq 1 ]; then
     41    exit 1;
     42fi
     43export PATH=$javahome/bin:$PATH
    4044
    41     ## ---- Check Java ----
    42     # call the script with source, so that we have the variables it sets ($javapath)
    43     exit_status=0
    44     source bin/findjava.sh "$exp_lang" "$PROGNAME"
    45     exit_status=$?
    46     if [ "$exit_status" -eq 1 ]; then
    47         exit 1;
    48     fi
    49     export PATH=$javahome/bin:$PATH
     45# -Xdock:name      To set the name of the app in the MacOS Dock bar
     46# -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)   
     47custom_vm_args=""
     48if [ "$EXPEDITEE_OS" = "darwin" ]; then
     49    custom_vm_args="-Xdock:name=$PROGFULLNAME"
     50fi
    5051
    51     # -Xdock:name      To set the name of the app in the MacOS Dock bar
    52     # -Xdock:icon      Path to the MacOS Doc icon (not necessary for GS)   
    53     custom_vm_args=""
    54     if [ "$EXPEDITEE_OS" = "darwin" ]; then
    55         custom_vm_args="-Xdock:name=$PROGFULLNAME"
    56     fi
     52#-Xmx128M -classpath <classpath>...
    5753
    58     #-Xmx128M -classpath <classpath>...
     54"$javapath" $custom_vm_args -jar Expeditee.jar $*
    5955
    60     "$javapath" $custom_vm_args -jar Expeditee.jar $*
    61 
    62     # silent mode: when launched in the background (with & at end), need to
    63     # redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term.
    64     #"$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$GSDLOS$GSDLARCH" "$serverlang" $* > /dev/null &
    65 fi
     56# silent mode: when launched in the background (with & at end), need to
     57# redirect any STDERR (STDOUT) output to /dev/null first, else output will hog the x-term.
     58#"$javapath" $custom_vm_args org.greenstone.server.Server2 "$GSDLHOME" "$GSDLOS$GSDLARCH" "$serverlang" $* > /dev/null &
Note: See TracChangeset for help on using the changeset viewer.