Changeset 23615 for main/trunk/release-kits/kits

Timestamp:

2011-01-20T12:18:57+13:00 (13 years ago)

Author:

sjm84

Message:

Modified the collection building code for Linux and Mac

File:

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

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

@@ -224 +224 @@
 
             <!-- make apache-for-dist -->
-            <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec>
+            <!--<exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec>-->
 
             <!-- strip executables -->
@@ -245 +245 @@
             <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"/>
@@ -316 +315 @@
                 <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/>
             </exec>
+
+            <delete dir="${basedir}/compiled/collect/demo/index"/>
+            <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
             
             <else>
-                <exec dir="${basedir}/compiled" executable="perl">
-                    <arg line="-S"/>
-                    <arg line="bin/script/import.pl demo"/>
-                    <env key="GSDLHOME" path="${basedir}/compiled"/>
-                    <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
-                    <env key="GSDLOS" value="${os.shell}"/>
-                    <env key="PATH" path="${basedir}/compiled/bin/${os.shell}:${basedir}/compiled/bin/script:${env.PATH}"/>
-                </exec>
-                <exec dir="${basedir}/compiled" executable="perl">
-                    <arg line="-S"/>
-                    <arg line="bin/script/buildcol.pl demo"/>
-                    <env key="GSDLHOME" path="${basedir}/compiled"/>
-                    <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
-                    <env key="GSDLOS" value="${os.shell}"/>
-                    <env key="PATH" path="${basedir}/compiled/bin/${os.shell}:${basedir}/compiled/bin/script:${env.PATH}"/>
-                </exec>
+                <echo file="${basedir}/compiled/buildscript.sh">
+                    #!/bin/bash
+                    source setup.bash
+                    /usr/bin/perl -S ${basedir}/compiled/bin/script/full-rebuild.pl demo
+                </echo>
+                <chmod perm="755" file="${basedir}/compiled/buildscript.sh"/>
+                <exec dir="${basedir}/compiled" executable="/bin/bash">
+                    <arg line="buildscript.sh"/>
+                </exec>
+                <delete file="${basedir}/compiled/buildscript.sh"/>
             </else>
         </if>
-        <delete dir="${basedir}/compiled/collect/demo/index"/>
-        <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
 
         <!-- delete the source code -->