Changeset 35629 for main/trunk/release-kits
- Timestamp:
- 2021-10-18T15:28:32+13:00 (2 years ago)
- Location:
- main/trunk/release-kits/shared/core/ant-scripts
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/shared/core/ant-scripts/create-installer.xml
r30131 r35629 14 14 <!-- insert the language bundle --> 15 15 <native2ascii 16 implementation=" sun"16 implementation="default" 17 17 encoding="UTF-8" 18 18 src="${rk.home}/shared/core/language-strings" … … 191 191 buildFile="installer/build-binary.xml" 192 192 antInstallLib="${rk.home}/shared/core/ant-installer/lib" 193 antLib="${ant.home}/lib"194 193 validateConfig="true" 195 194 icons="bluecurve"> 196 197 <zipfileset dir="installer/classes" includes="**/*" /> 198 <zipfileset dir="components" includes="*.lzma"/> 195 <!-- 196 antLib="${ant.home}/lib" 197 --> 198 199 <!-- 200 The follow (below) is a replacement for doing the follow up in the <installer> element (above): 201 202 antib="${ant.home}/lib" 203 204 The change was needed to support newer versions of ant, where the underlying taskdef FileSet API 205 now has stricker checks, and no longer allows AbstractFileSet.setFile() to be called more than once for 206 an instantiated object instance of FileSet. In the case of 'antlLib' in the ant-istaller taskdef, this is 207 exactly what triggered by specifying this attribute is specified. The workaround is to create the 208 fileset explicitly below: done through <fileset>, this form can have multiple values in it. 209 --> 210 211 <fileset dir="${rk.home}/shared/core/ant-installer/lib"> 212 <include name="ant.jar" /> 213 <include name="ant-launcher.jar" /> 214 </fileset> 215 216 <fileset dir="installer/classes" includes="**/*" /> 217 <fileset dir="components" includes="*.lzma"/> 218 199 219 </installer> 200 220 … … 215 235 buildFile="installer/build-cdrom.xml" 216 236 antInstallLib="${rk.home}/shared/core/ant-installer/lib" 217 antLib="${ant.home}/lib"218 237 validateConfig="true" 219 238 icons="bluecurve"> 220 239 221 <zipfileset dir="installer/classes" includes="**/*" /> 240 <!-- 241 The following (which had been in the element above): 242 243 antLib="${ant.home}/lib" 244 245 now needs to be done explicitly (below) due to changes in newer implementation of ant tasks 246 See longer note on the topic in the target before this one 247 --> 248 249 <fileset dir="${ant.home}/lib"> 250 <include name="ant.jar" /> 251 <include name="ant-launcher.jar" /> 252 </fileset> 253 254 <fileset dir="installer/classes" includes="**/*" /> 222 255 </installer> 223 256 -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r34256 r35629 267 267 <!-- copy language bundle into place --> 268 268 <native2ascii 269 implementation=" sun"269 implementation="default" 270 270 src="${rk.home}/shared/core/language-strings" 271 271 dest="compiled/uninstaller/build/resources"/>
Note:
See TracChangeset
for help on using the changeset viewer.