Changeset 16453 for release-kits/mark2/ant-scripts/compile.xml

Timestamp:

2008-07-18T10:01:16+12:00 (16 years ago)

Author:

oranfry

Message:

the bulk of the work on the compile logic for mark2

File:

• release-kits/mark2/ant-scripts/compile.xml (modified) (7 diffs)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<project name="lirk2-compile" default="compile">
+<project name="mark2-compile" default="compile">
 
     <target name="compile">
@@ -8 +8 @@
         
         <!-- configure -->
-        <addressedcall target="add-static-to-configure-in"/>
-        <addressedcall target="set-environment-in-packages-configure"/>
         <addressedcall target="run-configure"/>
-        <addressedcall target="makefiles-add-static"/>
+        <addressedcall target="tweak-makefiles"/>
 
         <!-- make -->
         <addressedcall target="run-make"/>
-        <!-- <addressedcall target="fix-wget"/> upgraded wget, mightn't need to do this now -->
         <addressedcall target="run-make-install"/>
         <addressedcall target="copy-library-oai"/>
@@ -35 +32 @@
     </target>
 
-    <target name="add-static-to-configure-in">
-        <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="${basedir}/gsdl/configure.in" pattern="^LDFLAGS=.*$" replacement="LDFLAGS=-static"/>
-            <exec dir="${basedir}/gsdl" executable="autoconf" output="${basedir}/gsdl/configure"><arg value="configure.in"/></exec>
-        </if>
-    </target>
-
-    <target name="set-environment-in-packages-configure">
-        <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="${basedir}/gsdl/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
-        </if>
-    </target>
-
     <target name="run-configure">
         <if><bool><istrue value="${execute}"/></bool>
             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
-                <env key="LDFLAGS" value="-static"/>
+                <arg line="--with-gdbm=${mark2.home}/linux/gdbm-1.8.3"/>
             </exec>
         </if>
     </target>
 
-    <target name="makefiles-add-static">
+    <target name="tweak-makefiles">
         <if><bool><istrue value="${execute}"/></bool>
-            <rsr file="${basedir}/gsdl/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
-            <rsr file="${basedir}/gsdl/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
-            <rsr file="${basedir}/gsdl/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
-            <rsr file="${basedir}/gsdl/packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static" />
+    <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/linux/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/linux/gdbm-1.8.3/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/linux/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/linux/gdbm-1.8.3/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/linux/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/linux/gdbm-1.8.3/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/linux/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/linux/gdbm-1.8.3/lib/libgdbm.a$2" />
+    <rsr file="${basedir}/gsdl/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/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L(.)\(PACKAGES_DIR\)/expat/lib -lexpat(.*)$" replacement="$1$2(PACKAGES_DIR)/expat/lib/libexpat.a$3" />
         </if>
     </target>
@@ -71 +57 @@
     </target>
 
-    <target name="fix-wget">
-        <if><bool><istrue value="${execute}"/></bool>
-            <delete file="${basedir}/gsdl/packages/wget/wget-1.9/src/wget"/>
-            <exec dir="${basedir}/gsdl/packages/wget/wget-1.9/src" executable="gcc"><arg line="-O2 -Wall -Wno-implicit -o wget cmpt.o connect.o convert.o cookies.o ftp.o ftp-basic.o ftp-ls.o ftp-opie.o hash.o headers.o host.o html-parse.o html-url.o http.o init.o log.o main.o gen-md5.o netrc.o progress.o rbuf.o recur.o res.o retr.o safe-ctype.o snprintf.o gen_sslfunc.o url.o utils.o version.o  -lssl -lcrypto -ldl -static"/></exec>
-        </if>
-    </target>
-    
-
     <target name="run-make-install">
         <if><bool><istrue value="${execute}"/></bool>
@@ -87 +65 @@
     <target name="copy-library-oai">
         <if><bool><istrue value="${execute}"/></bool>
-            <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/linux/library"/></exec>
-            <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/linux/oaiserver"/></exec>
+            <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
+            <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
         </if>
     </target>
@@ -94 +72 @@
     <target name="strip-execs">
         <if><bool><istrue value="${execute}"/></bool>
-            <exec dir="${basedir}/gsdl/bin/linux" executable="find">
-                <arg line="! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
+            <exec dir="${basedir}/gsdl/bin/darwin" executable="find">
+                <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
             </exec>
         </if>
@@ -102 +80 @@
     <target name="build-demo-collection">
         <if><bool><istrue value="${execute}"/></bool>
-            <exec dir="${basedir}/gsdl" executable="${lirk2.home}/resources/build-demo.sh"/>
+            <exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
         </if>
     </target>
 
-
-
 </project>