Changeset 23525 for main/trunk/release-kits/kits/rk2
- Timestamp:
- 2011-01-05T12:56:10+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r23493 r23525 7 7 <bool> 8 8 <or> 9 <equals arg1="${branch.path}" arg2="trunk"/> 10 <equals arg1="${branch.path}" arg2="tags/stable"/> 11 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 9 <equals arg1="${post.2.83.version}" arg2="true"/> 12 10 </or> 13 11 </bool> … … 53 51 <!-- checkout the gnome support library extension--> 54 52 <if><bool><or> 55 <equals arg1="${branch.path}" arg2="trunk"/> 56 <equals arg1="${branch.path}" arg2="tags/stable"/> 57 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 53 <equals arg1="${post.2.83.version}" arg2="true"/> 58 54 </or></bool> 59 55 <!-- Check out the pre-compiled version of the gnome-lib extension rather than compiling it from scratch --> … … 61 57 <exec executable="svn"> 62 58 <arg value="export"/> 63 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-${os.shell} .tar.gz"/>59 <arg value="${svn.root}/gs2-extensions/gnome-lib/trunk/gnome-lib-${os.shell}${extension-x64}.tar.gz"/> 64 60 <arg value="${basedir}/compiled/ext/gnome-lib-${os.shell}.tar.gz"/> 65 61 </exec> … … 86 82 <!-- unzip expat if the version is less that 2.84 --> 87 83 <if><bool><and> 88 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 89 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 90 <islessthan arg1="${branch.tag.version}" arg2="2.84"/> 84 <equals arg1="${post.2.83.version}" arg2="false"/> 91 85 </and></bool> 92 86 <unzip src="${basedir}/compiled/common-src/packages/windows/expat/expat.zip" dest="${basedir}/compiled/common-src/packages/windows/expat"/> … … 100 94 <if><bool><not><available file="${basedir}/compiled/bin/windows"/></not></bool> 101 95 <if><bool><and> 102 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 103 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 104 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 96 <equals arg1="${post.2.83.version}" arg2="true"/> 105 97 </and></bool> 106 98 … … 384 376 <else><if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 385 377 386 <!-- grab imagemagick and wv binaries -->378 <!-- grab imagemagick and wv (if less than 2.84) binaries --> 387 379 <delete dir="compiled/bin/linux/imagemagick"/> 388 380 389 381 <if><bool><or> 390 <equals arg1="${branch.path}" arg2="trunk"/> 391 <equals arg1="${branch.path}" arg2="tags/stable"/> 392 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 382 <equals arg1="${post.2.83.version}" arg2="true"/> 393 383 </or></bool> 394 384 <exec executable="svn"> … … 428 418 429 419 <if><bool><and> 430 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 431 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 432 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 420 <equals arg1="${post.2.83.version}" arg2="true"/> 433 421 </and></bool> 434 422 … … 480 468 481 469 <if><bool><and> 482 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 483 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 484 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 470 <equals arg1="${post.2.83.version}" arg2="true"/> 485 471 </and></bool> 486 472 <get src="${svn.root}/main/${branch.path}/binaries/windows/bin/Setup.exe" dest="compiled/bin/windows/Setup.exe"/>
Note:
See TracChangeset
for help on using the changeset viewer.