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

Timestamp:

2008-06-20T10:00:57+12:00 (16 years ago)

Author:

oranfry

Message:

corrections to the splitting and joining scheme, and a few fixes to make use of shared stuff

File:

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

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

@@ -14 +14 @@
         <addressedcall target="setup-for-installer-creation"/>
         <addressedcall target="compile-installer"/>
-        <!--<addressedcall target="clean-up-after-installer-creation"/>-->
     </target>
 
@@ -23 +22 @@
             <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/cp"><fileset dir="${wirk3.home}/installer/cp"/></copy>
+            <copy todir="${basedir}/installer/resources">
+                <fileset dir="${wirk3.home}/installer/resources-windows"/>
+                <fileset dir="${wirk3.home}/installer/resources-greenstone3"/>
+            </copy>
             
             <!-- put the concrete values of things in the config -->
@@ -31 +33 @@
             <!-- put the concrete values of things in the text -->
             <!-- default -->
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@version@" replacement="${version}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
             
             <!-- chinese -->
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
-            <rsr file="${basedir}/installer/cp/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@version@" replacement="${version}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@java.min.version@" replacement="${java.min.version}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.java@" replacement="${bundled.version.java}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.tomcat@" replacement="${bundled.version.tomcat}"/>
+            <rsr file="${basedir}/installer/resources/LanguagePack_zh_CN.properties" pattern="@bundled.version.ant@" replacement="${bundled.version.ant}"/>
             
             
@@ -61 +63 @@
                     icons="bluecurve">
 
-                <zipfileset dir="${basedir}/installer/cp" includes="**"/>
-                <zipfileset dir="${wirk3.home}/installer/cp-extra" includes="**"/>
+                <zipfileset dir="${basedir}/installer/resources" prefix="resources"><include name="**/*"/></zipfileset>
                 <zipfileset dir="${wirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 
@@ -82 +83 @@
         </if>
     </target>
-
-    <target name="clean-up-after-installer-creation">
-        <if><bool><istrue value="${execute}"/></bool>
-            <delete file="${basedir}/installer/antinstall-config.xml"/>
-        </if>
-    </target>
-
     
 </project>