Changeset 24766 for main/trunk

Timestamp:

2011-10-18T19:34:03+13:00 (13 years ago)

Author:

ak19

Message:

Makejar needs to put the org.apache classes into GLI.jar so that everything necessary is there in SignedGatherer.jar when running the GLIApplet. In order to get the org.apache classes into the gli\jar folder first, need to run the unjarring programs (such as to obtain the org.apache classes) from the batch file using the start command with the wait flag set, so that the batch script will wait for the unjarring programs to terminate before trying to move the resulting (unjarred) directories.

File:

• main/trunk/gli/makejar.bat (modified) (2 diffs)

main/trunk/gli/makejar.bat

@@ -107 +107 @@
 
 :makeJar
-:: All the GLI class files and supporting libraries are put into the "jar" directory
-
+:: All the GLI class files and supporting libraries are put into the "jar" directory.
+:: Running programs (or commands) with start /wait will wait for each program in turn to finish.
+:: This is needed when unjarring org (com and de) pkgs below, else it doesn't exist upon moving.
+:: See http://www.computerhope.com/forum/index.php?topic=83771.0 and
+:: http://stackoverflow.com/questions/4317020/windows-batch-sleep
 echo Assuming that Java code is freshly compiled...
 
@@ -115 +118 @@
 
   cd lib
-  "%JARPATH%\jar" xf apache.jar com org
-  "%JARPATH%\jar" xf qfslib.jar de
+  start "" /wait /b "%JARPATH%\jar" xf apache.jar com 
+  start "" /wait /b "%JARPATH%\jar" xf apache.jar org
+  start "" /wait /b "%JARPATH%\jar" xf qfslib.jar de
 
   move com ..\jar\com     >NUL