Changeset 29303

Timestamp:

2014-09-17T21:25:48+12:00 (10 years ago)

Author:

ak19

Message:

The OS-specific formatconverter binaries are now in their own GS3/bin/OS folders. For the nightly and release binaries, remove the OS subfolders including their formatconvert binaries that are for other OS than the platform of the nightly/release. Also setting the permissions on the remaining bin/OS folder, in order to have exec permissions on the remaining formatconverter binary.

File:

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

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

@@ -175 +175 @@
         <antcall target="strip-svn-dirs"><param name="dir" value="compiled"/></antcall>
 
-        <!-- get rid of bin/formatconverter on windows and get rid of bin/formatconverter.exe on linux/mac -->
+        <!-- get rid of bin/formatconverter on windows and get rid of bin/formatconverter.exe on linux/mac. Now we have specific OS dirs, so get rid of the irrelevant OS dirs instead -->
         <if>
             <bool><equals arg1="${rk.os}" arg2="windows"/></bool>
-                <delete file="compiled/bin/formatconverter"/>
-            <else>
-                <delete file="compiled/bin/formatconverter.exe"/>
-            </else>
+                <delete dir="compiled/bin/darwin"/>
+                <delete dir="compiled/bin/linux"/>
+            <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool>
+                <delete dir="compiled/bin/windows"/>
+                <delete dir="compiled/bin/linux"/>
+                <chmod dir="compiled/bin/darwin" includes="*" perm="775"/>
+            <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+                <delete dir="compiled/bin/windows"/>
+                <delete dir="compiled/bin/darwin"/>
+                <chmod dir="compiled/bin/linux" includes="*" perm="775"/>
+            </if></else>
+            </if></else>
         </if>