Ignore:
Timestamp:
2011-01-25T14:48:39+13:00 (13 years ago)
Author:
sjm84
Message:

Adding the latest trunk changes as well as tidying up several files and removing more -m32 stuff

Location:
main/branches/64_bit_Greenstone/greenstone3
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • main/branches/64_bit_Greenstone/greenstone3

  • main/branches/64_bit_Greenstone/greenstone3/build.xml

    r23606 r23632  
    223223  <!-- If building a release then we want to adjust environment variables so that the support library can be see during compilation -->
    224224  <if><bool><isset property="use.support.lib"/></bool>
    225 
    226225    <property name="gnome-lib-dir" value="${basedir}/ext/gnome-lib-minimal/${os.bin.dir}"/>
    227226
    … …  
    268267    </if>
    269268
    270     <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>
    271         <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}&quot;"/>
     269    <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool>
     270        <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool>
     271            <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.DYLD_LIBRARY_PATH}&quot;"/>
     272        <else>
     273            <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib&quot;"/>
     274        </else>
     275        </if>
    272276    <else>
    273             <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib&quot;"/>
     277        <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>
     278            <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib:${env.LD_LIBRARY_PATH}&quot;"/>
     279        <else>
     280            <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${gnome-lib-dir}/lib&quot;"/>
     281        </else>
     282        </if>
    274283    </else>
    275284    </if>
    … …  
    318327        </if>
    319328
    320         <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>
    321             <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${env.LD_LIBRARY_PATH}&quot;"/>
     329        <if><bool><equals arg1="${os.bin.dir}" arg2="darwin"/></bool>
     330            <if><bool><isset property="env.DYLD_LIBRARY_PATH"/></bool>
     331                <property name="ldlpath.arg" value="DYLD_LIBRARY_PATH=&quot;${env.DYLD_LIBRARY_PATH}&quot;"/>
     332            <else>
     333                <property name="ldlpath.arg" value=" "/>
     334            </else>
     335            </if>
    322336        <else>
    323             <property name="ldlpath.arg" value=" "/>
    324         </else>
     337            <if><bool><isset property="env.LD_LIBRARY_PATH"/></bool>
     338                <property name="ldlpath.arg" value="LD_LIBRARY_PATH=&quot;${env.LD_LIBRARY_PATH}&quot;"/>
     339            <else>
     340                <property name="ldlpath.arg" value=" "/>
     341            </else>
     342            </if>
     343        </else> 
    325344        </if>
    326345    </else>
    327346  </if>
     347  <property name="allargs" value="${cflags.arg} ${cxxflags.arg} ${cppflags.arg} ${ldflags.arg} ${path.arg} ${ldlpath.arg} ${pcpath.arg}"/>
    328348
    329349  <condition property="gs2.opt.args" value= " " else="--disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
    … …  
    15231543      <arg value="--bindir=${gs2build.home}/bin/${os.bin.dir}"/> <!-- what value to use?? -->
    15241544      <arg line="${gs2.opt.args}"/>
    1525       <arg line="${static.arg}"/>
    1526       <arg line="${ldflags.arg}"/>
    1527       <arg line="${cflags.arg}"/>       
    1528       <arg line="${cppflags.arg}"/>
    1529       <arg line="${cxxflags.arg}"/>
    1530       <arg line="${path.arg}"/>
    1531       <arg line="${pcpath.arg}"/>
    1532       <arg line="${ldlpath.arg}"/>
     1545      <!--<arg line="${static.arg}"/>-->
     1546      <arg line="${allargs}"/>
    15331547    </exec>
    15341548  </target>
    … …  
    18471861      dir="${build.src.home}" failonerror="true">
    18481862      <arg value="--prefix=${gs2build.home}"/>
    1849       <arg line="${gs2.opt.args}"/>
    1850       <arg line="${static.arg}"/>
    1851       <arg line="${ldflags.arg}"/>
    1852       <arg line="${cflags.arg}"/>       
    1853       <arg line="${cppflags.arg}"/>
    1854       <arg line="${cxxflags.arg}"/>
    1855       <arg line="${path.arg}"/>
    1856       <arg line="${pcpath.arg}"/>
    1857       <arg line="${ldlpath.arg}"/>
     1863      <arg line="${gs2.opt.args} ${allargs}"/>
    18581864    </exec>
    18591865  </target>
    … …  
    18631869   
    18641870    <exec executable="make" dir="${build.src.home}" os="${os.unix}" failonerror="true">
     1871        <arg line="${ldlpath.arg}"/>
    18651872    </exec>
    18661873   
Note: See TracChangeset for help on using the changeset viewer.