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

release-kits/lirk2/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 -->
@@ -29 +30 @@
     <target name="checkout-gsdl-gli">
         <svn>
-            <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>
@@ -36 +37 @@
     <target name="add-static-to-configure-in">
         <rsr
-            file="${basedir}/gsdl/configure.in"
+            file="${basedir}/compiled/configure.in"
             pattern="^LDFLAGS=.*$"
             replacement="LDFLAGS=-static" />
-        <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec>
+        <exec dir="${basedir}/compiled" executable="autoconf" output="${basedir}/compiled/configure"><arg value="configure.in"/></exec>
     </target>
 
     <target name="set-environment-in-packages-configure">
         <rsr
-            file="${basedir}/gsdl/common-src/packages/configure"
+            file="${basedir}/compiled/common-src/packages/configure"
             pattern="^ENVIRONMENT=.*$"
             replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
         <rsr
-            file="${basedir}/gsdl/build-src/packages/configure"
+            file="${basedir}/compiled/build-src/packages/configure"
             pattern="^ENVIRONMENT=.*$"
             replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;" />
@@ -54 +55 @@
 
     <target name="run-configure">
-        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
+        <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure">
             <env key="LDFLAGS" value="-static"/>
         </exec>
@@ -61 +62 @@
     <target name="makefiles-add-static">
         <rsr
-            file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile"
+            file="${basedir}/compiled/build-src/packages/wv/wv-gs/Makefile"
             pattern="^LDFLAGS =.*$"
             replacement="LDFLAGS = -static" />
         <rsr
-            file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"
+            file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile"
             pattern="^LDFLAGS =.*$"
             replacement="LDFLAGS = -static" />
         <rsr
-            file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"
+            file="${basedir}/compiled/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile"
             pattern="^LDFLAGS =.*$"
             replacement="LDFLAGS = -static" />
         <rsr
-            file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile"
+            file="${basedir}/compiled/build-src/packages/rtftohtml/rtftohtml_src/Makefile"
             pattern="(-o rtftohtml.{2}EXEEXT.{1})"
             replacement="$1 -static" />
@@ -79 +80 @@
 
     <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/linux/library"/></exec>
-        <exec executable="mv"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec>
+        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/library ${basedir}/compiled/bin/linux/library"/></exec>
+        <exec executable="mv"><arg line="${basedir}/compiled/cgi-bin/oaiserver ${basedir}/compiled/bin/linux/oaiserver"/></exec>
     </target>
 
     <target name="strip-execs">
-        <exec dir="${basedir}/gsdl/bin/linux" executable="find">
+        <exec dir="${basedir}/compiled/bin/linux" executable="find">
             <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
         </exec>
@@ -99 +100 @@
 
     <target name="build-demo-collection">
-        <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/>
+        <exec dir="${basedir}/compiled" executable="${lirk2.home}/resources/build-demo.sh"/>
     </target>