Changeset 16629
- Timestamp:
- 2008-08-01 14:02:00 (5 months ago)
- Files:
-
- release-kits/lirk2/ant-scripts/compile.xml (modified) (4 diffs)
- release-kits/lirk2/ant-scripts/create-distribution.xml (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
release-kits/lirk2/ant-scripts/compile.xml
r16459 r16629 15 15 <!-- make --> 16 16 <addressedcall target="run-make"/> 17 <!-- <addressedcall target="fix-wget"/> upgraded wget, mightn't need to do this now -->18 17 <addressedcall target="run-make-install"/> 19 18 <addressedcall target="copy-library-oai"/> … … 43 42 <target name="set-environment-in-packages-configure"> 44 43 <if><bool><istrue value="${execute}"/></bool> 45 <rsr file="${basedir}/gsdl/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT="LDFLAGS=-static""/> 44 <rsr file="${basedir}/gsdl/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT="LDFLAGS=-static""/> 45 <rsr file="${basedir}/gsdl/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT="LDFLAGS=-static""/> 46 46 47 </if> 47 48 </target> … … 57 58 <target name="makefiles-add-static"> 58 59 <if><bool><istrue value="${execute}"/></bool> 59 <rsr file="${basedir}/gsdl/ packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />60 <rsr file="${basedir}/gsdl/ packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />61 <rsr file="${basedir}/gsdl/ packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" />62 <rsr file="${basedir}/gsdl/ packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static" />60 <rsr file="${basedir}/gsdl/build-src/packages/wv/wv-gs/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 61 <rsr file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/xlhtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 62 <rsr file="${basedir}/gsdl/build-src/packages/xlhtml/xlhtml-0.4.9.0/ppthtml/Makefile" pattern="^LDFLAGS =.*$" replacement="LDFLAGS = -static" /> 63 <rsr file="${basedir}/gsdl/build-src/packages/rtftohtml/rtftohtml_src/Makefile" pattern="(-o rtftohtml.{2}EXEEXT.{1})" replacement="$1 -static" /> 63 64 </if> 64 65 </target> … … 70 71 </target> 71 72 72 <target name="fix-wget">73 <if><bool><istrue value="${execute}"/></bool>74 <delete file="${basedir}/gsdl/packages/wget/wget-1.9/src/wget"/>75 <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>76 </if>77 </target>78 79 73 80 74 <target name="run-make-install"> release-kits/lirk2/ant-scripts/create-distribution.xml
r16459 r16629 33 33 34 34 <echo level="info">Setting version in src/lib/gsdlconf.h</echo> 35 <rsr file="${basedir}/distributions/web/ src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" />35 <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) ".*"" replacement="$1 "${version}"" /> 36 36 37 37 <echo level="info">Setting version in Install.sh</echo>
