Changeset 16629

Show
Ignore:
Timestamp:
01.08.2008 14:02:00 (11 years ago)
Author:
oranfry
Message:

changes after gsdl divided into common, build and runtime

Location:
release-kits/lirk2/ant-scripts
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • release-kits/lirk2/ant-scripts/compile.xml

    r16459 r16629  
    1515        <!-- make --> 
    1616        <addressedcall target="run-make"/> 
    17         <!-- <addressedcall target="fix-wget"/> upgraded wget, mightn't need to do this now --> 
    1817        <addressedcall target="run-make-install"/> 
    1918        <addressedcall target="copy-library-oai"/> 
     
    4342    <target name="set-environment-in-packages-configure"> 
    4443        <if><bool><istrue value="${execute}"/></bool> 
    45             <rsr file="${basedir}/gsdl/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/> 
     44            <rsr file="${basedir}/gsdl/common-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/> 
     45            <rsr file="${basedir}/gsdl/build-src/packages/configure" pattern="^ENVIRONMENT=.*$" replacement="ENVIRONMENT=&quot;LDFLAGS=-static&quot;"/> 
     46 
    4647        </if> 
    4748    </target> 
     
    5758    <target name="makefiles-add-static"> 
    5859        <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" /> 
    6364        </if> 
    6465    </target> 
     
    7071    </target> 
    7172 
    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      
    7973 
    8074    <target name="run-make-install"> 
  • release-kits/lirk2/ant-scripts/create-distribution.xml

    r16459 r16629  
    3333 
    3434            <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) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
     35            <rsr file="${basedir}/distributions/web/common-src/src/lib/gsdlconf.h" pattern="(#define GSDL_VERSION) &quot;.*&quot;" replacement="$1 &quot;${version}&quot;" /> 
    3636 
    3737            <echo level="info">Setting version in Install.sh</echo>