Changeset 16629 for release-kits/lirk2/ant-scripts

Timestamp:

2008-08-01T14:02:00+12:00 (16 years ago)

Author:

oranfry

Message:

changes after gsdl divided into common, build and runtime

Location:

release-kits/lirk2/ant-scripts

Files:

• compile.xml (modified) (4 diffs)
• create-distribution.xml (modified) (1 diff)

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

@@ -15 +15 @@
         <!-- 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"/>
@@ -43 +42 @@
     <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;"/>
+            <rsr file="${basedir}/gsdl/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
+            <rsr file="${basedir}/gsdl/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/>
+
         </if>
     </target>
@@ -57 +58 @@
     <target name="makefiles-add-static">
         <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/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" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />
+            <rsr file="${basedir}/gsdl/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" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static" />
         </if>
     </target>
@@ -70 +71 @@
     </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">

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

@@ -33 +33 @@
 
             <echo level="info">Setting version in src/lib/gsdlconf.h</echo>
-            <rsr file="${basedir}/distributions/web/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" />
+            <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>