Changeset 28301 for main/trunk/release-kits
- Timestamp:
- 2013-09-19T22:24:35+12:00 (11 years ago)
- Location:
- main/trunk/release-kits
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r27888 r28301 45 45 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 46 46 <!-- 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 47 54 <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 48 55 <echo>EXPORTING GNOME LIB EXTENSION</echo> 49 56 <exec executable="svn"> 50 57 <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"/> 53 60 </exec> 54 61 55 62 <exec executable="tar" dir="${basedir}/compiled/ext"> 56 63 <arg value="xvzf"/> 57 <arg value="gnome-lib-minimal-${ os.shell}.tar.gz"/>64 <arg value="gnome-lib-minimal-${specific.os.type}.tar.gz"/> 58 65 </exec> 59 66 -
main/trunk/release-kits/kits/rk3/ant-scripts/compile.xml
r28282 r28301 49 49 <if><bool><or><equals arg1="${rk.os}" arg2="mac"/><equals arg1="${rk.os}" arg2="linux"/></or></bool> 50 50 <!-- 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 51 58 <if><bool><or> 52 59 <equals arg1="${post.2.83.version}" arg2="true"/> … … 55 62 <exec executable="svn"> 56 63 <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"/> 59 66 </exec> 60 67 61 68 <exec executable="tar" dir="${basedir}/compiled/ext"> 62 69 <arg value="xvzf"/> 63 <arg value="gnome-lib-${ os.shell}.tar.gz"/>70 <arg value="gnome-lib-${specific.os.type}.tar.gz"/> 64 71 </exec> 65 72 -
main/trunk/release-kits/shared/core/ant-scripts/shared.xml
r23811 r28301 149 149 <property name="rk.os" value="mac"/> 150 150 151 <else>< if>151 <else><!--<if> 152 152 <bool> 153 153 <or> … … 162 162 </or> 163 163 </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> 167 169 <fail>Can't work out what to set rk.os to. Please report this to [email protected] . 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> 168 170
Note:
See TracChangeset
for help on using the changeset viewer.