Changeset 35636 for main/trunk/release-kits

Timestamp:

2021-10-19T13:32:17+13:00 (3 years ago)

Author:

davidb

Message:

Further changes after testing. The previous change to this file did include the ant.jar and ant-launcher.jar files, this was insufficient to allow greenstone.jar to auto run as java -jar greenstone.jar. This is because greenstone.jar could not access the class files within ant.jar and ant-launcher.jar. Using <zipgroupfileset> element means to contents of the specified jar files are inlcuded in the jar file being generated

File:

• main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml (modified) (2 diffs)

main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml

@@ -206 +206 @@
                an instantiated object instance of FileSet.  In the case of 'antlLib' in the ant-istaller taskdef, this is
                exactly what triggered by specifying this attribute is specified.  The workaround is to create the
-               fileset explicitly below: done through <fileset>, this form can have multiple values in it.
+               fileset explicitly below: done through <zipgroupfileset>, this form can have multiple values in it
+               and has the additional property of unzipping/unjarring the specificed jar files
           -->
 
-          <fileset dir="${rk.home}/shared/core/ant-installer/lib">
-            <include name="ant.jar" />
-            <include name="ant-launcher.jar" />
-          </fileset>
-          
-          <fileset dir="installer/classes" includes="**/*" />
-          <fileset dir="components" includes="*.lzma"/>
+          <zipgroupfileset dir="${ant.home}/lib" includes="ant.jar,ant-launcher.jar" excludes="META-INF/*.SF"/>
+
+          <zipfileset dir="installer/classes" includes="**/*" />
+          <zipfileset dir="components" includes="*.lzma"/>
           
         </installer>
@@ -246 +244 @@
               See longer note on the topic in the target before this one
           -->
-          
-          <fileset dir="${ant.home}/lib">
-            <include name="ant.jar" />
-            <include name="ant-launcher.jar" />
-          </fileset>
-
-          <fileset dir="installer/classes" includes="**/*" />
+          <zipgroupfileset dir="${ant.home}/lib" includes="ant.jar,ant-launcher.jar" excludes="META-INF/*.SF"/>
+
+          <zipfileset dir="installer/classes" includes="**/*" />
         </installer>