Changeset 23593 for main/trunk/release-kits

Timestamp:

2011-01-15T15:18:18+13:00 (13 years ago)

Author:

sjm84

Message:

The imagemagick extension tarball is now correctly removed. The installer will now correctly install Imagemagick on x64. WvWare static libraries are now removed from GSDLHOME/lib/[linux|darwin] as part of the release kits. Fixed a minor problem causing the gnome-lib-minimal tarball remaining in the installer when it should have been deleted

Location:

main/trunk/release-kits/kits/rk2

Files:

• ant-scripts/compile.xml (modified) (3 diffs)
• installer/build.xml (modified) (1 diff)

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

@@ -234 +234 @@
         <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool>
             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal"/>
-            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal-linux.tar.gz"/>
+            <delete file="${basedir}/compiled/ext/gnome-lib-minimal-linux.tar.gz"/>
         </if>
 
@@ -343 +343 @@
         <delete dir="compiled/build-src"/>
         <delete dir="compiled/runtime-src"/>
-        <delete><fileset dir="compiled" includes="Install.txt,acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in,win32.mak,win32cfg.h"/></delete>
+        <delete><fileset dir="compiled" includes="Install.txt,acconfig.h,aclocal.m4,config.guess,config.sub,configtest.pl,configure,configure.in,install-sh,Makefile.in,micotest.cpp,config.h.in,win32.mak,win32cfg.h,lib/**/*.a"/></delete>
 
         <!-- strip .svn working-copy dirs -->
@@ -397 +397 @@
                         <arg value="imagemagick-linux-x64.tar.gz"/>
                     </exec>
-                    <delete file="compiled/bin/linux/imagemagick-linux-x64.tar.gz"/>
+                    <delete file="compiled/ext/imagemagick-linux-x64.tar.gz"/>
                 <else>
                         <exec executable="svn">

main/trunk/release-kits/kits/rk2/installer/build.xml

@@ -230 +230 @@
         <!-- end cdrom -->
 
-        <chmod dir="${installDir}/bin/${shell.name}/imagemagick/bin" includes="*" perm="775"/>
+        <if><bool><available file="${installDir}/bin/${shell.name}/imagemagick" type="dir"/></bool>
+            <chmod dir="${installDir}/bin/${shell.name}/imagemagick/bin" includes="*" perm="775"/>
+        <else>
+            <chmod dir="${installDir}/ext/imagemagick/${shell.name}/bin" includes="*" perm="775"/>
+        </else>
+        </if>
 
     </target>