Changeset 17348 for release-kits/mark3/ant-scripts

Timestamp:

2008-09-19T12:59:22+12:00 (16 years ago)

Author:

oranfry

Message:

using the shared targets for things

Location:

release-kits/mark3/ant-scripts

Files:

• compile.xml (modified) (1 diff)
• create-distribution.xml (modified) (2 diffs)
• operations-on-gs3home.xml (modified) (2 diffs)

release-kits/mark3/ant-scripts/compile.xml

@@ -8 +8 @@
 
         <!-- preparation -->
-        <antcall target="set-version-number-property" />
+        <antcall target="greenstone3-set-version-numbers">
+            <param name="greenstone3basedir" value="${basedir}/greenstone3"/>
+        </antcall>
         <antcall target="set-gdbm-installed-path" />
         <ant target="prepare-unix" dir="greenstone3" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" inheritAll="false"/>

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

@@ -4 +4 @@
     <target name="create-distribution">
         <!-- create distribution -->
-        <antcall target="export-greenstone3" />
-        <antcall target="dist-set-version-number-property" />
-        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/></antcall>
+        <antcall target="export-greenstone3-gli" />
+
+        <antcall target="greenstone3-set-version-numbers">
+            <param name="greenstone3basedir" value="${basedir}/distribution/greenstone3"/>
+        </antcall>
+
+        <antcall target="gli-set-version-numbers">
+            <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
+        </antcall>
 
         <ant target="create-distribution-1" antfile="${mark3.home}/ant-scripts/operations-on-gs3home.xml" dir="distribution/greenstone3" inheritAll="false">
@@ -28 +34 @@
         <antcall target="insert-uninstaller"/> <!-- from rk3-targets -->
         <antcall target="rename-build-xml-for-transit"/>
+        <antcall target="strip-svn-dirs"><param name="dir" value="distribution/greenstone3"/></antcall> <!-- from init -->
     </target>
 
-    <target name="export-greenstone3">
+    <target name="export-greenstone3-gli">
         <mkdir dir="distribution"/>
         <delete dir="distribution/greenstone3"/>

release-kits/mark3/ant-scripts/operations-on-gs3home.xml

@@ -39 +39 @@
     </target>
     
-
-
     <!-- creates the base distribution. Needs binaries copied in to it from other greenstones (prepare-os targets) -->
     <target name="create-distribution-1" depends="init" description="do all the initial downloading and setting up">
@@ -100 +98 @@
 
         <!-- clean up -->
-        <delete><fileset dir="${basedir}" includes="**/.svn"/></delete>
-
         <delete><fileset dir="${basedir}" includes="*.bat"/></delete>
         <delete><fileset dir="${basedir}/gli" includes="*.bat"/></delete>