Changeset 17898 for release-kits/mark2/ant-scripts/create-distribution.xml

Timestamp:

2008-11-20T16:33:21+13:00 (15 years ago)

Author:

oranfry

Message:

Standardised names of directories used in release kits

• gsdl and greenstone3 -> compiled
• distribution and distributions -> distributions
• greenstone3 and web -> web

And, expect more specifically named properties files, e.g., lirk3-build.properties, wirk2-build.properties

File:

• release-kits/mark2/ant-scripts/create-distribution.xml (modified) (3 diffs)

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

@@ -5 +5 @@
 
         <antcall target="export-gsdl-gli" />
-        <antcall target="dist-set-version" />
+        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/distributions/web"/></antcall>
         <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/distributions/web/gli"/></antcall>
         <antcall target="drop-in-docs" />
@@ -47 +47 @@
     </target>
 
-    <target name="dist-set-version">
-        <echo level="info">Setting version in common-src/src/lib/gsdlconf.h</echo>
-        <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
-
-        <echo level="info">Setting version in Install.sh</echo>
-        <rsr file="${basedir}/distributions/web/Install.sh" pattern="(echo &quot;Version: ).*(&quot; .*)" replacement="$1${version}$2" />
-
-        <echo level="info">Setting version in etc/VERSION</echo>
-        <rsr file="${basedir}/distributions/web/etc/VERSION" pattern="(gsdl version: ).*" replacement="$1${version}" />
-    </target>
-
-    <target name="dist-set-gli-version">
-
-    </target>
-
     <target name="drop-in-binaries">
         <echo level="info">Dropping compiled binaries into distribution</echo>
         <delete dir="distributions/web/bin/linux" />
         <delete dir="distributions/web/bin/darwin" />
-        <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/bin/darwin distributions/web/bin"/></exec>
-        <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/library distributions/web/cgi-bin"/></exec>
-        <exec dir="${basedir}" executable="cp"><arg line="gsdl/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/bin/darwin distributions/web/bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/library distributions/web/cgi-bin"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="compiled/cgi-bin/oaiserver distributions/web/cgi-bin"/></exec>
     </target>
 
@@ -74 +59 @@
         <echo level="info">Dropping rebuilt demo collection into distribution</echo>
         <delete dir="distributions/web/collect/demo" />
-        <exec dir="${basedir}" executable="cp"><arg line="-r gsdl/collect/demo distributions/web/collect"/></exec>
+        <exec dir="${basedir}" executable="cp"><arg line="-r compiled/collect/demo distributions/web/collect"/></exec>
     </target>