Changeset 22851

Show
Ignore:
Timestamp:
06.09.2010 09:42:08 (9 years ago)
Author:
sjm84
Message:

Mac no longer deletes setup.bash and the gnome support library is now removed linux-greenstone3 and partially removed for mac-greenstone3

Location:
main/trunk/release-kits/kits
Files:
2 modified

Legend:

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

    r22835 r22851  
    170170                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    171171                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
     172                <env key="CPPFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/linux/include"/> 
    172173                <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/linux/lib"/> 
    173174            </exec> 
     
    187188                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    188189                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
     190                <env key="CPPFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    189191                <env key="LDFLAGS" value="-L${basedir}/compiled/ext/gnome-lib/darwin/lib"/> 
    190192            </exec> 
     
    203205                <env key="CFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
    204206                <env key="CXXFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
     207                <env key="CPPFLAGS" value="-I${basedir}/compiled/ext/gnome-lib/${os.shell}/include"/> 
    205208                <env key="LDFLAGS" value="-static -L${basedir}/compiled/ext/gnome-lib/${os.shell}/lib"/> 
    206209            </exec> 
     
    223226        </if> 
    224227 
    225         <!-- Delete all but the lib folder of the gnome support library on Mac --> 
     228        <!-- Delete all but the lib folder and the setup.bash script of the gnome support library on Mac --> 
    226229        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
    227230            <delete dir="${basedir}/compiled/ext/gnome-lib/cascade-make"/> 
     
    231234            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    232235            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/share"/> 
    233             <delete file="${basedir}/compiled/ext/gnome-lib/setup.bash"/> 
    234236            <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/> 
    235237            <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/> 
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r22836 r22851  
    1212        </exec> 
    1313 
    14         <antcall target="persist-forwarded-properties"> 
    15             <param name="greenstone3basedir" value="compiled"/> 
    16         </antcall> 
    17  
    1814        <!-- make sure all c++ compilation is done statically on linux --> 
    1915        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    2016            <property name="forward.compile.static" value="true"/> 
    2117        </if> 
     18 
     19        <!-- make sure the c++ compilation can see the support library in the extension folder --> 
     20        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
     21            <property name="forward.use.support.lib" value="true"/> 
     22        </if> 
     23 
     24        <antcall target="persist-forwarded-properties"> 
     25            <param name="greenstone3basedir" value="compiled"/> 
     26        </antcall> 
    2227 
    2328        <!-- run greenstone3's ant prepare --> 
     
    4550                    <arg value="checkout"/> 
    4651                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk"/> 
    47                     <arg value="${basedir}/compiled/gs2build/ext/gnome-lib"/> 
     52                    <arg value="${basedir}/compiled/ext/gnome-lib"/> 
    4853                </exec> 
    49                 <exec executable="/bin/bash" dir="${basedir}/compiled/gs2build/ext/gnome-lib"> 
     54                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib"> 
    5055                    <arg value="-c"/> 
    5156                    <arg value="./CASCADE-MAKE.sh"/> 
     
    6267            <property name="properties.accepted" value="true"/> 
    6368        </ant> 
     69 
     70        <!-- Delete the entire gnome support library on Linux --> 
     71        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
     72            <delete dir="${basedir}/compiled/ext/gnome-lib"/> 
     73        </if> 
     74 
     75        <!-- Delete all but the lib folder of the gnome support library on Mac --> 
     76        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
     77            <delete dir="${basedir}/compiled/ext/gnome-lib/cascade-make"/> 
     78            <delete dir="${basedir}/compiled/ext/gnome-lib/packages"/> 
     79            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/bin"/> 
     80            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/etc"/> 
     81            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
     82            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/share"/> 
     83            <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/> 
     84            <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/> 
     85        </if> 
    6486 
    6587        <!-- insert an xml parser -->