Changeset 23618 for main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

Timestamp:

2011-01-20T13:27:03+13:00 (13 years ago)

Author:

sjm84

Message:

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

File:

• main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml (modified) (2 diffs)

main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

@@ -42 +42 @@
             <!-- checkout the gnome support library extension-->
             <if><bool><or>
-                <equals arg1="${branch.path}" arg2="trunk"/>
-                <equals arg1="${branch.path}" arg2="tags/stable"/>
-                <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
+                <equals arg1="${post.2.83.version}" arg2="true"/>
             </or></bool>
                 <echo>EXPORTING GNOME LIB EXTENSION</echo>
@@ -76 +74 @@
         <!-- Delete the entire gnome support library on Linux -->
         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
-            <delete dir="${basedir}/compiled/ext/gnome-lib"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal"/>
+            <delete file="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/>
         </if>
 
         <!-- Delete all but the lib folder of the gnome support library on Mac -->
         <if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
-            <delete dir="${basedir}/compiled/ext/gnome-lib/cascade-make"/>
-            <delete dir="${basedir}/compiled/ext/gnome-lib/packages"/>
-            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/bin"/>
-            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/etc"/>
-            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/include"/>
-            <delete dir="${basedir}/compiled/ext/gnome-lib/darwin/share"/>
-            <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/>
-            <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/cascade-make"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/packages"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/bin"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/etc"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/include"/>
+            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal/darwin/share"/>
+            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/setup.bat"/>
+            <delete file="${basedir}/compiled/ext/gnome-lib-minimal/CASCADE-MAKE.sh"/>
+            <delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/>
         </if>