Changeset 23117

Timestamp:

2010-10-12T13:55:33+13:00 (14 years ago)

Author:

sjm84

Message:

Modified the release kit to use the pre-compiled gnome libraries again after various fixes

File:

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

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

@@ -57 +57 @@
                 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>
             </or></bool>
-                <echo>COMPILING THE GNOME LIB EXTENSION</echo>
-                <exec executable="svn">
-                    <arg value="checkout"/>
-                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/src"/>
-                    <arg value="${basedir}/compiled/ext/gnome-lib"/>
-                </exec>
-
-                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib">
-                    <arg value="-c"/>
-                    <arg value="./CASCADE-MAKE.sh"/>
-                </exec>
-                <echo>DONE COMPILING THE GNOME LIB EXTENSION</echo>
-                
-                <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch
+                <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch -->
                 <echo>EXPORTING GNOME LIB EXTENSION</echo>
                 <exec executable="svn">
@@ -82 +69 @@
                     <arg value="gnome-lib-${os.shell}.tar.gz"/>
                 </exec>
+
+                <exec executable="/bin/bash" dir="${basedir}/compiled/ext/gnome-lib">
+                    <arg value="-c"/>
+                    <arg value="source devel.bash"/>
+                </exec>
                 <echo>DONE EXTRACTING GNOME LIB EXTENSION</echo>
-                -->
             </if>
         </if>
@@ -232 +223 @@
         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
             <delete dir="${basedir}/compiled/ext/gnome-lib"/>
-            <!--<delete dir="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/>-->
+            <delete dir="${basedir}/compiled/ext/gnome-lib-linux.tar.gz"/>
         </if>
 
@@ -245 +236 @@
             <delete file="${basedir}/compiled/ext/gnome-lib/setup.bat"/>
             <delete file="${basedir}/compiled/ext/gnome-lib/CASCADE-MAKE.sh"/>
-            <!--<delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/>-->
+            <delete file="${basedir}/compiled/ext/gnome-lib-darwin.tar.gz"/>
         </if>