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

Timestamp:

2010-09-06T09:42:08+12:00 (14 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

File:

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

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

@@ -12 +12 @@
         </exec>
 
-        <antcall target="persist-forwarded-properties">
-            <param name="greenstone3basedir" value="compiled"/>
-        </antcall>
-
         <!-- make sure all c++ compilation is done statically on linux -->
         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
             <property name="forward.compile.static" value="true"/>
         </if>
+
+        <!-- make sure the c++ compilation can see the support library in the extension folder -->
+        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
+            <property name="forward.use.support.lib" value="true"/>
+        </if>
+
+        <antcall target="persist-forwarded-properties">
+            <param name="greenstone3basedir" value="compiled"/>
+        </antcall>
 
         <!-- run greenstone3's ant prepare -->
@@ -45 +50 @@
                     <arg value="checkout"/>
                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk"/>
-                    <arg value="${basedir}/compiled/gs2build/ext/gnome-lib"/>
+                    <arg value="${basedir}/compiled/ext/gnome-lib"/>
                 </exec>
-                <exec executable="/bin/bash" dir="${basedir}/compiled/gs2build/ext/gnome-lib">
+                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib">
                     <arg value="-c"/>
                     <arg value="./CASCADE-MAKE.sh"/>
@@ -62 +67 @@
             <property name="properties.accepted" value="true"/>
         </ant>
+
+        <!-- Delete the entire gnome support library on Linux -->
+        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+            <delete dir="${basedir}/compiled/ext/gnome-lib"/>
+        </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"/>
+        </if>
 
         <!-- insert an xml parser -->