Show
Ignore:
Timestamp:
20.01.2011 13:27:03 (9 years ago)
Author:
sjm84
Message:

Fixed a bug that prevented the minimal gnome-lib from being deleted in Greenstone 3

Files:
1 modified

Legend:

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

    r23612 r23618  
    4242            <!-- checkout the gnome support library extension--> 
    4343            <if><bool><or> 
    44                 <equals arg1="${branch.path}" arg2="trunk"/> 
    45                 <equals arg1="${branch.path}" arg2="tags/stable"/> 
    46                 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 
     44                <equals arg1="${post.2.83.version}" arg2="true"/> 
    4745            </or></bool> 
    4846                <echo>EXPORTING GNOME LIB EXTENSION</echo> 
     
    7674        <!-- Delete the entire gnome support library on Linux --> 
    7775        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    78             <delete dir="${basedir}/compiled/ext/gnome-lib"/> 
     76            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal"/> 
     77            <delete file="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/> 
    7978        </if> 
    8079 
    8180        <!-- Delete all but the lib folder of the gnome support library on Mac --> 
    8281        <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 
    83             <delete dir="${basedir}/compiled/ext/gnome-lib/cascade-make"/> 
    84             <delete dir="${basedir}/compiled/ext/gnome-lib/packages"/> 
    85             <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/bin"/> 
    86             <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/etc"/> 
    87             <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/include"/> 
    88             <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/share"/> 
    89             <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/> 
    90             <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/> 
     82            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/cascade-make"/> 
     83            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/packages"/> 
     84            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin"/> 
     85            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/etc"/> 
     86            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/include"/> 
     87            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/share"/> 
     88            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/setup.bat"/> 
     89            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/CASCADE-MAKE.sh"/> 
     90            <delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/> 
    9191        </if> 
    9292