- Timestamp:
- 2023-03-10T21:14:46+13:00 (14 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/release-kits/kits/rk2/ant-scripts/compile.xml
r37450 r37451 100 100 101 101 <property name="allargs" value="${path.arg} ${cflags.arg} ${cxxflags.arg} ${cppflags.arg} ${ldflags.arg} ${pcpath.arg} ${ldlpath.arg}"/> 102 </if> 103 102 </if> 103 104 <!-- mac only: make errors about missing extern declarations back into warnings as in old (Mojave and before) macs --> 105 <if> 106 <bool><equals arg1="${rk.os}" arg2="mac"/></bool> 107 <rsr file="${basedir}/compiled/build.xml" pattern="CFLAGS=&quot;" replacement="CFLAGS=&quot;-Wno-error=implicit-function-declaration "/> 108 </if> 109 104 110 <!-- windows only --> 105 111 <if><bool><equals arg1="${rk.os}" arg2="windows"/></bool> … … 273 279 </if> 274 280 275 </if> 276 281 282 <!-- for 64 bit need to copy in the statically compiled IsisGdl --> 283 <!--<delete file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>--> 284 <!--<get src="http://www.greenstone.org/caveat-emptor/IsisGdl.macleopard" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>--> 285 <!--<get src="http://www.greenstone.org/caveat-emptor/IsisGdl.mac64mojave" dest="${basedir}/compiled/bin/${os.shell}/IsisGdl"/>--> 286 <exec executable="wget" failonerror="true"> 287 <arg value="-P"/> 288 <arg value="${basedir}/compiled/bin/${os.shell}"/> 289 <arg value="--no-check-certificate"/> 290 <arg value="http://www.greenstone.org/caveat-emptor/IsisGdl.mac64mojave"/> 291 </exec> 292 293 <move file="${basedir}/compiled/bin/${os.shell}/IsisGdl.mac64mojave" tofile="${basedir}/compiled/bin/${os.shell}/IsisGdl"/> 294 <chmod perm="755" file="${basedir}/compiled/bin/${os.shell}/IsisGdl"/> 295 </if> 296 277 297 <!-- in mac and linux 64 bit versions, we copy IsisGdl from caveat-emptor. However, now that it compiles under 64 bit, I don't think we need to do that anymore.--> 278 279 298 280 299 <!-- Delete all but the lib folder and the setup.bash script of the gnome support library --> … … 462 481 <!-- mac --> 463 482 <else><if><bool><equals arg1="${rk.os}" arg2="mac"/></bool> 464 <!-- grab imagemagick and ghostscript binaries --> 465 <delete dir="compiled/bin/darwin/imagemagick"/> 466 <delete dir="compiled/bin/darwin/ghostscript"/> 467 468 <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 469 470 <!--<exec executable="svn"> 471 <arg line="${global-svn-args}"/> 472 <arg value="export"/> 473 <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/imagemagick-darwin-10.5.tar.gz"/> 474 <arg value="compiled/ext/imagemagick-darwin-10.5.tar.gz"/> 475 </exec> 476 477 <exec executable="tar" dir="compiled/ext"> 478 <arg value="xvzf"/> 479 <arg value="imagemagick-darwin-10.5.tar.gz"/> 480 </exec> 481 <delete file="compiled/ext/imagemagick-darwin-10.5.tar.gz"/> 482 <move todir="compiled/bin/darwin/imagemagick"> 483 <fileset dir="compiled/ext/imagemagick/darwin"/> 484 </move>--> 485 483 <!-- grab imagemagick and ghostscript binaries --> 484 <delete dir="compiled/bin/darwin/imagemagick"/> 485 <delete dir="compiled/bin/darwin/ghostscript"/> 486 487 <if><bool><equals arg1="${post.2.83.version}" arg2="true"/></bool> 488 489 <!-- before mojave --> 490 <!--<property name="darwin-imagick-tarball" value="imagemagick-darwin-10.5.tar.gz"/>--> 491 <!-- mojave onwards --> 492 <property name="darwin-imagick-tarball" value="imagemagick-darwin-10.11.tar.gz"/> 493 494 <!-- grab imagemagick binaries for El Capitan --> 495 <!-- Grab the imagemagick compiled on an XWindows-less darwin 10.11 (El Capitan) 496 but where it was made backwards compatible with 10.8 (Mountain Lion) with mmacosx-version-min flag. 497 Upto and including the gs3.08 release this code still referred to imagemagick-darwin-10.5.tar.gz --> 498 <exec executable="svn"> 499 <arg line="${global-svn-args}"/> 500 <arg value="export"/> 501 <arg value="${svn.root}/gs2-extensions/imagemagick/trunk/${darwin-imagick-tarball}"/> 502 <arg value="compiled/ext/${darwin-imagick-tarball}"/> 503 </exec> 504 505 <exec executable="tar" dir="compiled/ext"> 506 <arg value="xvzf"/> 507 <arg value="${darwin-imagick-tarball}"/> 508 </exec> 509 <delete file="compiled/ext/${darwin-imagick-tarball}"/> 510 <move todir="compiled/bin/darwin/imagemagick"> 511 <fileset dir="compiled/ext/imagemagick/darwin"/> 512 </move> 513 514 <!-- No more use for the decompressed ext/imagemagick folder, as it contains only setup scripts 515 that end up referring to the (empty) ext/imagemagick in the environment. 516 On sourcing GS2's setup script, these env vars further conflict with cmdline wget on newer Macs, 517 as DYLD_FALLBACK_LIBRARY_PATH (another env var hidden on Macs) ends up set. --> 518 <delete dir="compiled/ext/imagemagick"/> <!-- dir = The directory to delete, including all its files and subdirectories. --> 519 520 <!-- 521 <exec executable="svn"> 522 <arg line="${global-svn-args}"/> 523 <arg value="export"/> 524 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/> 525 <arg value="compiled/bin/darwin/imagemagick"/> 526 </exec> 527 --> 528 <exec executable="svn"> 529 <arg line="${global-svn-args}"/> 530 <arg value="export"/> 531 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/> 532 <arg value="compiled/bin/darwin/ghostscript"/> 533 </exec> 534 535 <else> 486 536 <exec executable="svn"> 487 537 <arg line="${global-svn-args}"/> 488 <arg value="export"/> 489 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/imagemagick"/> 490 <arg value="compiled/bin/darwin/imagemagick"/> 491 </exec> 492 493 <exec executable="svn"> 494 <arg line="${global-svn-args}"/> 495 <arg value="export"/> 496 <arg value="${svn.root}/main/${branch.path}/binaries/mac/intel/ghostscript"/> 497 <arg value="compiled/bin/darwin/ghostscript"/> 498 </exec> 499 500 <else> 501 <exec executable="svn"> 502 <arg line="${global-svn-args}"/> 503 <arg value="export"/> 504 <arg value="${svn.root}/main/trunk/binaries/mac/intel/imagemagick"/> 505 <arg value="compiled/bin/darwin/imagemagick"/> 506 </exec> 507 508 <exec executable="svn"> 509 <arg line="${global-svn-args}"/> 510 <arg value="export"/> 511 <arg value="${svn.root}/main/trunk/binaries/mac/intel/ghostscript"/> 512 <arg value="compiled/bin/darwin/ghostscript"/> 513 </exec> 514 </else> 515 </if> 516 517 <!-- delete unneeded files --> 518 <delete><fileset dir="compiled" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete> 538 <arg value="export"/> 539 <arg value="${svn.root}/main/trunk/binaries/mac/intel/imagemagick"/> 540 <arg value="compiled/bin/darwin/imagemagick"/> 541 </exec> 542 543 <exec executable="svn"> 544 <arg line="${global-svn-args}"/> 545 <arg value="export"/> 546 <arg value="${svn.root}/main/trunk/binaries/mac/intel/ghostscript"/> 547 <arg value="compiled/bin/darwin/ghostscript"/> 548 </exec> 549 </else> 550 </if> 551 552 <!-- delete unneeded files --> 553 <delete><fileset dir="compiled" includes="win32.mak,win32cfg.h,Install.sh,Support.htm"/></delete> 519 554 <!-- 520 555 Actually useful to keep these files around for a Pure Java install … … 538 573 <env key="GSDLOS" value="windows"/> 539 574 <env key="PERL_PERTURB_KEYS" value="0"/> 575 <env key="PERL_HASH_SEED" value="0"/> 540 576 <env key="PATH" path="${basedir}/compiled/bin/windows/perl/bin:${basedir}/compiled/bin/windows:${basedir}/compiled/bin/script:${env.PATH}"/> 541 577 </exec> … … 544 580 <arg line="bin/script/buildcol.pl demo"/> 545 581 <env key="PERL_PERTURB_KEYS" value="0"/> 582 <env key="PERL_HASH_SEED" value="0"/> 546 583 <env key="GSDLHOME" path="${basedir}/compiled"/> 547 584 <env key="GSDLCOLLECTDIR" path="${basedir}/compiled/collect"/>
Note:
See TracChangeset
for help on using the changeset viewer.
