Changeset 24795 for main/trunk/release-kits/kits/rk2
- Timestamp:
- 2011-10-27T15:53:31+13:00 (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r24767 r24795 32 32 <!-- set version numbers --> 33 33 <antcall target="gsdl-set-version-numbers"><param name="gsdl.basedir" value="${basedir}/compiled"/></antcall> 34 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall>34 <antcall target="gli-set-version-numbers"><param name="glibasedir" value="${basedir}/compiled/gli"/></antcall> 35 35 36 36 <!-- we do not want the *.app folders if we are not mac--> … … 178 178 <!-- run configure --> 179 179 <exec dir="${basedir}/compiled" executable="${basedir}/compiled/configure" failonerror="true"> 180 <arg line="--enable-apache-httpd"/> 180 <arg line="--enable-apache-httpd --disable-wvware"/> 181 </exec> 182 183 <exec executable="tar" dir="${basedir}/compiled/build-src/packages/wv"> 184 <arg value="xvzf"/> 185 <arg value="wv-1.2.4-gs.tar.gz"/> 186 </exec> 187 188 <exec dir="${basedir}/compiled/build-src/packages/wv/wv-gs" executable="${basedir}/compiled/build-src/packages/wv/wv-gs/configure" failonerror="true"> 189 <arg line="--prefix=${basedir}/compiled/build-src/packages/wv --bindir=${basedir}/compiled/bin/linux --libdir=${basedir}/compiled/lib/linux --datadir=${basedir}/compiled/etc/packages"/> 181 190 <arg line="${allargs}"/> 182 191 </exec> … … 213 222 <!-- make apache-for-dist --> 214 223 <exec dir="${basedir}/compiled" executable="make" failonerror="true"><arg value="apache-for-dist"/></exec> 224 225 <if><bool><equals arg1="${rk.os}" arg2="linux"/></bool> 226 <exec dir="${basedir}/compiled/build-src/packages/wv/wv-gs" executable="make" failonerror="true"> 227 <arg line="${ldlpath.arg}"/> 228 </exec> 229 <exec dir="${basedir}/compiled/build-src/packages/wv/wv-gs" executable="make" failonerror="true"><arg value="install"/></exec> 230 </if> 215 231 216 232 <!-- strip executables --> … … 328 344 329 345 <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 330 <if><bool><equals arg1="${x64}" arg2="true"/></bool>346 <!--<if><bool><equals arg1="${x64}" arg2="true"/></bool>--> 331 347 <exec executable="svn"> 332 348 <arg value="export"/> 333 <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-linux -x64.tar.gz"/>334 <arg value="compiled/ext/imagemagick-linux -x64.tar.gz"/>349 <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-linux${extension-x64}.tar.gz"/> 350 <arg value="compiled/ext/imagemagick-linux${extension-x64}.tar.gz"/> 335 351 </exec> 336 352 337 353 <exec executable="tar" dir="compiled/ext"> 338 354 <arg value="xvzf"/> 339 <arg value="imagemagick-linux-x64.tar.gz"/> 340 </exec> 341 <delete file="compiled/ext/imagemagick-linux-x64.tar.gz"/> 342 <else> 355 <arg value="imagemagick-linux${extension-x64}.tar.gz"/> 356 </exec> 357 <delete file="compiled/ext/imagemagick-linux${extension-x64}.tar.gz"/> 358 <move todir="compiled/bin/linux/imagemagick"> 359 <fileset dir="compiled/ext/imagemagick/linux"/> 360 </move> 361 <!--<else> 343 362 <exec executable="svn"> 344 363 <arg value="export"/> … … 347 366 </exec> 348 367 </else> 349 </if> 368 </if>--> 350 369 <else> 351 370 <delete dir="compiled/bin/linux/wv"/>
Note:
See TracChangeset
for help on using the changeset viewer.