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

Files:
1 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"/>