Changeset 16175 for release-kits/lirk2/ant-scripts/create-installer.xml

Timestamp:

2008-06-25T13:33:37+12:00 (16 years ago)

Author:

oranfry

Message:

made lirk2 work under the new shared code scheme

File:

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

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-
-<!--
-        .......................................................... 
-        September 2007
-        Greenstone3 'release maker' script
-        Oran Fry
-        ..........................................................
--->
-
 <project name="lirk2-create-installer" default="create-installer">
 
@@ -24 +15 @@
             <copy todir="${basedir}/installer" file="${lirk2.home}/installer/build.xml" overwrite="true"/>
             <copy todir="${basedir}/installer/resources" overwrite="true">
-                <fileset dir="${lirk2.home}/installer/resources">
-                    <include name="*.properties"/>
-                    <include name="*.png"/>
-                </fileset>
+                <fileset dir="${lirk2.home}/greenstone2/installer-resources"/>
             </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.java}"/>
+            <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="${java.extracted}"/>
+            <rsr file="${basedir}/installer/build.xml" pattern="@java.extracted@" replacement="${linux-java.extracted}"/>
 
             <!-- put the concrete values of things in the text -->
@@ -40 +28 @@
             <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.java@" replacement="${bundled.version.linux-java}"/>
 
             <!-- chinese -->
@@ -64 +52 @@
                     installConfig="${basedir}/installer/antinstall-config.xml"
                     buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${lirk2.home}/bin/ant-installer/lib"
-                    antLib="${lirk2.home}/bin/apache-ant-1.6.5/lib"
+                    antInstallLib="${lirk2.home}/packages/ant-installer/lib"
+                    antLib="${lirk2.home}/packages/ant/lib"
                     validateConfig="true"
                     failOnError="false"
@@ -85 +73 @@
                     installConfig="${basedir}/installer/antinstall-config.xml"
                     buildFile="${basedir}/installer/build.xml"
-                    antInstallLib="${lirk2.home}/bin/ant-installer/lib"
-                    antLib="${lirk2.home}/bin/apache-ant-1.6.5/lib"
+                    antInstallLib="${lirk2.home}/packages/ant-installer/lib"
+                    antLib="${lirk2.home}/packages/ant/lib"
                     validateConfig="true"
                     failOnError="false"