Changeset 19310 for gli/trunk/client-gli.bat

Timestamp:

2009-05-01T20:24:49+12:00 (15 years ago)

Author:

ak19

Message:

1. client-gli.bat now looks for Perl if client-gli contains a gs2build directory. Only if Perl is found will it launch client-GLI in a mode that enables the GLI Download Panel (so that downloading can be done locally). Therefore, if there's a gs2build dir inside client-gli AND Perl is found, then the client-gli.bat script now launches GLI with both -gsdl and -perl options set now, so that the Download Panel becomes available in the client-gli. To make this work in a Release of client-gli, need to make sure that it contains gs2build, and--additionally for Windows--that it contains winbin.

File:

• gli/trunk/client-gli.bat (modified) (3 diffs)

gli/trunk/client-gli.bat

@@ -60 +60 @@
 if "%GLILANG%" == "ru" echo â® - ᢮¡®€­® à á¯à®áâà ­ï¥¬®¥ ¯à®£à ¬¬­®¥ ®¡¥á¯¥ç¥­š¥ š ‚ë ¬®Š¥â¥ à á¯à®áâà ­ïâì ¥£®
 
+
+:: If there's a gs2build directory is nested inside client-gli, then we 
+:: can download and build locally, but ONLY if we have perl. Else building
+:: will have to be done remotely. If Perl is found, PERLPATH will be set.
+if not exist gs2build\nul goto :findJava
+    call findperl.bat
 
 :findJava
@@ -167 +173 @@
 
 
-:: if there is a gs2build directory inside client-gli, set the gsdl flag to it
-if not exist gs2build\nul goto :nogsdl
-    "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl %~dp0gs2build %1 %2 %3 %4 %5 %6 %7 %8 %9
+:: If there was a gs2build directory inside the client-gli folder, we'd have looked for Perl.
+:: If we had found Perl, PERLPATH would have been set. If no perl, can't download or build locally
+:: on the client side. If we have Perl, pass the gs2build dir with the -gsdl flag and the PERLPATH.
+if "%PERLPATH%" == "" goto :nogsdl
+    "%JAVAPATH%\java" -Xmx128M -cp classes/;GLI.jar;lib/apache.jar;lib/qfslib.jar org.greenstone.gatherer.GathererProg -use_remote_greenstone -gsdl %~dp0gs2build -perl %PERLPATH% %1 %2 %3 %4 %5 %6 %7 %8 %9
     goto finish
 
@@ -188 +196 @@
 :done
 :: ---- Clean up ----
+set PERLPATH=
 set JAVAPATH=
 popd