Changeset 17345

Timestamp:

2008-09-19 10:03:32 (4 months ago)

Author:

oranfry

Message:

use the shared target for setting version numbers

Files:

• release-kits/lirk3/ant-scripts/compile.xml (modified) (2 diffs)
• release-kits/lirk3/ant-scripts/create-distribution.xml (modified) (3 diffs)
• release-kits/lirk3/ant-scripts/operations-on-gs3home.xml (modified) (2 diffs)

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

@@ -8 +8 @@
-
-                <!-- preparation -->
-
+
+
+
-                <ant dir="greenstone3" antfile="${lirk3.home}/ant-scripts/operations-on-gs3home.xml" target="prepare-unix"  inheritAll="false"/>
-
@@ -40 +42 @@
-                        <checkout url="${svn.root}/greenstone3/${branch.path}" destPath="greenstone3"/>
-                </svn>
-        </target>
-
-        <target name="set-version-number-property">
-                <rsr file="greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
-        </target>
-

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

@@ -4 +4 @@
-        <target name="create-distribution">
-                <!-- create distribution -->
-
-
+
+
+
+
-                <antcall target="gli-set-version-numbers">
-                        <param name="glibasedir" value="${basedir}/distribution/greenstone3/gli"/>
@@ -33 +35 @@
-        </target>
-
-
+-gli
-                <mkdir dir="distribution"/>
-                <delete dir="distribution/greenstone3"/>
@@ -40 +42 @@
-                        <export srcurl="${svn.root}/gli/${branch.path}" destPath="distribution/greenstone3/gli"/>
-                </svn>
-        </target>
-
-        <target name="dist-set-version-number-property">
-                <rsr file="distribution/greenstone3/resources/java/global.properties.in" pattern="(.*)@gsdl3version@(.*)" replacement="$1${version}$2" />
-        </target>
-

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

@@ -42 +42 @@
-                <echo>done checking out gs2build</echo>
-
-
-                <!--
-                gli is now checked out by create-distribution.xml
-                so it already exists
-                <antcall target="checkout-gli"/>
-                -->
-
-                <delete><fileset dir="." includes="*.bat"/></delete>
-                <!--<delete file="${gli.home}/gli.sh"/>-->
-                <delete file="${gli.home}/gems.sh"/>
-                <delete dir="${gs2build.home}/gs2build-extra"/>
@@ -77 +69 @@
-                <delete file="${basedir}/README-CVS.txt"/>
-                <delete file="${basedir}/TODO.txt"/>
-
-                <!-- make the extra directories needed for a release -->
-                <!--<mkdir dir="${basedir}/Linux/lib/jni"/>
-                <mkdir dir="${gs2build.home}/Unix/bin/linux"/>-->
-
-        </target>