Changeset 16003 for release-kits/lirk3/ant-scripts

Timestamp:

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

Author:

oranfry

Message:

updates after the change of installer resources location in the repository

Location:

release-kits/lirk3/ant-scripts

Files:

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

release-kits/lirk3/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>
 
@@ -28 +27 @@
 
             <echo>Project Path: ${basedir}/distribution/greenstone3</echo>
-            <mkdir dir="${basedir}/installer"/>
+
+            <echo>Getting things ready to compile the installer</echo>
+            <mkdir dir="${basedir}/installer/resources"/>
             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/antinstall-config.xml" overwrite="true" />
             <copy todir="${basedir}/installer" file="${lirk3.home}/installer/build.xml" overwrite="true" />
-            <copy todir="${basedir}/installer/cp" overwrite="true"><fileset dir="${lirk3.home}/installer/cp"/></copy>
+            <copy todir="${basedir}/installer/resources" overwrite="true">
+                <fileset dir="${lirk3.home}/installer/resources">
+                    <include name="*.properties"/>
+                    <include name="*.png"/>
+                </fileset>
+            </copy>
 
             <!-- put the concrete values of things in the config -->
@@ -46 +52 @@
 
             <!-- 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}"/>
 
         </if>
@@ -77 +83 @@
 
                 <!-- copy all the important files into the archive to be extracted for install -->
-                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer" includes="resources/*"/>
                 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 
@@ -107 +113 @@
                     icons="bluecurve">
 
-                <zipfileset dir="${basedir}/installer/cp" includes="resources/*"/>
+                <zipfileset dir="${basedir}/installer" includes="resources/*"/>
                 <zipfileset dir="${lirk3.home}/ant-scripts/tasks/orans"><include name="RegexSearchReplace.class"/></zipfileset>
 
@@ -124 +130 @@
     </target>
 
-    <target name="clean-up-after-installer-creation">
-        <if><bool><istrue value="${execute}"/></bool>
-            <delete file="${basedir}/installer/antinstall-config.xml"/>
-            <delete file="${basedir}/installer/build.xml"/>
-        </if>
-    </target>
-
-
 </project>

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

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