Changeset 16936 for greenstone3
- Timestamp:
- 2008-08-21T12:19:47+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/build.xml
r16796 r16936 48 48 49 49 --> 50 51 50 52 51 <!--the first three properties have to be put on the top to be used by build.properties--> … … 106 105 <isset property="tomcat.installed.path"/> 107 106 <not> 108 107 <equals arg1="" arg2="${tomcat.installed.path}"/> 109 108 </not> 110 109 </and> … … 127 126 <os family="unix"/> 128 127 <not> 129 128 <os family="mac"/> 130 129 </not> 131 130 </and> … … 236 235 <!-- Include the axis jar files --> 237 236 <!--<fileset dir="${basedir}/comms/soap/axis/lib"> 238 <include name="*.jar"/>239 </fileset>-->237 <include name="*.jar"/> 238 </fileset>--> 240 239 241 240 <!-- include the jar files from the source packages --> … … 299 298 includes="*.sh,*.pl"/> 300 299 </target> 300 301 301 <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile" 302 302 description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/> … … 307 307 description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/> 308 308 309 310 309 <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building" 311 310 description="Configure any C/C+/+ package code and gs2building code if necessary"/> … … 329 328 description="Startup the Tomcat server." > 330 329 <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 331 <echo>Tomcat: 332 <echo>Java :${java.home}</echo>333 <echo>URL :http://${tomcat.server}:${tomcat.port}${app.path}/</echo>330 <echo>Tomcat: ${catalina.home}</echo> 331 <echo>Java : ${java.home}</echo> 332 <echo>URL : http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 334 333 <!-- assuming that index.html is not needed here --> 335 334 </target> … … 384 383 <condition property="java.too.old"> 385 384 <or> 386 387 388 385 <equals arg1="1.1" arg2="${ant.java.version}"/> 386 <equals arg1="1.2" arg2="${ant.java.version}"/> 387 <equals arg1="1.3" arg2="${ant.java.version}"/> 389 388 </or> 390 389 </condition> … … 397 396 <condition property="tomcat.islocal"> 398 397 <or> 399 <not> 400 <isset property="tomcat.installed.path"/> 401 </not> 402 <equals arg1="" arg2="${tomcat.installed.path}"/> 398 <not><isset property="tomcat.installed.path"/></not> 399 <equals arg1="" arg2="${tomcat.installed.path}"/> 403 400 </or> 404 401 </condition> … … 415 412 <condition property="proxy.present"> 416 413 <and> 417 <isset property="proxy.host"/> 418 <not> 419 <equals arg1="" arg2="${proxy.host}"/> 420 </not> 414 <isset property="proxy.host"/> 415 <not><equals arg1="" arg2="${proxy.host}"/></not> 421 416 </and> 422 417 </condition> … … 424 419 <condition property="need.macos.extra"> 425 420 <and> 426 <isset property="current.os.ismac"/> 427 <not> 428 <isset property="disable.collection.building"/> 429 </not> 421 <isset property="current.os.ismac"/> 422 <not><isset property="disable.collection.building"/></not> 430 423 </and> 431 424 </condition> … … 435 428 <condition property="ask.user"> 436 429 <or> 437 438 430 <equals arg1="" arg2="${proxy.user}"/> 431 <equals arg1="" arg2="${proxy.password}"/> 439 432 </or> 440 433 </condition> … … 457 450 <condition property="need.xalan.jar"> 458 451 <or> 459 460 452 <equals arg1="1.5" arg2="${ant.java.version}"/> 453 <equals arg1="1.6" arg2="${ant.java.version}"/> 461 454 </or> 462 455 </condition> … … 465 458 <if> 466 459 <bool> 467 468 469 470 460 <and> 461 <isset property="have.xalan.jar"/> 462 <not><isset property="need.xalan.jar"/></not> 463 </and> 471 464 </bool> 472 465 <antcall target="deactivate-xalan-jar"/> … … 476 469 <if> 477 470 <bool> 478 479 480 481 471 <and> 472 <not><isset property="have.xalan.jar"/></not> 473 <isset property="need.xalan.jar"/> 474 </and> 482 475 </bool> 483 476 <antcall target="activate-xalan-jar"/> … … 503 496 504 497 505 <target name="prepare-collections" depends="init">506 <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>507 <property name="import.zip" value="import.zip"/>508 <property name="metadata.zip" value="metadata.zip"/>509 <property name="index.zip" value="index/index.zip"/>510 511 <echo message="installing collections..."/>512 <antcall target="gs2mgdemo-install"/>513 <antcall target="gs2mgppdemo-install"/>514 <antcall target="gberg-install"/>515 516 </target>517 518 <target name="gs2mgdemo-prepare" if="collect.dir">519 <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>520 521 <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">522 <include name="${import.zip}"/>523 <include name="${metadata.zip}"/>524 <include name="${index.zip}"/>525 </fileset>526 527 <condition property="gs2mgdemo.present">528 <and>529 <available file="${gs2mgdemo.dir}/${import.zip}"/>530 <available file="${gs2mgdemo.dir}/${metadata.zip}"/>531 <available file="${gs2mgdemo.dir}/${index.zip}"/>532 </and>533 </condition>534 </target>535 536 <target name="gs2mgdemo-install" if="gs2mgdemo.present" depends="gs2mgdemo-prepare">537 <echo> installing gs2mgdemo</echo>538 <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${import.zip}" />539 <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" />540 <unzip dest="${gs2mgdemo.dir}/index" src="${gs2mgdemo.dir}/${index.zip}" />541 <!--Don't delete the zips, else doing an svn update will get them all over again.-->542 <!--<delete><fileset refid="gs2mgdemofiles"/></delete>-->543 <echo>collection gs2mgdemo installed</echo>544 </target>545 546 <target name="gs2mgppdemo-prepare" if="collect.dir">547 <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>548 549 <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">550 <include name="${import.zip}"/>551 <include name="${metadata.zip}"/>552 <include name="${index.zip}"/>553 </fileset>554 555 <condition property="gs2mgppdemo.present">556 <and>557 <available file="${gs2mgppdemo.dir}/${import.zip}"/>558 <available file="${gs2mgppdemo.dir}/${metadata.zip}"/>559 <available file="${gs2mgppdemo.dir}/${index.zip}"/>560 </and>561 </condition>562 </target>563 564 <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">565 <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${import.zip}" />566 <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" />567 <unzip dest="${gs2mgppdemo.dir}/index" src="${gs2mgppdemo.dir}/${index.zip}" />568 <!--<delete><fileset refid="gs2mgppdemofiles"/></delete>-->569 <echo>collection gs2mgppdemo installed</echo>570 </target>571 572 <target name="gberg-prepare" if="collect.dir">573 <property name="gberg.dir" value="${collect.dir}/gberg"/>574 575 <fileset id="gbergfiles" dir="${gberg.dir}">576 <include name="${index.zip}"/>577 </fileset>578 <available file="${gberg.dir}/${index.zip}" property="gberg.present"/>579 </target>580 581 <target name="gberg-install" if="gberg.present" depends="gberg-prepare">582 <unzip dest="${gberg.dir}/index">583 <fileset refid="gbergfiles"/>584 </unzip>585 <!--<delete><fileset refid="gbergfiles"/></delete>-->586 <echo>collection gberg installed</echo>587 </target>588 589 590 591 <!--592 498 <target name="prepare-collections" depends="init"> 593 499 <property name="collect.dir" value="${web.home}/sites/localsite/collect"/> 594 500 <property name="import.zip" value="import.zip"/> 501 <property name="metadata.zip" value="metadata.zip"/> 502 <property name="index.zip" value="index/index.zip"/> 503 504 <echo message="installing collections..."/> 505 <antcall target="gs2mgdemo-install"/> 506 <antcall target="gs2mgppdemo-install"/> 507 <antcall target="gberg-install"/> 508 </target> 509 510 <target name="gs2mgdemo-prepare" if="collect.dir"> 511 <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/> 512 <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}"> 513 <include name="${import.zip}"/> 514 <include name="${metadata.zip}"/> 515 <include name="${index.zip}"/> 516 </fileset> 517 518 <condition property="gs2mgdemo.present"> 519 <and> 520 <available file="${gs2mgdemo.dir}/${import.zip}"/> 521 <available file="${gs2mgdemo.dir}/${metadata.zip}"/> 522 <available file="${gs2mgdemo.dir}/${index.zip}"/> 523 </and> 524 </condition> 525 </target> 526 527 <target name="gs2mgdemo-install" if="gs2mgdemo.present" depends="gs2mgdemo-prepare"> 528 <echo> installing gs2mgdemo</echo> 529 <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${import.zip}" /> 530 <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" /> 531 <unzip dest="${gs2mgdemo.dir}/index" src="${gs2mgdemo.dir}/${index.zip}" /> 532 <!--Don't delete the zips, else doing an svn update will get them all over again.--> 533 <!--<delete><fileset refid="gs2mgdemofiles"/></delete>--> 534 <echo>collection gs2mgdemo installed</echo> 535 </target> 536 537 <target name="gs2mgppdemo-prepare" if="collect.dir"> 538 <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/> 539 540 <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}"> 541 <include name="${import.zip}"/> 542 <include name="${metadata.zip}"/> 543 <include name="${index.zip}"/> 544 </fileset> 545 546 <condition property="gs2mgppdemo.present"> 547 <and> 548 <available file="${gs2mgppdemo.dir}/${import.zip}"/> 549 <available file="${gs2mgppdemo.dir}/${metadata.zip}"/> 550 <available file="${gs2mgppdemo.dir}/${index.zip}"/> 551 </and> 552 </condition> 553 </target> 554 555 <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare"> 556 <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${import.zip}" /> 557 <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" /> 558 <unzip dest="${gs2mgppdemo.dir}/index" src="${gs2mgppdemo.dir}/${index.zip}" /> 559 <!--<delete><fileset refid="gs2mgppdemofiles"/></delete>--> 560 <echo>collection gs2mgppdemo installed</echo> 561 </target> 562 563 <target name="gberg-prepare" if="collect.dir"> 564 <property name="gberg.dir" value="${collect.dir}/gberg"/> 565 <fileset id="gbergfiles" dir="${gberg.dir}"> 566 <include name="${index.zip}"/> 567 </fileset> 568 <available file="${gberg.dir}/${index.zip}" property="gberg.present"/> 569 </target> 570 571 <target name="gberg-install" if="gberg.present" depends="gberg-prepare"> 572 <unzip dest="${gberg.dir}/index"> 573 <fileset refid="gbergfiles"/> 574 </unzip> 575 <!--<delete><fileset refid="gbergfiles"/></delete>--> 576 <echo>collection gberg installed</echo> 577 </target> 578 579 <!-- 580 <target name="prepare-collections" depends="init"> 581 <property name="collect.dir" value="${web.home}/sites/localsite/collect"/> 595 582 <unzip src="${collect.dir}/gs2mgdemo/import.zip" 596 583 dest="${collect.dir}/gs2mgdemo"/> … … 617 604 <delete file="${collect.dir}/gberg/index/index.zip"/> 618 605 </target> 619 --> 620 621 622 606 --> 607 623 608 <target name="configure-web" depends="init" 624 609 description="Configure only the web app config files"> … … 643 628 deprecation="${compile.deprecation}" 644 629 optimize="${compile.optimize}"> 645 <classpath> 646 <path refid="compile.classpath"/> 647 </classpath> 630 <classpath><path refid="compile.classpath"/></classpath> 648 631 </javac> 649 632 </target> … … 657 640 <target name="update-web" depends="init,svnupdate-web,configure-web" 658 641 description="update only the web stuff (config files)"/> 659 660 642 661 643 <!-- ======================= Tomcat Targets ========================== --> … … 699 681 <copy file="${basedir}/resources/tomcat/server.xml" tofile="${packages.home}/tomcat/conf/server.xml" overwrite="true"> 700 682 <filterset> 701 702 683 <filter token="port" value="${tomcat.port}"/> 684 <filter token="shutdown-port" value="${tomcat.shutdown.port}"/> 703 685 </filterset> 704 686 </copy> … … 706 688 <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true"> 707 689 <filterset> 708 690 <filter token="gsdl3webhome" value="${web.home}"/> 709 691 </filterset> 710 692 </copy> … … 743 725 <waitfor maxwait="5" maxwaitunit="second"> 744 726 <and> 745 746 727 <socket server="${tomcat.server}" port="${tomcat.port}"/> 728 <http url="http://${tomcat.server}:${tomcat.port}${app.path}/index.html"/> 747 729 </and> 748 730 </waitfor> … … 783 765 784 766 785 786 787 788 789 767 <!-- ======================= ant Targets ============================ --> 790 768 <target name="prepare-ant" depends="init"> … … 813 791 <copy todir="${web.lib}"> 814 792 <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/lib"> 815 793 <include name="*.jar"/> 816 794 </fileset> 817 795 </copy> 818 796 <copy todir="${web.home}"> 819 797 <fileset dir="${packages.home}/axis/webapps/axis/"> 820 821 798 <include name="*.jsp"/> 799 <include name="*.jws"/> 822 800 </fileset> 823 801 </copy> … … 825 803 <copy todir="${web.classes}"> 826 804 <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/classes"> 827 805 <include name="*.properties"/> 828 806 </fileset> 829 807 </copy> … … 859 837 </target> 860 838 861 <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server862 with the default servicename of localsite-->839 <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server 840 with the default servicename of localsite--> 863 841 <target name="deploy-localsite" depends="init" 864 842 description="Deploy the SOAP server for localsite. Will start and stop Tomcat."> … … 878 856 </target> 879 857 880 <target name="get-sitename" unless="axis.sitename">858 <target name="get-sitename" unless="axis.sitename"> 881 859 <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for? 882 860 Press Enter for default:localsite</input> … … 913 891 </not> 914 892 </condition> 915 </target>893 </target> 916 894 917 <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename">895 <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename"> 918 896 <filter token="sitename" value="${axis.sitename}"/> 919 897 <filter token="siteuri" value="${axis.siteuri}"/> … … 993 971 optimize="${compile.optimize}"> 994 972 <classpath> 995 973 <path refid="compile.classpath"/> 996 974 </classpath> 997 975 </javac> 998 976 <jar destfile="${build.home}/gsdl3.jar"> 999 977 <fileset dir="${build.home}"> 1000 978 <include name="org/greenstone/gsdl3/**"/> 1001 979 <include name="org/flax/**"/> 1002 980 <exclude name="**/Test.class"/> 1003 981 </fileset> 1004 982 <manifest> 1005 983 <attribute name="Built-By" value="${user.name}" /> 1006 984 </manifest> 1007 985 </jar> … … 1012 990 <jar destfile="${build.home}/GAI.jar"> 1013 991 <fileset dir="${build.home}"> 1014 992 <include name="org/greenstone/admin/**"/> 1015 993 </fileset> 1016 994 <manifest> 1017 995 <attribute name="Built-By" value="${user.name}" /> 1018 996 </manifest> 1019 997 </jar> … … 1021 999 <jar destfile="${build.home}/phind.jar"> 1022 1000 <fileset dir="${build.home}"> 1023 1001 <include name="org/greenstone/applet/phind/**"/> 1024 1002 </fileset> 1025 1003 <manifest> 1026 1004 <attribute name="Built-By" value="${user.name}" /> 1027 1005 </manifest> 1028 1006 </jar> … … 1034 1012 <jar destfile="${build.home}/anttasks.jar"> 1035 1013 <fileset dir="${build.home}"> 1036 1014 <include name="org/greenstone/anttasks/**"/> 1037 1015 </fileset> 1038 1016 <manifest> 1039 1017 <attribute name="Built-By" value="${user.name}" /> 1040 1018 </manifest> 1041 1019 </jar> … … 1043 1021 <jar destfile="${build.home}/gsdl3test.jar"> 1044 1022 <fileset dir="${build.home}"> 1045 1046 1023 <include name="org/greenstone/gsdl3/**/*Test.class"/> 1024 <include name="org/greenstone/testing/**"/> 1047 1025 </fileset> 1048 1026 <manifest> 1049 1027 <attribute name="Built-By" value="${user.name}" /> 1050 1028 </manifest> 1051 1029 </jar> 1052 1030 <jar destfile="${build.home}/server.jar"> 1053 1031 <fileset dir="${build.home}"> 1054 1032 <include name="org/greenstone/server/**"/> 1055 1033 </fileset> 1056 1034 <fileset file="${basedir}/resources/java/server.properties"/> 1057 1035 <manifest> 1058 1036 <attribute name="Built-By" value="${user.name}"/> 1059 1037 </manifest> 1060 1038 </jar> … … 1110 1088 Shouldn't they be configured when collection building is ENabled? --> 1111 1089 1112 <!-- 1090 <!-- <target name="configure-indexers" depends="init" if="independent-indexers"> --> 1113 1091 <target name="configure-indexers" depends="init"> 1114 1092 <echo>Configuring Indexers</echo> … … 1137 1115 <arg value="clean"/> 1138 1116 </exec> 1139 1140 </target> 1117 </target> 1118 1141 1119 <target name="distclean-packages" depends="init,distclean-javagdbm,distclean-indexers" description="Distclean only the packages"/> 1142 1120 … … 1157 1135 <arg value="clean"/> 1158 1136 </exec> 1159 1160 1137 </target> 1161 1138 … … 1291 1268 <svn> 1292 1269 <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/> 1293 </svn> 1270 </svn> 1294 1271 </target> 1295 1272 … … 1297 1274 <svn> 1298 1275 <update dir="winbin" revision="${branch.revision}"/> 1299 </svn> 1276 </svn> 1300 1277 </target> 1301 1278 … … 1319 1296 1320 1297 <!-- downloads a good XML-Parser --> 1321 <target name="get-macos-extra" depends="init" if="need.macos.extra"> 1322 <!--1323 1298 <target name="get-macos-extra" depends="init" if="need.macos.extra"> 1299 <!-- 1300 <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" 1324 1301 dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 1325 1302 usetimestamp="true"/> 1326 -->1303 --> 1327 1304 <echo>Nothing extra currently needed for MacOs prepare</echo> 1328 1305 </target> 1329 1306 1330 <!-- untars the XML-Parser. need to do this after compiling in gs2build-->1307 <!-- untars the XML-Parser. need to do this after compiling in gs2build--> 1331 1308 <target name="install-macos-extra" depends="init,get-macos-extra" if="need.macos.extra"> 1332 1309 <!-- make sure these directories are present, otherwise chmod craps out 1333 1310 this chmod is needed in case we are unpacking for a second time --> 1334 <!--1311 <!-- 1335 1312 <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.8"/> 1336 1313 <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.6"/> … … 1340 1317 dest="${gs2build.home}/perllib/cpan/" 1341 1318 compression="gzip"/> 1342 -->1319 --> 1343 1320 <echo>Nothing extra currently needed for MacOs install</echo> 1344 1321 </target> … … 1483 1460 <copy todir="${gs2build.home}/bin/windows"> 1484 1461 <fileset dir="${gs2build.home}/common-src/indexers/bin"> 1485 1462 <include name="*.*"/> 1486 1463 </fileset> 1487 1464 </copy> … … 1518 1495 <formatter type="plain"/> 1519 1496 <classpath> 1520 1521 1497 <pathelement location="${build.home}/gsdl3test.jar"/> 1498 <path refid="compile.classpath"/> 1522 1499 </classpath> 1523 1500 <test name="${testcase}" if="testcase"/> 1524 1501 <batchtest todir="${basedir}/test" unless="testcase"> 1525 <fileset dir="${build.home}" 1526 includes="**/*Test.class" 1527 /> 1502 <fileset dir="${build.home}" ncludes="**/*Test.class" /> 1528 1503 </batchtest> 1529 1504 </junit> … … 1547 1522 <svn> 1548 1523 <checkout url="${flax.checkout.path}/src/java/org/flax/" 1549 1524 destPath="${basedir}/src/java/org/flax"/> 1550 1525 <checkout url="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax/" 1551 1526 destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 1552 1527 <checkout url="${flax.checkout.path}/web/WEB-INF/classes/flax/" 1553 1528 destPath="${web.home}/WEB-INF/classes/flax"/> 1554 1529 <checkout url="${flax.checkout.path}/web/interfaces/flax/" 1555 1530 destPath="${web.home}/interfaces/flax"/> 1556 1531 <checkout url="${flax.checkout.path}/web/sites/flax/" 1557 1532 destPath="${web.home}/sites/flax"/> 1558 1533 <checkout url="${flax.checkout.path}/flax-resources" 1559 1534 destPath="${basedir}/flax-resources"/> 1560 1535 <checkout url="${flax.checkout.path}/lib" 1561 1536 destPath="${basedir}/flax-lib"/> 1562 1537 </svn> 1563 1538 <echo>prepare flax files...</echo> … … 1585 1560 <unzip dest="${coll.dir}"> 1586 1561 <fileset dir="${coll.dir}"> 1587 1562 <include name="*.zip"/> 1588 1563 </fileset> 1589 1564 </unzip> … … 1597 1572 <unzip dest="${classes.dir}"> 1598 1573 <fileset dir="${classes.dir}"> 1599 1574 <include name="*.zip"/> 1600 1575 </fileset> 1601 1576 </unzip> … … 1667 1642 1668 1643 </project> 1669 1670
Note:
See TracChangeset
for help on using the changeset viewer.