Changeset 20205 for release-kits

Timestamp:

2009-08-11T10:55:22+12:00 (15 years ago)

Author:

oranfry

Message:

moved gsdl version number target to core, as greenstone3 can use it on 'gs2build'

Location:

release-kits/shared

Files:

• core/ant-scripts/init.xml (modified) (1 diff)
• greenstone2/ant-scripts/rk2-targets.xml (modified) (1 diff)

release-kits/shared/core/ant-scripts/init.xml

@@ -356 +356 @@
     </target>
 
+    <target name="gsdl-set-version-numbers">
+
+        <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo>
+        <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+
+        <echo level="info">Setting version in etc/VERSION</echo>
+        <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
+
+        <echo level="info">Setting version in server.properties</echo>
+        <rsr file="${gsdl.basedir}/lib/java/server.properties" pattern="^(Server2Control.Version[:=]).*" replacement="$1${version}" />
+
+        <echo level="info">Sneakily changing some log4j stuff</echo>
+        <rsr file="${gsdl.basedir}/lib/java/log4j.properties.in" pattern="^(log4j.category.org.greenstone.server[:=].*)INFO(.*)" replacement="$1WARN$2" />
+
+        <antcall target="gsdl-set-dates-in-readmes"><param name="gsdl.basedir" value="${gsdl.basedir}"/></antcall>
+
+    </target>
 
 </project>

release-kits/shared/greenstone2/ant-scripts/rk2-targets.xml

@@ -32 +32 @@
     </target>
 
-    <target name="gsdl-set-version-numbers">
-
-        <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo>
-        <rsr file="${gsdl.basedir}/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-
-        <echo level="info">Setting version in etc/VERSION</echo>
-        <rsr file="${gsdl.basedir}/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-
-        <echo level="info">Setting version in server.properties</echo>
-        <rsr file="${gsdl.basedir}/lib/java/server.properties" pattern="^(Server2Control.Version[:=]).*" replacement="$1${version}" />
-
-        <echo level="info">Sneakily changing some log4j stuff</echo>
-        <rsr file="${gsdl.basedir}/lib/java/log4j.properties.in" pattern="^(log4j.category.org.greenstone.server[:=].*)INFO(.*)" replacement="$1WARN$2" />
-
-        <antcall target="gsdl-set-dates-in-readmes"><param name="gsdl.basedir" value="${gsdl.basedir}"/></antcall>
-
-    </target>
-
     <target name="gsdl-set-dates-in-readmes">
         <echo level="info">Changing date and version in the docs</echo>