Ignore:
Timestamp:
01/19/11 10:06:54 (10 years ago)
Author:
sjm84
Message:

Refactored some of the compile.xml and made some minor fixes

Location:
main/trunk/release-kits/kits/rk2/ant-scripts
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r23593 r23609  
    7474            </if>
    7575        </if>
     76
     77        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
     78            <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac-->
     79            <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
     80                <property name="libpathvar" value="DYLD_LIBRARY_PATH"/>
     81            <else>
     82                <property name="libpathvar" value="LD_LIBRARY_PATH"/>
     83            </else>
     84            </if>
     85
     86            <property name="gnome.lib.dir" value="${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}"/>
     87            <property name="path.arg" value="PATH=&quot;${gnome.lib.dir}/bin:${env.PATH}&quot;"/>
     88            <property name="cflags.arg" value="CFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
     89            <property name="cxxflags.arg" value="CXXFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
     90            <property name="cppflags.arg" value="CPPFLAGS=&quot;-I${gnome.lib.dir}/include&quot;"/>
     91            <property name="ldflags.arg" value="LDFLAGS=&quot;-L${gnome.lib.dir}/lib&quot;"/>
     92            <property name="pcpath.arg" value="PKG_CONFIG_PATH=&quot;${gnome.lib.dir}/lib/pkgconfig&quot;"/>
     93            <property name="ldlpath.arg" value="${libpathvar}=&quot;${gnome.lib.dir}/lib&quot;"/>
     94
     95            <property name="allargs" value="${path.arg} ${cflags.arg} ${cxxflags.arg} ${cppflags.arg} ${ldflags.arg} ${pcpath.arg} ${ldlpath.arg}"/>
     96        </if>   
    7697       
    7798        <!-- windows only -->
     
    170191            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
    171192                <arg line="--enable-apache-httpd"/>
    172                 <arg line="PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/bin:${env.PATH}&quot;"/>
    173                 <arg line="CFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include&quot;"/>
    174                 <arg line="CPPFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include&quot;"/>
    175                 <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/linux/include&quot;"/>
    176                 <arg line="LDFLAGS=&quot;-static -L${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/>
    177                 <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib/pkgconfig&quot;"/>
    178                 <arg line="LD_LIBRARY_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/linux/lib&quot;"/>
     193                <arg line="${allargs}"/>
    179194            </exec>
    180195
     
    189204            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
    190205                <arg line="--enable-apache-httpd"/>
    191                 <arg line="PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin:${env.PATH}&quot;"/>
    192                 <arg line="CFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/>
    193                 <arg line="CPPFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/>
    194                 <arg line="CXXFLAGS=&quot;-I${basedir}/compiled/ext/gnome-lib-minimal/darwin/include&quot;"/>
    195                 <arg line="LDFLAGS=&quot;-L${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib&quot;"/>
    196                 <arg line="PKG_CONFIG_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib/pkgconfig&quot;"/>
    197                 <arg line="DYLD_LIBRARY_PATH=&quot;${basedir}/compiled/ext/gnome-lib-minimal/darwin/lib&quot;"/>
     206                <arg line="${allargs}"/>
    198207            </exec>
    199208
     
    206215        <!-- mac and linux: compile -->
    207216        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
    208             <!-- LD_LIBRARY_PATH is DYLD_LIBRARY_PATH on mac-->
    209             <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
    210                 <property name="libpathvar" value="DYLD_LIBRARY_PATH"/>
    211             <else>
    212                 <property name="libpathvar" value="LD_LIBRARY_PATH"/>
    213             </else>
    214             </if>
    215 
    216217            <!-- make -->
    217218            <exec dir="${basedir}/compiled" executable="make" failonerror="true">
    218                 <arg line="${libpathvar}=&quot;${basedir}/compiled/ext/gnome-lib-minimal/${os.shell}/lib&quot;"/>
     219                <arg line="${ldlpath.arg}"/>
    219220            </exec>
    220221
  • main/trunk/release-kits/kits/rk2/ant-scripts/components.xml

    r23587 r23609  
    5757    </invert>
    5858  </patternset>
     59
     60  <!-- the core component - defined by antithesis -->
     61  <patternset id="greenstone2.core-x64.component">
     62    <invert>
     63      <patternset refid="greenstone2.source.component"/>
     64      <patternset refid="greenstone2.imagemagick-x64.component"/>
     65      <patternset refid="greenstone2.ghostscript.component"/>
     66      <patternset refid="greenstone2.apachehttpd.component"/>
     67    </invert>
     68  </patternset>
    5969</project>
    6070
  • main/trunk/release-kits/kits/rk2/ant-scripts/create-components.xml

    r23587 r23609  
    77        <antcall target="create-component">
    88            <param name="component" value="imagemagick"/>
    9             <param name="ext-x64" value="-x64"/>
     9            <param name="ext-x64" value="${extension-x64}"/>
    1010        </antcall>
    1111
     
    2828        <antcall target="create-component">
    2929            <param name="component" value="core"/>
    30             <param name="ext-x64" value=""/>
     30            <param name="ext-x64" value="${extension-x64}"/>
    3131        </antcall>
    3232
Note: See TracChangeset for help on using the changeset viewer.