Changeset 15227

Show
Ignore:
Timestamp:
28.04.2008 13:50:05 (12 years ago)
Author:
ak19
Message:

Reordered some targets

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • other-projects/trunk/gs3-webservices-democlient/gs3democlient.bat

    r15226 r15227  
    66 
    77:: This script must be run from within the directory in which it lives 
     8echo I am here 
    89if exist gs3democlient.bat goto start 
    910    if "%LANGUAGE%" == "en" echo This script must be run from the directory in which it resides. 
     
    5859    set JAVAPATH=%JAVA_HOME%\bin 
    5960 
     61 
    6062:testJava 
    6163:: Check that a Java executable has been found 
     
    6466if "%LANGUAGE%" == "fr" echo V‚rification de Java: %JAVAPATH% 
    6567if "%LANGUAGE%" == "ru" echo à®¢¥àª  Java: %JAVAPATH% 
    66 if exist "%JAVAPATH%\java.exe" goto checkGS3democlient 
     68if exist "%JAVAPATH%\java.exe" goto checkJavaVersion 
    6769 
    6870:noJava 
     
    8688 
    8789 
     90:checkJavaVersion 
     91:: ---- Ensure that the JavaVersion is 1.5.x or more, run CheckJavaVersion with <required java version no prefix> <target exec program name> --- 
     92    "%JAVAPATH%\java" CheckJavaVersion 1.5 GS3democlient 
     93    if ERRORLEVEL 0 goto checkGS3democlient 
     94    if ERRORLEVEL -1 goto exit 
     95 
     96 
    8897:checkGS3democlient 
    89 :: ---- Check that the GLI has been compiled ---- 
    90 if exist "GS3democlient.jar" goto checkJavaVersion 
     98:: ---- Check that the GS3democlient has been compiled ---- 
     99if exist "GS3democlient.jar" goto runGS3democlient 
    91100    echo. 
    92101    if "%LANGUAGE%" == "en" echo You need to build the GS3democlient (using "ant build-demo-client") 
     
    102111    if "%LANGUAGE%" == "ru" echo (šá¯®«ì§ãï "ant build-demo-client") ¯¥à¥€ ¢¢®€®¬ í⮣® áªàš¯â  
    103112    goto exit 
    104  
    105  
    106 :checkJavaVersion 
    107 :: ---- Ensure that the JavaVersion is 1.5.x or more, run CheckJavaVersion with <required java version no prefix> <target exec program name> --- 
    108     "%JAVAPATH%\java" CheckJavaVersion 1.5 GS3democlient 
    109     if ERRORLEVEL 0 goto runGS3democlient 
    110     if ERRORLEVEL -1 goto exit 
    111113 
    112114