Changeset 28301

Show
Ignore:
Timestamp:
19.09.2013 22:24:35 (6 years ago)
Author:
ak19
Message:

Release-kit changes for Mac (Mountain) Lion which needs to check out its own specific version of the pre-compiled gnome-lib-minimal package.

Location:
main/trunk/release-kits
Files:
3 modified

Legend:

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

    r27888 r28301  
    4545        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
    4646            <!-- svn export the gnome support library extension--> 
     47 
     48            <!-- For Lions, need a specific gnome-lib-minimal tar file. The file name contains darwin12 for Lion, it contains the shell.name (darwin/linux) for other cases. 
     49                Mac OS X v10.7.4 onwards is Lion/Mountain Lion, different from Leopard/Snow Leopard. See http://en.wikipedia.org/wiki/Darwin_(operating_system) --> 
     50            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}"> 
     51                <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/> 
     52            </condition> 
     53 
    4754            <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 
    4855                <echo>EXPORTING GNOME LIB EXTENSION</echo> 
    4956                <exec executable="svn"> 
    5057                    <arg value="export"/> 
    51                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${arch}${extension-x64}.tar.gz"/> 
    52                     <arg value="${basedir}/compiled/ext/gnome-lib-minimal-${os.shell}.tar.gz"/> 
     58                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${specific.os.type}${arch}${extension-x64}.tar.gz"/> 
     59                    <arg value="${basedir}/compiled/ext/gnome-lib-minimal-${specific.os.type}.tar.gz"/> 
    5360                </exec> 
    5461 
    5562                <exec executable="tar" dir="${basedir}/compiled/ext"> 
    5663                    <arg value="xvzf"/> 
    57                     <arg value="gnome-lib-minimal-${os.shell}.tar.gz"/> 
     64                    <arg value="gnome-lib-minimal-${specific.os.type}.tar.gz"/> 
    5865                </exec> 
    5966 
  • main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml

    r28282 r28301  
    4949        <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 
    5050            <!-- checkout the gnome support library extension--> 
     51 
     52            <!-- For Lions, need a specific gnome-lib-minimal tar file. The file name contains darwin12 for Lion, it contains the os.shell name (darwin/linux) for other cases. 
     53            Mac OS X v10.7.4 onwards is Lion/Mountain Lion, different from Leopard/Snow Leopard. See http://en.wikipedia.org/wiki/Darwin_(operating_system) --> 
     54            <condition property="specific.os.type" value="${os.shell}-Lion" else="${os.shell}"> 
     55                <matches pattern="^(10\.7\.[4-9]|10\.[8-9]|1[1-9]|[2-9])" string="${os.version}"/> 
     56            </condition> 
     57 
    5158            <if><bool><or> 
    5259                <equals arg1="${post.2.83.version}" arg2="true"/> 
     
    5562                <exec executable="svn"> 
    5663                    <arg value="export"/> 
    57                     <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${os.shell}${arch}${extension-x64}.tar.gz"/> 
    58                     <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/> 
     64                    <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-minimal-${specific.os.type}${arch}${extension-x64}.tar.gz"/> 
     65                    <arg value="${basedir}/compiled/ext/gnome-lib-${specific.os.type}.tar.gz"/> 
    5966                </exec> 
    6067 
    6168                <exec executable="tar" dir="${basedir}/compiled/ext"> 
    6269                    <arg value="xvzf"/> 
    63                     <arg value="gnome-lib-${os.shell}.tar.gz"/> 
     70                    <arg value="gnome-lib-${specific.os.type}.tar.gz"/> 
    6471                </exec> 
    6572 
  • main/trunk/release-kits/shared/core/ant-scripts/shared.xml

    r23811 r28301  
    149149            <property name="rk.os" value="mac"/> 
    150150 
    151         <else><if> 
     151        <else><!--<if> 
    152152            <bool> 
    153153                <or> 
     
    162162                </or> 
    163163            </bool> 
    164             <property name="rk.os" value="windows"/> 
    165  
    166         <else> 
     164            <property name="rk.os" value="windows"/>--> 
     165            <if> 
     166                <bool><os family="windows"/></bool> 
     167                <property name="rk.os" value="windows"/>     
     168            <else> 
    167169            <fail>Can't work out what to set rk.os to. Please report this to greenstone_team@cs.waikato.ac.nz . In the mean time, manually set rk.os to 'windows', 'mac', or 'linux' by reinvoking the release kit with, for example, '-Drk.os=windows'</fail> 
    168170