Changeset 16815 for release-kits

Timestamp:

2008-08-15T15:17:47+12:00 (16 years ago)

Author:

oranfry

Message:

used shared code instaed of duplicating

Location:

release-kits/lirk2/ant-scripts

Files:

• build.xml (modified) (1 diff)
• create-installer.xml (modified) (2 diffs)

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

@@ -18 +18 @@
     <import file="shared-ant-scripts/init.xml"/>
     <import file="shared-ant-scripts/operations-on-gli.xml"/>
+    <import file="../greenstone2/ant-scripts/rk2-targets.xml"/>
     <import file="compile.xml"/>
     <import file="create-distribution.xml"/>

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

@@ -3 +3 @@
 
     <target name="create-installer">
-        <antcall target="setup-for-installer-creation"/>
+        <antcall target="copy-installer-files"/>
+        <antcall target="make-installer-files-concrete"/> <!-- from rk2-targets -->
         <antcall target="compile-installer"/>
     </target>
 
-    <target name="setup-for-installer-creation">
-
-        <echo>Getting things ready to compile the installer</echo>
+    <target name="copy-installer-files">
+        <echo>Copying installer files</echo>
         <mkdir dir="${basedir}/installer/classes"/>
         <copy todir="${basedir}/installer" file="${lirk2.home}/installer/antinstall-config.xml" overwrite="true"/>
@@ -17 +17 @@
             <fileset dir="${lirk2.home}/ant-scripts/tasks/orans" includes="RegexSearchReplace.class" />
         </copy>
-
-        <!-- put the concrete values of things in the config -->
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@version@" replacement="${version}"/>
-        <rsr file="${basedir}/installer/antinstall-config.xml" pattern="@component.size.java@" replacement="${component.size.linux-java}"/>
-        <rsr file="${basedir}/installer/build.xml" pattern="@java.min.version@" replacement="${java.min.version}"/>
-        <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
-
-        <!-- put the concrete values of things in the text -->
-        <!-- default -->
-        <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.linux-java}"/>
-
     </target>
 
     <target name="compile-installer">
-
         <!-- create the installer with java -->
         <installer file="${basedir}/installer/greenstone-${version}-linux-with-java.jar"