Changeset 35629 for main

Timestamp:

2021-10-18T15:28:32+13:00 (3 years ago)

Author:

davidb

Message:

Two chanages: (i) newer OpenJDKs no longer include native2ascii, however newer versions of ant do (as a substitute). Also, newer versions of ant-tasks have stricker checks on how AbstractFileset.setFile() can be called, that the implementation of ant-installer violoates. The workaround is to explicitly build the antLib fileset within our create-installer.xml file rather than rely on the pre-programed behaviour of <installer> triggered by including the attribute 'antLib=...' (using the attribute triggers running the code that violates the newer/stricker API call

Location:

main/trunk/release-kits/shared/core/ant-scripts

Files:

• create-installer.xml (modified) (3 diffs)
• shared.xml (modified) (1 diff)

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

@@ -14 +14 @@
         <!-- insert the language bundle -->
         <native2ascii
-            implementation="sun"
+            implementation="default"
             encoding="UTF-8"
             src="${rk.home}/shared/core/language-strings"
@@ -191 +191 @@
             buildFile="installer/build-binary.xml"
             antInstallLib="${rk.home}/shared/core/ant-installer/lib"
-            antLib="${ant.home}/lib"
             validateConfig="true"
             icons="bluecurve">
-
-            <zipfileset dir="installer/classes" includes="**/*" />
-            <zipfileset dir="components" includes="*.lzma"/>
+          <!--
+            antLib="${ant.home}/lib"
+          -->
+
+          <!-- 
+               The follow (below) is a replacement for doing the follow up in the <installer> element (above):
+
+                 antib="${ant.home}/lib"
+               
+               The change was needed to support newer versions of ant, where the underlying taskdef FileSet API 
+               now has stricker checks, and no longer allows AbstractFileSet.setFile() to be called more than once for
+               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 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"/>
+          
         </installer>
         
@@ -215 +235 @@
             buildFile="installer/build-cdrom.xml"
             antInstallLib="${rk.home}/shared/core/ant-installer/lib"
-            antLib="${ant.home}/lib"
             validateConfig="true"
             icons="bluecurve">
 
-            <zipfileset dir="installer/classes" includes="**/*" />
+          <!--
+              The following (which had been in the element above):
+
+            antLib="${ant.home}/lib"
+
+              now needs to be done explicitly (below) due to changes in newer implementation of ant tasks
+              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="**/*" />
         </installer>
         

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

@@ -267 +267 @@
         <!-- copy language bundle into place -->
         <native2ascii
-            implementation="sun"
+            implementation="default"
             src="${rk.home}/shared/core/language-strings"
             dest="compiled/uninstaller/build/resources"/>