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

Timestamp:

2011-10-27T15:53:31+13:00 (12 years ago)

Author:

sjm84

Message:

Changed where imagemagick is retrieved from and separated out the wv compilation

File:

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

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

@@ -32 +32 @@
         <!-- set version numbers -->
         <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall>
-        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall>
+        <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall>
 
         <!-- we do not want the *.app folders if we are not mac-->
@@ -178 +178 @@
             <!-- run configure -->
             <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true">
-                <arg line="--enable-apache-httpd"/>
+                <arg line="--enable-apache-httpd --disable-wvware"/>
+            </exec>
+
+            <exec executable="tar" dir="${basedir}/compiled/build-src/packages/wv">
+                <arg value="xvzf"/>
+                <arg value="wv-1.2.4-gs.tar.gz"/>
+            </exec>
+                
+            <exec dir="${basedir}/compiled/build-src/packages/wv/wv-gs" executable="${basedir}/compiled/build-src/packages/wv/wv-gs/configure" failonerror="true">
+                <arg line="--prefix=${basedir}/compiled/build-src/packages/wv --bindir=${basedir}/compiled/bin/linux --libdir=${basedir}/compiled/lib/linux --datadir=${basedir}/compiled/etc/packages"/>
                 <arg line="${allargs}"/>
             </exec>
@@ -213 +222 @@
             <!-- make apache-for-dist -->
             <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec>
+
+            <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
+                <exec dir="${basedir}/compiled/build-src/packages/wv/wv-gs" executable="make" failonerror="true">
+                    <arg line="${ldlpath.arg}"/>
+                </exec>
+                <exec dir="${basedir}/compiled/build-src/packages/wv/wv-gs" executable="make" failonerror="true"><arg value="install"/></exec>
+            </if>
 
             <!-- strip executables -->
@@ -328 +344 @@
 
             <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool>
-                    <if><bool><equals arg1="${x64}" arg2="true"/></bool>
+                <!--<if><bool><equals arg1="${x64}" arg2="true"/></bool>-->
                     <exec executable="svn">
                             <arg value="export"/>
-                            <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-linux-x64.tar.gz"/>
-                            <arg value="compiled/ext/imagemagick-linux-x64.tar.gz"/>
+                            <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-linux${extension-x64}.tar.gz"/>
+                            <arg value="compiled/ext/imagemagick-linux${extension-x64}.tar.gz"/>
                         </exec>
 
                     <exec executable="tar" dir="compiled/ext">
                             <arg value="xvzf"/>
-                        <arg value="imagemagick-linux-x64.tar.gz"/>
-                    </exec>
-                    <delete file="compiled/ext/imagemagick-linux-x64.tar.gz"/>
-                <else>
+                        <arg value="imagemagick-linux${extension-x64}.tar.gz"/>
+                    </exec>
+                    <delete file="compiled/ext/imagemagick-linux${extension-x64}.tar.gz"/>
+                    <move todir="compiled/bin/linux/imagemagick">
+                        <fileset dir="compiled/ext/imagemagick/linux"/>
+                    </move>
+                <!--<else>
                         <exec executable="svn">
                             <arg value="export"/>
@@ -347 +366 @@
                     </exec>
                 </else>
-                </if>
+                </if>-->
                 <else>
                     <delete dir="compiled/bin/linux/wv"/>