Changeset 16002 for release-kits/lirk2/ant-scripts

Timestamp:

2008-06-13T15:22:02+12:00 (16 years ago)

Author:

oranfry

Message:

updates after the change of installer resources location in the repository

Location:

release-kits/lirk2/ant-scripts

Files:

• create-installer.xml (modified) (4 diffs)
• wrap.xml (modified) (1 diff)

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

@@ -19 +19 @@
         <if><bool><istrue value="${execute}"/></bool>
 
-            <echo>Project Path: ${basedir}/distribution/gsdl</echo>
-            <mkdir dir="${basedir}/installer"/>
+            <echo>Getting things ready to compile the installer</echo>
+            <mkdir dir="${basedir}/installer/resources"/>
             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/>
-            <copy todir="${basedir}/installer/cp" overwrite="true"><fileset dir="${lirk2.home}/installer/cp"/></copy>
+            <copy todir="${basedir}/installer/resources" overwrite="true">
+                <fileset dir="${lirk2.home}/installer/resources">
+                    <include name="*.properties"/>
+                    <include name="*.png"/>
+                </fileset>
+            </copy>
 
             <!-- put the concrete values of things in the config -->
@@ -33 +38 @@
             <!-- 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/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}"/>
 
             <!-- 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}"/>
             -->
 
@@ -65 +70 @@
                     icons="bluecurve">
 
-                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer" includes="resources/*"/>
                 <zipfileset dir="${lirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>
@@ -86 +91 @@
                     icons="bluecurve">
 
-                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer" includes="resources/*"/>
                 <zipfileset dir="${lirk2.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
                 <zipfileset dir="${basedir}/distributions/web" includes="**/*"/>

release-kits/lirk2/ant-scripts/wrap.xml

@@ -26 +26 @@
             <!-- copy bundled files -->
             <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/search4j/search4j"/>
-            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/wrapper/${java.installer}"/>
+            <copy todir="${basedir}/wrapped-installer/build" file="${lirk2.home}/linux/${java.installer}"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone2.jar" file="${basedir}/installer/gsdl-${version}-linux.jar"/>
             <copy tofile="${basedir}/wrapped-installer/build/greenstone2-with-java.jar" file="${basedir}/installer/gsdl-${version}-linux-with-java.jar"/>