Changeset 25947

Timestamp:

2012-07-13T15:35:25+12:00 (12 years ago)

Author:

ak19

Message:

Makejar.bat now includes all the dictionary.properties files. The earlier omission (where only a few language properties files were included) was only noticeable when you move the classes folder out of the way so that the old GLI.jar generated did not find the additional properties files in the classes folder when these were missing in the GLI.jar file itself.

File:

• main/trunk/gli/makejar.bat (modified) (1 diff)

main/trunk/gli/makejar.bat

@@ -141 +141 @@
 winutil\zip.exe -r metadata.zip metadata >NUL
 
+
+:: Build up a list of all the loose files in the classes directory, which includes 
+:: both feedback.properties and all dictionary*.properties files, since they all need 
+:: to be included in the resulting GLI.jar file.
+:: This type of FOR statement does not recurse into subdirs, which is what we want
+:: as we want to include all the loose files in the toplevel classes dir in GLI.jar
+::for %%G in (classes\*.properties) do echo file is %%G
+set propfiles=
+for %%G in (classes\*) do (call :concat %%G)
+::echo Property files list: %propfiles%
+goto :jarcmd
+
+:concat
+set propfiles=%propfiles% %1
+goto :eof
+
+:jarcmd
 :: Jar everything up
-"%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help -C classes dictionary.properties -C classes dictionary_es.properties -C classes dictionary_fr.properties -C classes dictionary_ru.properties -C classes feedback.properties -C classes images -C classes xml -C jar com -C jar de -C jar org
+::"%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help -C classes dictionary.properties -C classes dictionary_es.properties -C classes dictionary_fr.properties -C classes dictionary_ru.properties -C classes feedback.properties -C classes images -C classes xml -C jar com -C jar de -C jar org
+
+:: include all the properties (and other loose) files in the toplevel classes directory into the GLI.jar
+:: (Do something similar to get any and all folders inside the toplevel jar folder included into GLI.jar?)
+"%JARPATH%\jar" cf GLI.jar .java.policy metadata.zip %optional% help %propfiles% -C classes images -C classes xml -C jar com -C jar de -C jar org
+
 
 :: Tidy up