Show
Ignore:
Timestamp:
15.01.2011 15:18:18 (9 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:
2 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml

    r23586 r23593  
    234234        <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 
    235235            <delete dir="${basedir}/compiled/ext/gnome-lib-minimal"/> 
    236             <delete dir="${basedir}/compiled/ext/gnome-lib-minimal-linux.tar.gz"/> 
     236            <delete file="${basedir}/compiled/ext/gnome-lib-minimal-linux.tar.gz"/> 
    237237        </if> 
    238238 
     
    343343        <delete dir="compiled/build-src"/> 
    344344        <delete dir="compiled/runtime-src"/> 
    345         <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> 
     345        <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> 
    346346 
    347347        <!-- strip .svn working-copy dirs --> 
     
    397397                        <arg value="imagemagick-linux-x64.tar.gz"/> 
    398398                    </exec> 
    399                     <delete file="compiled/bin/linux/imagemagick-linux-x64.tar.gz"/> 
     399                    <delete file="compiled/ext/imagemagick-linux-x64.tar.gz"/> 
    400400                <else> 
    401401                        <exec executable="svn"> 
  • main/trunk/release-kits/kits/rk2/installer/build.xml

    r23578 r23593  
    230230        <!-- end cdrom --> 
    231231 
    232         <chmod dir="${installDir}/bin/${shell.name}/imagemagick/bin" includes="*" perm="775"/> 
     232        <if><bool><available file="${installDir}/bin/${shell.name}/imagemagick" type="dir"/></bool> 
     233            <chmod dir="${installDir}/bin/${shell.name}/imagemagick/bin" includes="*" perm="775"/> 
     234        <else> 
     235            <chmod dir="${installDir}/ext/imagemagick/${shell.name}/bin" includes="*" perm="775"/> 
     236        </else> 
     237        </if> 
    233238 
    234239    </target>