Changeset 16736 for release-kits/lirk3/ant-scripts/create-distribution.xml

Timestamp:

2008-08-13T11:35:05+12:00 (16 years ago)

Author:

oranfry

Message:

changes to lirk3 after ant hack cleaned up

File:

• release-kits/lirk3/ant-scripts/create-distribution.xml (modified) (2 diffs)

release-kits/lirk3/ant-scripts/create-distribution.xml

@@ -6 +6 @@
         <antcall target="export-greenstone3" />
         <antcall target="dist-set-version-number-property" />
-        <antcall target="dist-set-gli-version" />
-        <antcall target="create-distributions-1" />
-        <antcall target="create-distributions-2" />
-        <antcall target="create-distributions-3" />
+        <antcall target="gli-set-version-numbers">
+            <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
+        </antcall>
+
+        <!-- create distributions 1, 2 and 3 -->
+        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
+            <property name="app.version" value="${version}"/>
+            <property name="branch.path" value="${branch.path}"/>
+        </ant>
+
+        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2" inheritAll="false">
+            <property name="app.version" value="${version}"/>
+            <property name="branch.path" value="${branch.path}"/>
+        </ant>
+
+        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3" inheritAll="false">
+            <property name="app.version" value="${version}"/>
+            <property name="branch.path" value="${branch.path}"/>
+        </ant>
+
         <antcall target="copy-over-build-xml" />
         <antcall target="insert-user-manual"/>
@@ -27 +43 @@
     <target name="dist-set-version-number-property">
         <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
-    </target>
-
-    <target name="dist-set-gli-version">
-        <ant antfile="${lirk3.home}/ant-scripts/shared-ant-scripts/operations-on-gli.xml" dir="${basedir}/distribution/greenstone3/gli" target="set-version-numbers"/>
-    </target>
-
-
-    <target name="create-distributions-1">
-        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-1" inheritAll="false">
-            <property name="app.version" value="${version}"/>
-            <property name="branch.path" value="${branch.path}"/>
-        </ant>
-    </target>
-
-    <target name="create-distributions-2">
-        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-2"  inheritAll="false">
-            <property name="app.version" value="${version}"/>
-            <property name="branch.path" value="${branch.path}"/>
-        </ant>
-    </target>
-
-    <target name="create-distributions-3">
-        <ant antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" target="create-distribution-3"  inheritall="false">
-            <property name="app.version" value="${version}"/>
-            <property name="branch.path" value="${branch.path}"/>
-        </ant>
     </target>