Changeset 27888 for main

Timestamp:

2013-07-17T16:26:27+12:00 (11 years ago)

Author:

ak19

Message:

Going to using Max's Mac imagemagick binaries, because they worked.

Location:

main/trunk/release-kits/kits

Files:

• rk2/ant-scripts/compile.xml (modified) (2 diffs)
• rk3/ant-scripts/compile.xml (modified) (2 diffs)

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

@@ -414 +414 @@
             <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
 
-                    <exec executable="svn">
+                    <!--<exec executable="svn">
                        <arg value="export"/>
                        <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-darwin-10.5.tar.gz"/>
@@ -427 +427 @@
                     <move todir="compiled/bin/darwin/imagemagick">
                        <fileset dir="compiled/ext/imagemagick/darwin"/>
-                    </move>
-
-                <!--<exec executable="svn">
+                    </move>-->
+
+                <exec executable="svn">
                     <arg value="export"/>
                     <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/>
                     <arg value="compiled/bin/darwin/imagemagick"/>
-                </exec>-->
+                </exec>
               
                 <exec executable="svn">

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

@@ -178 +178 @@
             <delete dir="compiled/gs2build/bin/darwin/imagemagick"/>
 
-            <exec executable="svn">
+            <!--<exec executable="svn">
                <arg value="export"/>
                <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-darwin-10.5.tar.gz"/>
@@ -192 +192 @@
                <fileset dir="compiled/ext/imagemagick/darwin"/>
             </move>
-            <delete dir="compiled/ext/imagemagick"/>
-
-            <!--<delete dir="compiled/gs2build/bin/darwin/imagemagick"/>
+            <delete dir="compiled/ext/imagemagick"/>-->
+
+            <delete dir="compiled/gs2build/bin/darwin/imagemagick"/>
             <exec executable="svn">
                 <arg value="export"/>
                 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/>
                 <arg value="compiled/gs2build/bin/darwin/imagemagick"/>
-            </exec>-->
+            </exec>
 
             <if><bool><not><equals arg1="${forward.install.flax}" arg2="true"/></not></bool>