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

Timestamp:

2010-01-27T13:11:36+13:00 (14 years ago)

Author:

oranfry

Message:

fixes

File:

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

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

@@ -142 +142 @@
 
         <!-- build demo collection -->
-        <!-- linux, mac -->
-        <if><bool><or><equals arg1="${rk.os}" arg2="linux"/><equals arg1="${rk.os}" arg2="mac"/></or></bool>
-            <exec dir="${basedir}/compiled" executable="/bin/bash" failonerror="true">
-                <arg value="-c"/>
-                <arg value="
-                    source setup.bash &amp;&amp; \
-                    import.pl --removeold demo &amp;&amp; \
-                    buildcol.pl --removeold demo &amp;&amp; \
-                    rm -rf collect/demo/index collect/demo/archives &amp;&amp; \
-                    mv collect/demo/building collect/demo/index"/>
-            </exec>
-
-        <!-- windows -->
-        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-            <!-- the envs on these execs simulate the environment when you run setup.bat -->
-            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
-                <arg line="bin\script\import.pl --removeold demo"/>
-                <env key="GSDLHOME" value="${basedir}/compiled"/>
-                <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
-                <env key="GSDLOS" value="windows"/>
-                <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
-            </exec>
-            <exec dir="${basedir}/compiled" executable="${basedir}/compiled/bin/windows/perl/bin/perl.exe">
-                <arg line="bin\script\buildcol.pl --removeold demo"/>
-                <env key="GSDLHOME" value="${basedir}/compiled"/>
-                <env key="GSDLCOLLECTDIR" value="${basedir}/compiled/collect"/>
-                <env key="GSDLOS" value="windows"/>
-                <env key="PATH" value="${basedir}\compiled\bin\windows\perl\bin;${basedir}\compiled\bin\windows;${basedir}\compiled\bin\script"/>
-            </exec>
-            <delete dir="${basedir}/compiled/collect/demo/index"/>
-            <move file="${basedir}/compiled/collect/demo/building" tofile="${basedir}/compiled/collect/demo/index"/>
-
-        </if></else></if>
+        <!-- the envs on these execs simulate the environment when you run setup.bat 
+        <exec dir="${basedir}/compiled" executable="perl">
+            <arg line="bin/script/import.pl - -removeold demo"/>
+            <env key="GSDLHOME" path="${basedir}/compiled"/>
+            <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
+            <env key="GSDLOS" value="windows"/>
+            <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/>
+        </exec>
+        <exec dir="${basedir}/compiled" executable="perl">
+            <arg line="bin/script/buildcol.pl - -removeold demo"/>
+            <env key="GSDLHOME" path="${basedir}/compiled"/>
+            <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
+            <env key="GSDLOS" value="windows"/>
+            <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"/>
+        -->
 
         <!-- delete the source code -->