Changeset 22479 for main/trunk/release-kits/kits/rk2
- Timestamp:
- 2010-07-22T13:16:44+12:00 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r22463 r22479 5 5 <!-- checkout greenstone2 (or gsdl if a pre-2.84 release is being created) and gli --> 6 6 <if> 7 8 9 10 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/>11 </or>12 </bool>13 7 <bool> 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"/> 12 </or> 13 </bool> 14 14 <exec executable="svn"> 15 16 17 15 <arg value="checkout"/> 16 <arg value="${svn.root}/main/${branch.path}/greenstone2"/> 17 <arg value="${basedir}/compiled"/> 18 18 </exec> 19 20 <else> 21 <exec executable="svn"> 22 <arg value="checkout"/> 23 <arg value="${svn.root}/main/${branch.path}/gsdl"/> 24 <arg value="${basedir}/compiled"/> 25 </exec> 26 </else> 27 </if> 28 29 <exec executable="svn"> 19 <else> 20 <exec executable="svn"> 21 <arg value="checkout"/> 22 <arg value="${svn.root}/main/${branch.path}/gsdl"/> 23 <arg value="${basedir}/compiled"/> 24 </exec> 25 </else> 26 </if> 27 28 <exec executable="svn"> 30 29 <arg value="checkout"/> 31 30 <arg value="${svn.root}/main/${branch.path}/gli"/> … … 66 65 <and> 67 66 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 67 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 68 68 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 69 69 </and> … … 93 93 <unzip src="${rk.home}/shared/windows/perl.zip" dest="compiled/bin/windows"/> 94 94 95 <if> 96 <bool> 97 <and> 98 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 99 <islessthan arg1="${branch.tag.version}" arg2="2.84"/> 100 </and> 101 </bool> 95 <exec executable="${basedir}/compiled/bin/windows/gunzip.exe" dir="${basedir}/compiled/runtime-src/packages/apache-httpd"> 96 <arg value="-d"/> 97 <arg value="httpd-2.2.11-gs.tar.gz"/> 98 </exec> 102 99 103 <exec executable="${basedir}/compiled/bin/windows/gunzip.exe" dir="${basedir}/compiled/runtime-src/packages/apache-httpd"> 104 <arg value="-d"/> 105 <arg value="httpd-2.2.11-gs.tar.gz"/> 106 </exec> 107 108 <exec executable="${basedir}/compiled/bin/windows/tar.exe" dir="${basedir}/compiled/runtime-src/packages/apache-httpd"> 109 <arg value="-xvf"/> 110 <arg value="httpd-2.2.11-gs.tar"/> 111 </exec> 112 </if> 100 <exec executable="${basedir}/compiled/bin/windows/tar.exe" dir="${basedir}/compiled/runtime-src/packages/apache-httpd"> 101 <arg value="-xvf"/> 102 <arg value="httpd-2.2.11-gs.tar"/> 103 </exec> 113 104 114 105 <!-- compile c code --> … … 315 306 <and> 316 307 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 308 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 317 309 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 318 310 </and> … … 363 355 <and> 364 356 <not><equals arg1="${branch.path}" arg2="trunk"/></not> 357 <not><equals arg1="${branch.path}" arg2="tags/stable"/></not> 365 358 <isgreaterthan arg1="${branch.tag.version}" arg2="2.83"/> 366 359 </and>
Note:
See TracChangeset
for help on using the changeset viewer.