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

Timestamp:

2008-06-26T11:54:45+12:00 (16 years ago)

Author:

oranfry

Message:

made wirk3 work with the new shared code scheme

File:

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

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-        September 2007
-        Greenstone3 'release maker' script
-        Oran Fry
-        ..........................................................
--->
-
 <project name="wirk3-create-installer" default="create-installer">
 
@@ -19 +10 @@
         <if><bool><istrue value="${execute}"/></bool>
             
-            <mkdir dir="${basedir}/installer"/>
+            <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/resources">
-                <fileset dir="${wirk3.home}/installer/resources-windows"/>
-                <fileset dir="${wirk3.home}/installer/resources-greenstone3"/>
+            <copy todir="${basedir}/installer/classes">
+                <fileset dir="${wirk3.home}/windows/installer-classes"/>
+                <fileset dir="${wirk3.home}/greenstone3/installer-classes"/>
             </copy>
             
@@ -33 +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}"/>
             
             
@@ -58 +49 @@
                     installConfig="${basedir}/installer/antinstall-config.xml"
                     buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${wirk3.home}/bin/ant-installer/lib"
-                    antLib="${wirk3.home}/bin/ant-installer/antlib"
+                    antInstallLib="${wirk3.home}/packages/ant-installer/lib"
+                    antLib="${wirk3.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="${wirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 
@@ -77 +68 @@
                 <zipfileset dir="${basedir}/distribution/greenstone3/winutil" prefix="winutil"><include name="**/*"/></zipfileset>
                 <zipfileset dir="${basedir}/distribution/greenstone3/src" prefix="src"><include name="**/*"/></zipfileset>
-
+                
             </installer>
-
             
         </if>