Changeset 20594

Timestamp:

2009-09-14T12:30:23+12:00 (15 years ago)

Author:

oranfry

Message:

changed makejar.sh to prepare the entire jar contents in the jar directory, this enables stripping of .svn directories before jarring and is probably a general good move anyway

File:

• gli/trunk/makejar.sh (modified) (2 diffs)

gli/trunk/makejar.sh

@@ -41 +41 @@
 echo "Assuming that Java code is freshly compiled..."
 
-# All the GLI class files and supporting libraries are put into the "jar" directory
-if [ ! -d jar ]; then
-  mkdir jar
+rm -rf jar
+mkdir jar
 
-  cd lib
-  jar xf apache.jar com org
-  jar xf qfslib.jar de
-
-  mv com de org ../jar/.
-  cd ..
-fi
+# GLI class files and supporting libraries
+cd lib
+jar xf apache.jar com org
+jar xf qfslib.jar de
+mv com de org ../jar/.
+cd ..
 
 # Copy the latest version of the GLI classes into the jar directory
@@ -58 +56 @@
 
 # Some of the things to go into the JAR file are optional, and may not exist
-optional=
 if [ -f collect.zip ]; then
-    optional="$optional collect.zip"
+  cp collect.zip jar
 fi
 
 # Recreate the metadata.zip file (contains the GLI metadata directory)
 rm -f metadata.zip
-zip -r metadata.zip metadata >/dev/null
+zip -r jar/metadata.zip metadata >/dev/null
 
-# get the list of dictionary files
-dictionary_files=
+# Dictionary files
 cd classes
-for dict_file in dictionary*.properties ; do
-  dictionary_files="$dictionary_files -C classes $dict_file"
+for dict_file in dictionary*.properties; do
+    cp $dict_file jar
 done
 cd ..
 
+# Other required directories and files
+cp -r 'help' jar
+cp -r 'classes/images' jar
+cp -r 'classes/xml' jar
+cp 'classes/feedback.properties' jar
+cp '.java.policy' jar
+
+# Clean .svn dirs
+find jar -name '.svn' -type d -exec rm -rf {} \;
+
 # Jar everything up
-jar cf GLI.jar .java.policy metadata.zip $optional help \
-    $dictionary_files  \
-    -C classes feedback.properties -C classes images -C classes xml \
-    -C jar com -C jar de -C jar org
-
-# Tidy up
-rm -f metadata.zip
+cd jar
+jar cf ../GLI.jar *
+cd ..
 
 # Generate the GLIServer.jar file for remote building
-jar cf GLIServer.jar -C classes org/greenstone/gatherer/remote
+jar cf GLIServer.jar -C jar org/greenstone/gatherer/remote
 
 # ---- Make signed JAR file for the applet, if desired ----