Changeset 15227 for other-projects/trunk

Timestamp:

2008-04-28T13:50:05+12:00 (16 years ago)

Author:

ak19

Message:

Reordered some targets

File:

• other-projects/trunk/gs3-webservices-democlient/gs3democlient.bat (modified) (5 diffs)

other-projects/trunk/gs3-webservices-democlient/gs3democlient.bat

@@ -6 +6 @@
 
 :: This script must be run from within the directory in which it lives
+echo I am here
 if exist gs3democlient.bat goto start
     if "%LANGUAGE%" == "en" echo This script must be run from the directory in which it resides.
@@ -58 +59 @@
     set JAVAPATH=%JAVA_HOME%\bin
 
+
 :testJava
 :: Check that a Java executable has been found
@@ -64 +66 @@
 if "%LANGUAGE%" == "fr" echo V‚rification de Java: %JAVAPATH%
 if "%LANGUAGE%" == "ru" echo à®¢¥àª  Java: %JAVAPATH%
-if exist "%JAVAPATH%\java.exe" goto checkGS3democlient
+if exist "%JAVAPATH%\java.exe" goto checkJavaVersion
 
 :noJava
@@ -86 +88 @@
 
 
+:checkJavaVersion
+:: ---- Ensure that the JavaVersion is 1.5.x or more, run CheckJavaVersion with <required java version no prefix> <target exec program name> ---
+    "%JAVAPATH%\java" CheckJavaVersion 1.5 GS3democlient
+    if ERRORLEVEL 0 goto checkGS3democlient
+    if ERRORLEVEL -1 goto exit
+
+
 :checkGS3democlient
-:: ---- Check that the GLI has been compiled ----
-if exist "GS3democlient.jar" goto checkJavaVersion
+:: ---- Check that the GS3democlient has been compiled ----
+if exist "GS3democlient.jar" goto runGS3democlient
     echo.
     if "%LANGUAGE%" == "en" echo You need to build the GS3democlient (using "ant build-demo-client")
@@ -102 +111 @@
     if "%LANGUAGE%" == "ru" echo (šá¯®«ì§ãï "ant build-demo-client") ¯¥à¥€ ¢¢®€®¬ í⮣® áªàš¯â 
     goto exit
-
-
-:checkJavaVersion
-:: ---- Ensure that the JavaVersion is 1.5.x or more, run CheckJavaVersion with <required java version no prefix> <target exec program name> ---
-    "%JAVAPATH%\java" CheckJavaVersion 1.5 GS3democlient
-    if ERRORLEVEL 0 goto runGS3democlient
-    if ERRORLEVEL -1 goto exit