Ignore:
Timestamp:
2008-08-13T11:40:57+12:00 (16 years ago)
Author:
oranfry
Message:

changes to mark2 after ant hack cleaned up

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r16519 r16741  
    55
    66        <!-- checkout -->
    7         <addressedcall target="checkout-gsdl-gli" />
     7        <antcall target="checkout-gsdl-gli" />
    88       
    99        <!-- configure -->
    10         <addressedcall target="run-configure"/>
    11         <addressedcall target="tweak-makefiles"/>
     10        <antcall target="run-configure"/>
     11        <antcall target="tweak-makefiles"/>
    1212
    1313        <!-- make -->
    14         <addressedcall target="run-make"/>
    15         <addressedcall target="run-make-install"/>
    16         <addressedcall target="copy-library-oai"/>
    17         <addressedcall target="strip-execs"/>
     14        <antcall target="run-make"/>
     15        <antcall target="run-make-install"/>
     16        <antcall target="copy-library-oai"/>
     17        <antcall target="strip-execs"/>
    1818
    1919        <!-- build collections -->
    20         <addressedcall target="build-demo-collection" />
     20        <antcall target="build-demo-collection" />
    2121
    2222    </target>
    2323
    2424    <target name="checkout-gsdl-gli">
    25         <if><bool><istrue value="${execute}"/></bool>
    26             <svn>
    27                 <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
    28                 <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
    29             </svn>
    30         </if>
     25        <svn>
     26            <checkout url="${svn.root}/gsdl/${branch.path}" destPath="${basedir}/gsdl"/>
     27            <checkout url="${svn.root}/gli/${branch.path}" destPath="${basedir}/gsdl/gli"/>
     28        </svn>
    3129    </target>
    3230
    3331    <target name="run-configure">
    34         <if><bool><istrue value="${execute}"/></bool>
    35             <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
    36                 <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
    37             </exec>
    38         </if>
     32        <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure">
     33            <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/>
     34        </exec>
    3935    </target>
    4036
    4137    <target name="tweak-makefiles">
    42         <if><bool><istrue value="${execute}"/></bool>
    43     <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    44     <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    45     <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    46     <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
    47     <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" />
    48     <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" />
    49         </if>
     38        <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     39        <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     40        <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     41        <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/${processor}/gdbm/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/${processor}/gdbm/lib/libgdbm.a$2" />
     42        <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" />
     43        <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" />
    5044    </target>
    5145
    5246    <target name="run-make">
    53         <if><bool><istrue value="${execute}"/></bool>
    54             <exec dir="${basedir}/gsdl" executable="make"/>
    55         </if>
     47        <exec dir="${basedir}/gsdl" executable="make"/>
    5648    </target>
    5749
    5850    <target name="run-make-install">
    59         <if><bool><istrue value="${execute}"/></bool>
    60             <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
    61         </if>
     51        <exec dir="${basedir}/gsdl" executable="make"><arg value="install"/></exec>
    6252    </target>
    6353
    6454    <target name="copy-library-oai">
    65         <if><bool><istrue value="${execute}"/></bool>
    66             <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
    67             <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
    68         </if>
     55        <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/library ${basedir}/gsdl/bin/darwin/library"/></exec>
     56        <exec executable="cp"><arg line="${basedir}/gsdl/cgi-bin/oaiserver ${basedir}/gsdl/bin/darwin/oaiserver"/></exec>
    6957    </target>
    7058
    7159    <target name="strip-execs">
    72         <if><bool><istrue value="${execute}"/></bool>
    73             <exec dir="${basedir}/gsdl/bin/darwin" executable="find">
    74                 <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
    75             </exec>
    76         </if>
     60        <exec dir="${basedir}/gsdl/bin/darwin" executable="find">
     61            <arg line=". ! -name . -type f -maxdepth 1 -exec strip {} &#59;"/>
     62        </exec>
    7763    </target>
    7864
    7965    <target name="build-demo-collection">
    80         <if><bool><istrue value="${execute}"/></bool>
    81             <exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
    82         </if>
     66        <exec dir="${basedir}/gsdl" executable="${mark2.home}/resources/build-demo.sh"/>
    8367    </target>
    8468
Note: See TracChangeset for help on using the changeset viewer.