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

Timestamp:

2008-06-26T09:46:52+12:00 (16 years ago)

Author:

oranfry

Message:

fixes to make wirk2 work after moving things around

File:

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

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

@@ -10 +10 @@
         <if><bool><istrue value="${execute}"/></bool>
             
-            <mkdir dir="${basedir}/installer"/>
+            <mkdir dir="${basedir}/installer/classes"/>
             <copy todir="${basedir}/installer" file="${wirk2.home}/installer/antinstall-config.xml"/>
             <copy todir="${basedir}/installer" file="${wirk2.home}/installer/build.xml"/>
-            <copy todir="${basedir}/installer/resources">
-                <fileset dir="${wirk2.home}/installer/resources-windows"/>
-                <fileset dir="${wirk2.home}/installer/resources-greenstone2"/>
+            <copy todir="${basedir}/installer/classes">
+                <fileset dir="${wirk2.home}/greenstone2/installer-classes"/>
+                <fileset dir="${wirk2.home}/windows/installer-classes"/>
             </copy>
             
@@ -24 +24 @@
             <!-- put the concrete values of things in the text -->
             <!-- default -->
-            <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}"/>
+            <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/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}"/>
-            
+            <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>
@@ -49 +48 @@
                 installConfig="${basedir}/installer/antinstall-config.xml"
                 buildFile="${basedir}/installer/build.xml"
-                antInstallLib="${wirk2.home}/bin/ant-installer/lib"
-                antLib="${wirk2.home}/bin/apache-ant-1.6.5/lib"
+                antInstallLib="${wirk2.home}/packages/ant-installer/lib"
+                antLib="${wirk2.home}/packages/ant/lib"
                 validateConfig="true"
                 icons="bluecurve">
                 
-                <zipfileset dir="${basedir}/installer/resources" prefix="resources"><include name="**/*"/></zipfileset>
+                <zipfileset dir="${basedir}/installer/classes"><include name="**/*"/></zipfileset>
                 <zipfileset dir="${wirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>