Changeset 16748 for release-kits/wirk3/ant-scripts/create-installer.xml

Timestamp:

2008-08-13T11:48:29+12:00 (16 years ago)

Author:

oranfry

Message:

changes to wirk3 after ant cleaned up

File:

• release-kits/wirk3/ant-scripts/create-installer.xml (modified) (1 diff)

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

@@ -3 +3 @@
 
     <target name="create-installer">
-        <addressedcall target="setup-for-installer-creation"/>
-        <addressedcall target="compile-installer"/>
+        <antcall target="calculate-component-sizes"/> <!-- from rk3-targets -->
+        <antcall target="copy-installer-files"/>
+        <antcall target="make-installer-files-concrete"/> <!-- from rk3-targets -->
+        <antcall target="compile-installer"/>
     </target>
 
-    <target name="setup-for-installer-creation">
-        <if><bool><istrue value="${execute}"/></bool>
-            
-            <mkdir dir="${basedir}/installer/resources"/>
-            <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/>
-            <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/>
-            <copy todir="${basedir}/installer/classes">
-                <fileset dir="${wirk3.home}/windows/installer-classes"/>
-                <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
-                <fileset dir="${wirk3.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}"/>
-            
-            
-        </if>
+    <target name="copy-installer-files">
+        <mkdir dir="${basedir}/installer/resources"/>
+        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/antinstall-config.xml"/>
+        <copy todir="${basedir}/installer" file="${wirk3.home}/installer/build.xml"/>
+        <copy todir="${basedir}/installer/classes">
+            <fileset dir="${wirk3.home}/windows/installer-classes"/>
+            <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
+            <fileset dir="${wirk3.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
+        </copy>
     </target>
 
     <target name="compile-installer">
-        <if><bool><istrue value="${execute}"/></bool>
+        <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
+                compress="true"
+                extractType="NonExtractor"
+                installConfig="${basedir}/installer/antinstall-config.xml"
+                buildFile="${basedir}/installer/build.xml"
+                antInstallLib="${wirk3.home}/packages/ant-installer/lib"
+                antLib="${wirk3.home}/packages/ant/lib"
+                validateConfig="true"
+                icons="bluecurve">
+
+            <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
+            <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*" />
             
-            <installer file="${basedir}/installer/greenstone-${version}-win32.jar"
-                    compress="true"
-                    extractType="NonExtractor"
-                    installConfig="${basedir}/installer/antinstall-config.xml"
-                    buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${wirk3.home}/packages/ant-installer/lib"
-                    antLib="${wirk3.home}/packages/ant/lib"
-                    validateConfig="true"
-                    icons="bluecurve">
-
-                <zipfileset dir="${basedir}/installer/classes" includes="**/*" />
-                <zipfileset dir="${basedir}/distribution/greenstone3" includes="**/*" />
-                
-            </installer>
-            
-        </if>
+        </installer>
     </target>