Changeset 16817 for release-kits/wirk2/ant-scripts/create-installer.xml

Timestamp:

2008-08-15T15:20:32+12:00 (16 years ago)

Author:

oranfry

Message:

fixed installer sourcecode target, use shared code from rk2 targets and show compnent sizes in wirk2

File:

• release-kits/wirk2/ant-scripts/create-installer.xml (modified) (2 diffs)

release-kits/wirk2/ant-scripts/create-installer.xml

@@ -3 +3 @@
 
     <target name="create-installer">
-        <antcall target="setup-for-installer-creation"/>
+        <antcall target="copy-installer-files"/>
+        <antcall target="make-installer-files-concrete"/> <!-- from rk2-targets -->
         <antcall target="compile-installer"/>
     </target>
 
-    <target name="setup-for-installer-creation">
+    <target name="copy-installer-files">
+        <echo>Copying installer files</echo>
         <mkdir dir="${basedir}/installer/classes"/>
         <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
@@ -16 +18 @@
             <fileset dir="${wirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
         </copy>
-        
-        <!-- put the concrete values of things in the config -->
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-        <rsr file="${basedir}/installer/build.xml" pattern="@version@" replacement="${version}"/>
-                                
-        <!-- put the concrete values of things in the text -->
-        <!-- default -->
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
-        
-        <!-- chinese -->
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.windows-java}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-        <rsr file="${basedir}/installer/classes/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
     </target>