Changeset 21647

Timestamp:

2010-01-26T17:31:18+13:00 (14 years ago)

Author:

oranfry

Message:

fixes

File:

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

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

@@ -37 +37 @@
             <!-- get winbin -->
             <if><bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool>
-                <svn><export srcUrl="${svn.root}/main/${branch.path}/binaries/windows/bin" destPath="${basedir}/compiled/bin/windows" revision="${branch.revision}"/></svn>
+                <exec executable="svn">
+                    <arg value="export"/>
+                    <arg value="${svn.root}/main/${branch.path}/binaries/windows/bin"/>
+                    <arg value="${basedir}/compiled/bin/windows"/>
+                    <arg value="-r"/><arg value="${branch.revision}"/>
+                </exec>
             </if>
 
@@ -119 +124 @@
 
         <!-- compile gli -->
-        <exec dir="compiled/gli" executable="/bin/bash"><arg value="-c"/><arg value="./makegli.${os.script.format}"/></exec>
-        <exec dir="compiled/gli" executable="/bin/bash"><arg value="-c"/><arg value="./makejar.${os.script.format}"/></exec>
+        <!-- (linux and mac) -->
+        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool>
+            <exec dir="compiled/gli" executable="/bin/bash"><arg value="-c"/><arg value="./makegli.sh"/></exec>
+            <exec dir="compiled/gli" executable="/bin/bash"><arg value="-c"/><arg value="./makejar.sh"/></exec>
+        <!-- windows -->
+        <else><if><bool><equals arg1="${rk.os}" arg2="windows"/></bool>
+            <exec dir="compiled/gli" executable="cmd.exe"><arg value="/c"/><arg value="makegli.bat"/></exec>
+            <exec dir="compiled/gli" executable="cmd.exe"><arg value="/c"/><arg value="makejar.bat"/></exec>
+        </if></else></if>
+
         <delete dir="compiled/gli/jar"/>
         <delete dir="compiled/gli/classes/org"/>