Changeset 21421

Timestamp:

2010-01-05T22:50:43+13:00 (14 years ago)

Author:

davidb

Message:

Previous winMake.bat always compiled up Java code, even if nothing had changed. Changed to generate .class files in more logical place, and modified jar command to pick up on them in their new location

File:

• main/trunk/greenstone2/build-src/src/java/org/nzdl/gsdl/winMake.bat (modified) (2 diffs)

main/trunk/greenstone2/build-src/src/java/org/nzdl/gsdl/winMake.bat

@@ -21 +21 @@
 :all
     echo Compiling ApplyXSLT classes ...
-    %JAVAC% %JAVACOPTIONS% -d . -classpath ..\..\.. *.java
+    %JAVAC% %JAVACOPTIONS% -d ..\..\.. -classpath ..\..\.. *.java
     %JAR% cf ApplyXSLT.jar org
+    %JAR% cvf ApplyXSLT.jar -C ..\..\..  org\nzdl\gsdl\ApplyXSLT.class org\nzdl\gsdl\ApplyXSLTUtil.class
     goto done
 
@@ -30 +31 @@
 :clean
     echo Cleaning up ApplyXSLT ...
-    if exist org rmdir /S /Q org
         if exist ApplyXSLT.jar del ApplyXSLT.jar
+        if exist ApplyXSLT.class del ApplyXSLT.class
+        if exist ApplyXSLTUtil.class del ApplyXSLTUtil.class
     goto done