Changeset 17898 for release-kits/mark2/ant-scripts/compile.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/compile.xml (modified) (4 diffs)

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

@@ -6 +6 @@
         <!-- checkout -->
         <antcall target="checkout-gsdl-gli" />
+        <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
         
         <!-- configure -->
@@ -27 +28 @@
     <target name="checkout-gsdl-gli">
         <svn javahl="false">
-            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
-            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
+            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/compiled"/>
+            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/compiled/gli"/>
         </svn>
     </target>
 
     <target name="run-configure">
-        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
+        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
             <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
         </exec>
@@ -39 +40 @@
 
     <target name="tweak-makefiles">
-        <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-        <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-        <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-        <rsr file="${basedir}/gsdl/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
-        <rsr file="${basedir}/gsdl/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
-        <rsr file="${basedir}/gsdl/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
+        <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+        <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+        <rsr file="${basedir}/compiled/common-src/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+        <rsr file="${basedir}/compiled/common-src/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
+        <rsr file="${basedir}/compiled/runtime-src/src/recpt/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
+        <rsr file="${basedir}/compiled/runtime-src/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
     </target>
 
     <target name="run-make">
-        <exec dir="${basedir}/gsdl" executable="make"/>
+        <exec dir="${basedir}/compiled" executable="make"/>
     </target>
 
     <target name="run-make-install">
-        <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
+        <exec dir="${basedir}/compiled" executable="make"><arg value="install"/></exec>
     </target>
 
     <target name="copy-library-oai">
-        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
-        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
+        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/darwin/library"/></exec>
+        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/darwin/oaiserver"/></exec>
     </target>
 
     <target name="strip-execs">
-        <exec dir="${basedir}/gsdl/bin/darwin" executable="find">
+        <exec dir="${basedir}/compiled/bin/darwin" executable="find">
             <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
         </exec>
@@ -67 +68 @@
 
     <target name="build-demo-collection">
-        <exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
+        <exec dir="${basedir}/compiled" executable="${mark2.home}/resources/build-demo.sh"/>
     </target>