Changeset 16519

Show
Ignore:
Timestamp:
24.07.2008 09:15:13 (11 years ago)
Author:
oranfry
Message:

now mark2 does different things for intel and ppc macs

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

Legend:

Unmodified
Added
Removed
  • release-kits/mark2/ant-scripts/build.xml

    r16453 r16519  
    88--> 
    99<project name="mark2-build" default="mark2"> 
     10 
    1011 
    1112    <!-- CONSTANTS --> 
     
    2526    <import file="wrap.xml"/> 
    2627 
     28    <!-- TARGET TO PERFORM ADDITIONAL PRECONDITION CHECKS --> 
     29    <target name="mark2-init"> 
     30        <echo>Determining Processor...</echo> 
     31        <if> 
     32            <bool> 
     33                <or><equals arg1="${processor}" arg2="ppc" /><equals arg1="${processor}" arg2="intel"/></or> 
     34            </bool> 
     35 
     36            <echo>Processor: ${processor}</echo> 
     37            <echo/> 
     38 
     39            <else> 
     40                <echo>No processor set. Please set the property 'processor' to either 'intel' or 'ppc' in build.properties</echo> 
     41                <fail>Processor not set</fail> 
     42            </else> 
     43        </if> 
     44    </target> 
     45 
    2746    <!-- THE MAIN TARGET --> 
    28     <target name="mark2" depends="init"> 
     47    <target name="mark2" depends="init,mark2-init"> 
    2948        <addressedcall target="compile"/> 
    3049        <addressedcall target="create-distribution"/> 
  • release-kits/mark2/ant-scripts/compile.xml

    r16460 r16519  
    3434        <if><bool><istrue value="${execute}"/></bool> 
    3535            <exec dir="${basedir}/gsdl" executable="${basedir}/gsdl/configure"> 
    36                 <arg line="--with-gdbm=${mark2.home}/mac/gdbm-1.8.3"/> 
     36                <arg line="--with-gdbm=${mark2.home}/mac/${processor}/gdbm"/> 
    3737            </exec> 
    3838        </if> 
     
    4141    <target name="tweak-makefiles"> 
    4242        <if><bool><istrue value="${execute}"/></bool> 
    43     <rsr file="${basedir}/gsdl/src/recpt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" /> 
    44     <rsr file="${basedir}/gsdl/src/oaiservr/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" /> 
    45     <rsr file="${basedir}/gsdl/src/gdbmedit/db2txt/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" /> 
    46     <rsr file="${basedir}/gsdl/src/gdbmedit/txt2db/Makefile" pattern="^(LIBS =.*)-L${mark2.home}/mac/gdbm-1.8.3/lib -lgdbm(.*)$" replacement="$1${mark2.home}/mac/gdbm-1.8.3/lib/libgdbm.a$2" /> 
     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" /> 
    4747    <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" /> 
    4848    <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" />