Changeset 15229
- Timestamp:
- 2008-04-28T18:00:54+12:00 (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
greenstone3/trunk/build.xml
r15190 r15229 9 9 <project name="greenstone3" default="usage" basedir="."> 10 10 11 12 13 14 <include name="**/*.jar"/>15 16 17 18 19 20 21 22 23 24 25 26 27 28 11 <!-- ============ classpath =================== --> 12 <path id="project.classpath"> 13 <fileset dir="lib/java"> 14 <include name="**/*.jar"/> 15 </fileset> 16 </path> 17 18 <!-- ============ self defined tasks =================== --> 19 <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpathref="project.classpath"/> 20 <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpathref="project.classpath"/> 21 <taskdef name="svn" classname="org.tigris.subversion.svnant.SvnTask" classpathref="project.classpath"/> 22 <taskdef name="rsr" classname="org.greenstone.anttasks.RegexSearchReplace" classpathref="project.classpath"/> 23 <taskdef name="if" classname="ise.antelope.tasks.IfTask" classpathref="project.classpath"/> 24 <taskdef name="try" classname="ise.antelope.tasks.TryTask" classpathref="project.classpath"/> 25 26 <!-- ===================== Property Definitions =========================== --> 27 28 <!-- 29 29 30 30 Each of the following properties are used in the build script. … … 35 35 36 36 * Definitions from a "build.properties" file in the top level 37 source directory of this application.37 source directory of this application. 38 38 39 39 * Definitions from a "build.properties" file in the user's 40 home directory.40 home directory. 41 41 42 42 * Default definitions in this build.xml file. … … 48 48 "build.properties" files as well as in the "build.xml" script. 49 49 50 --> 51 52 50 --> 51 53 52 <!--the first two properties have to be put on the top to be used by build.properties--> 54 53 <property name="src.packages.home" value="${basedir}/src/packages"/> … … 59 58 <!-- get properties from the environment --> 60 59 <property environment="env"/> 61 62 63 <!-- version properties for external packages -->64 <property name="tomcat.version" value="apache-tomcat-5.5.25"/>65 <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/>66 <property name="axis.dir.version" value="axis-1_2_1"/>67 <property name="gdbm.version" value="gdbm-1.8.3"/>68 69 60 <property name="build.home" value="${basedir}/build"/> 70 61 <property name="src.home" value="${basedir}/src/java"/> … … 84 75 <!-- jni libraries and java wrappers go here --> 85 76 <property name="lib.jni" value="${basedir}/lib/jni"/> 86 77 87 78 <property name="javadocs" value="${basedir}/docs/javadoc"/> 88 79 … … 164 155 </condition> 165 156 166 167 168 157 <!-- where is search4j tool --> 158 <condition property="search4j.exec" value="bin/search4j.exe"> 159 <isset property="current.os.iswindows"/> 169 160 </condition> 170 161 <property name="search4j.exec" value="bin/search4j"/> 171 162 172 163 173 164 <!-- ============= Base dirs for each package and component ============ --> 174 165 <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/> … … 178 169 <property name="gli.home" value="${basedir}/gli"/> 179 170 <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/> 180 171 181 172 <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">--> 182 173 <condition property="indexers.home" value="${basedir}/src/packages/indexers"> … … 193 184 <property name="lucene.home" value="${indexers.home}/lucene-gs"/> 194 185 195 196 <!-- ==================== Compilation Control Options ==================== --> 197 198 <!-- 186 <!-- ================ A list of all the available web services classes ============== --> 187 <property name="web.services.list" value="SOAPServer, QBRSOAPServer"/> 188 189 <!-- ==================== Compilation Control Options ==================== --> 190 191 <!-- 199 192 200 193 These properties control option settings on the Javac compiler when it … … 207 200 compile.optimize Should compilation include the optimize option? 208 201 209 202 --> 210 203 211 204 <property name="compile.debug" value="true"/> … … 213 206 <property name="compile.optimize" value="true"/> 214 207 215 208 <!-- 216 209 217 210 Rather than relying on the CLASSPATH environment variable, Ant includes … … 222 215 that you explicitly added. 223 216 224 217 --> 225 218 226 219 <path id="compile.classpath"> … … 238 231 <!-- Include the axis jar files --> 239 232 <!--<fileset dir="${basedir}/comms/soap/axis/lib"> 240 <include name="*.jar"/>241 </fileset>-->233 <include name="*.jar"/> 234 </fileset>--> 242 235 243 236 <!-- include the jar files from the source packages --> … … 286 279 <echo>os.unix: ${os.unix}</echo> 287 280 </target> 288 281 <!-- ==================== Primary and Global Targets ============================= --> 289 282 290 283 <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? --> … … 292 285 <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections,prepare-gdbm, prepare-flax" 293 286 description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this."> 294 287 <!-- <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections" 295 288 description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this.">--> 296 289 … … 304 297 description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/> 305 298 306 307 description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>-->299 <!-- <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web" 300 description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>--> 308 301 <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web" 309 302 description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/> … … 316 309 description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/> 317 310 318 <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building ,clean-gdbm"311 <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building" 319 312 description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/> 320 321 <target name="distclean" depends="init,distclean-packages,clean-core,distclean-gs2building,distclean-gdbm"322 description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes core, packages, gs2building as necessary"/>323 313 324 314 <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building" 325 315 description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/> 326 316 327 317 <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile" 328 description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile. To do this without any SVN updates, run it like 'ant -Dnosvn.mode=yes update'"/>318 description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/> 329 319 330 320 <target name="start" depends="init,start-tomcat" 331 321 description="Startup the Tomcat server." > 332 333 334 335 <echo>URL: http://${tomcat.server}:${tomcat.port}${app.path}/</echo>336 <!-- assuming that index.html is not needed here -->322 <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo> 323 <echo>Tomcat: ${catalina.home}</echo> 324 <echo>Java: ${java.home}</echo> 325 <echo>URL: http://${tomcat.server}:${tomcat.port}${app.path}/</echo> 326 <!-- assuming that index.html is not needed here --> 337 327 </target> 338 328 … … 343 333 344 334 345 335 <!-- =========== Help targets =================================== --> 346 336 347 337 <property name="install-command" value="ant [options] prepare install"/> … … 351 341 <echo message=" Execute 'ant -help' for Ant help."/> 352 342 <echo>To install Greenstone3, run '${install-command}'. 353 354 355 343 There are properties defined in build.properties. The install process will ask you if these properties are set correctly. To avoid this prompt, use the '-Dproperties.accepted=yes' option. 344 To log the output, use the '-logfile build.log' option. 345 The README.txt file has more information about the ant targets and install process. 356 346 </echo> 357 347 </target> … … 363 353 </target> 364 354 365 355 <!-- ====== initialization and setup targets ================== --> 366 356 367 357 <target name="accept-properties" unless="properties.accepted"> 368 358 <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory: 369 370 371 372 373 374 359 tomcat.server=${tomcat.server} 360 tomcat.port=${tomcat.port} 361 tomcat.installed.path=${tomcat.installed.path} (this is the location of Tomcat's base dir if it is already installed) 362 proxy.host=${proxy.host} 363 proxy.port=${proxy.port} 364 If these are not acceptable, please change them and rerun this target. Continue [y/n]? /> 375 365 </input> 376 366 <condition property="do.abort"> … … 380 370 </target> 381 371 372 <!-- <target name="check-cvsroot"> 373 <condition property="svnroot.notset"> 374 <or> 375 <not> 376 <isset property="env.CVSROOT"/> 377 </not> 378 <equals arg1="" arg2="${env.CVSROOT}"/> 379 </or> 380 </condition> 381 <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/> 382 </target> --> 382 383 383 384 <!-- this sets up some initial properties --> … … 406 407 </condition> 407 408 408 <echo>tomcat.port = ${tomcat.port}</echo>409 <echo>gli.present = ${gli.present}</echo>410 <echo>gs2build.present = ${gs2build.present}</echo>411 <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo>412 <!-- gsdl2.installed.path appears not to be set? -->409 <echo>tomcat.port = ${tomcat.port}</echo> 410 <echo>gli.present = ${gli.present}</echo> 411 <echo>gs2build.present = ${gs2build.present}</echo> 412 <echo>gsdl2.installed.path = ${gsdl2.installed.path}</echo> 413 <!-- gsdl2.installed.path appears not to be set? --> 413 414 414 415 <condition property="proxy.present"> … … 441 442 <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/> 442 443 </target> 443 444 444 445 <!-- ========== Web app Targets ================================ --> 445 446 446 447 <target name="prepare-web" depends="init,configure-java-version"> … … 453 454 description="Activates or deactivates some jar libraries as needed depending on your java version"> 454 455 455 456 <available property="have.xalan.jar" file="${web.lib}/xalan.jar"/> 456 457 <condition property="need.xalan.jar"> 457 458 <equals arg1="1.5" arg2="${ant.java.version}"/>459 <equals arg1="1.6" arg2="${ant.java.version}"/>460 461 462 463 464 465 466 <and>467 468 469 </and>470 471 472 473 474 475 476 477 <and>478 479 480 </and>481 482 483 458 <or> 459 <equals arg1="1.5" arg2="${ant.java.version}"/> 460 <equals arg1="1.6" arg2="${ant.java.version}"/> 461 </or> 462 </condition> 463 464 <!-- if they have xalan.jar but dont need it --> 465 <if> 466 <bool> 467 <and> 468 <isset property="have.xalan.jar"/> 469 <not><isset property="need.xalan.jar"/></not> 470 </and> 471 </bool> 472 <antcall target="deactivate-xalan-jar"/> 473 </if> 474 475 <!-- if they need xalan.jar but dont have it --> 476 <if> 477 <bool> 478 <and> 479 <not><isset property="have.xalan.jar"/></not> 480 <isset property="need.xalan.jar"/> 481 </and> 482 </bool> 483 <antcall target="activate-xalan-jar"/> 484 </if> 484 485 485 486 </target> 486 487 487 488 <target name="activate-xalan-jar"> 488 489 <echo>activating xalan.jar</echo> 489 490 <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/> 490 491 492 493 </target> 494 495 491 <if><bool><isset property="current.os.ismac"/></bool> 492 <copy file="${web.lib}/xalan.jar.tmp" tofile="${catalina.home}/common/endorsed/xalan.jar"/> 493 </if> 494 </target> 495 496 <!-- to delete --> 496 497 <target name="copy-xalan-for-mac"></target> 497 498 498 499 <target name="deactivate-xalan-jar"> 499 500 <echo>deactivating xalan.jar</echo> 500 501 <delete file="${web.lib}/xalan.jar"/> 501 502 </target> 502 503 503 <target name="prepare-collections" depends="init">504 <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>505 <echo message="installing collections..."/>506 <antcall target="gs2mgdemo-install"/>507 <antcall target="gs2mgppdemo-install"/>508 <antcall target="gberg-install"/>509 510 </target>511 512 <target name="gs2mgdemo-prepare" if="collect.dir">513 <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>514 <property name="gs2mgdemo.import.zip" value="${gs2mgdemo.dir}/import.zip"/>515 <property name="gs2mgdemo.metadata.zip" value="${gs2mgdemo.dir}/metadata.zip"/>516 <property name="gs2mgdemo.index.zip" value="${gs2mgdemo.dir}/index.zip"/>517 518 <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">519 <include name="${gs2mgdemo.import.zip}"/>520 <include name="${gs2mgdemo.metadata.zip}"/>521 <include name="${gs2mgdemo.index.zip}"/>522 </fileset>523 524 <condition property="gs2mgdemo.present">525 <and>526 <available file="${gs2mgdemo.import.zip}"/>527 <available file="${gs2mgdemo.metadata.zip}"/>528 <available file="${gs2mgdemo.index.zip}"/>529 </and>530 </condition>531 </target>532 533 <target name="gs2mgdemo-install" if="gs2mgdemo.present" depends="gs2mgdemo-prepare">534 <echo> installing gs2mgdemo</echo>535 <unzip dest="${gs2mgdemo.dir}">536 <fileset refid="gs2mgdemofiles"/>537 </unzip>538 <delete>539 <fileset refid="gs2mgdemofiles"/>540 </delete>541 <echo>collection gs2mgdemo installed</echo>542 </target>543 544 <target name="gs2mgppdemo-prepare" if="collect.dir">545 <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>546 <property name="gs2mgppdemo.import.zip" value="${gs2mgppdemo.dir}/import.zip"/>547 <property name="gs2mgppdemo.metadata.zip" value="${gs2mgppdemo.dir}/metadata.zip"/>548 <property name="gs2mgppdemo.index.zip" value="${gs2mgppdemo.dir}/index.zip"/>549 550 <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">551 <include name="${gs2mgppdemo.import.zip}"/>552 <include name="${gs2mgppdemo.metadata.zip}"/>553 <include name="${gs2mgppdemo.index.zip}"/>554 </fileset>555 556 <condition property="gs2mgppdemo.present">557 <and>558 <available file="${gs2mgppdemo.import.zip}"/>559 <available file="${gs2mgppdemo.metadata.zip}"/>560 <available file="${gs2mgppdemo.index.zip}"/>561 </and>562 </condition>563 </target>564 565 <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">566 <unzip dest="${gs2mgppdemo.dir}">567 <fileset refid="gs2mgppdemofiles"/>568 </unzip>569 <delete>570 <fileset refid="gs2mgppdemofiles"/>571 </delete>572 <echo>collection gs2mgppdemo installed</echo>573 </target>574 575 <target name="gberg-prepare" if="collect.dir">576 <property name="gberg.dir" value="${collect.dir}/gberg"/>577 <property name="gberg.index.zip" value="${gberg.dir}/index.zip"/>578 579 <fileset id="gbergfiles" dir="${gberg.dir}">580 <include name="${gberg.index.zip}"/>581 </fileset>582 <available file="${gberg.index.zip}" property="gberg.present"/>583 </target>584 585 <target name="gberg-install" if="gberg.present" depends="gberg-prepare">586 <unzip dest="${gberg.dir}">587 <fileset refid="gbergfiles"/>588 </unzip>589 <delete>590 <fileset refid="gbergfiles"/>591 </delete>592 <echo>collection gberg installed</echo>593 </target>594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 <!--612 504 <target name="prepare-collections" depends="init"> 613 505 <property name="collect.dir" value="${web.home}/sites/localsite/collect"/> 614 506 <!-- gs2mgdemo --> 615 507 <unzip src="${collect.dir}/gs2mgdemo/import.zip" 616 508 dest="${collect.dir}/gs2mgdemo"/> … … 622 514 <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/> 623 515 <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/> 624 516 <!-- gs2mgppdemo --> 625 517 <unzip src="${collect.dir}/gs2mgppdemo/import.zip" 626 518 dest="${collect.dir}/gs2mgppdemo"/> … … 632 524 <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/> 633 525 <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/> 634 526 <!-- gberg --> 635 527 <unzip src="${collect.dir}/gberg/index/index.zip" 636 528 dest="${collect.dir}/gberg/index"/> 637 529 <delete file="${collect.dir}/gberg/index/index.zip"/> 638 530 </target> 639 --> 531 640 532 641 533 <target name="configure-web" depends="init" … … 667 559 </target> 668 560 669 670 671 672 673 561 <target name="svnupdate-web" unless="nosvn.mode"> 562 <svn> 563 <update dir="${web.home}"/> 564 </svn> 565 </target> 674 566 675 567 <target name="update-web" depends="init,svnupdate-web,configure-web" … … 677 569 678 570 679 571 <!-- ======================= Tomcat Targets ========================== --> 680 572 681 573 <!-- this target downloads and installs Tomcat --> … … 685 577 <!-- check that packages dir is there --> 686 578 <mkdir dir="${packages.home}"/> 687 <get src="http://www.greenstone.org/gs3files/ ${tomcat.version}.zip"688 dest="${packages.home}/ ${tomcat.version}.zip"579 <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25.zip" 580 dest="${packages.home}/apache-tomcat-5.5.25.zip" 689 581 usetimestamp="true"/> 690 <unzip src="${packages.home}/ ${tomcat.version}.zip"582 <unzip src="${packages.home}/apache-tomcat-5.5.25.zip" 691 583 dest="${packages.home}"/> 692 <get src="http://www.greenstone.org/gs3files/ ${tomcat.version}-compat.zip"693 dest="${packages.home}/ ${tomcat.version}-compat.zip"584 <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25-compat.zip" 585 dest="${packages.home}/apache-tomcat-5.5.25-compat.zip" 694 586 usetimestamp="true"/> 695 <unzip src="${packages.home}/ ${tomcat.version}-compat.zip"587 <unzip src="${packages.home}/apache-tomcat-5.5.25-compat.zip" 696 588 dest="${packages.home}"/> 697 589 <!-- delete any existing tomcat --> 698 590 <delete dir="${packages.home}/tomcat"/> 699 591 <move todir="${packages.home}/tomcat"> 700 <fileset dir="${packages.home}/ ${tomcat.version}"/>592 <fileset dir="${packages.home}/apache-tomcat-5.5.25"/> 701 593 </move> 702 594 <copy file="${basedir}/resources/tomcat/setclasspath.bat" … … 733 625 <!-- need to edit the config file, or do we get the user to do this???--> 734 626 </target> 735 627 736 628 <target name="start-tomcat" description="Startup only Tomcat" depends="init,configure-java-version" if="tomcat.islocal"> 737 629 <property name="tomcat.classpath" refid="local.tomcat.classpath"/> 738 630 <property name="tomcat.path" refid="local.tomcat.path"/> 739 631 <property name="catalina.opts" value="-Djava.util.prefs.syncInterval=2000000 -DGSDL3HOME=$GSDL3HOME -DGSDLOS=$GSDLOS -DPATH=$PATH -Xmx400M"/> … … 798 690 799 691 800 801 802 803 804 <!-- ======================= ant Targets ============================ --> 692 <!-- ======================= ant Targets ============================ --> 805 693 <target name="prepare-ant" depends="init"> 806 694 <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip" … … 814 702 </target> 815 703 816 704 <!-- ======================= Axis Targets ============================ --> 817 705 818 706 <target name="prepare-axis" depends="init"> 819 <get src="http://www.greenstone.org/gs3files/ ${axis.zip.version}"820 dest="${packages.home}/ ${axis.zip.version}"707 <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip" 708 dest="${packages.home}/axis-bin-1_2_1.zip" 821 709 usetimestamp="true"/> 822 <unzip src="${packages.home}/ ${axis.zip.version}"710 <unzip src="${packages.home}/axis-bin-1_2_1.zip" 823 711 dest="${packages.home}"/> 824 712 <move todir="${packages.home}/axis"> 825 <fileset dir="${packages.home}/ ${axis.dir.version}"/>713 <fileset dir="${packages.home}/axis-1_2_1"/> 826 714 </move> 827 715 <!-- install axis into greenstone web app --> … … 845 733 </target> 846 734 847 <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri, create-deployment-files,deploy-site"735 <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,get-webservices,create-deployment-files,deploy-site" 848 736 description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/> 849 737 … … 853 741 <arg value="-l"/> 854 742 <arg value="http://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/> 855 <arg file="${basedir}/resources/soap/${axis.sitename}.wsdd"/> 856 </java> 857 </target> 858 859 <target name="soap-undeploy-site" depends="get-sitename" 743 <arg file="${basedir}/resources/soap/deploy.wsdd"/> 744 </java> 745 <delete file="${basedir}/resources/soap/deploy.wsdd"/> <!--clean up, no longer used--> 746 </target> 747 748 <target name="soap-undeploy-site" depends="get-undeploy-service-name" 860 749 description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."> 750 <filter token="servicesname" value="${axis.undeploy.servicename}"/> 751 <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" 752 tofile="${basedir}/resources/soap/undeploy.wsdd" 753 filtering="true" 754 overwrite="true"/> 861 755 <java classname="org.apache.axis.client.AdminClient"> 862 756 <classpath refid="compile.classpath"/> 863 757 <arg value="-l"/> 864 758 <arg value="http://${tomcat.server}:${tomcat.port}${app.path}/servlet/AxisServlet"/> 865 <arg file="${basedir}/resources/soap/undeploy -${axis.sitename}.wsdd"/>759 <arg file="${basedir}/resources/soap/undeploy.wsdd"/> 866 760 </java> 867 </target> 868 869 <!-- this target used to deploy the preprepared localsite server --> 761 <delete file="${basedir}/resources/soap/undeploy.wsdd"/> <!--clean up, no longer used--> 762 </target> 763 764 <!-- this target used to deploy the default web service SOAPServer on the localsite server 765 with the default servicename of localsite--> 870 766 <target name="deploy-localsite" depends="init" 871 767 description="Deploy the SOAP server for localsite. Will start and stop Tomcat."> 872 768 <antcall target="start-tomcat"/> 769 <echo>Deploying SOAPServer web services for localsite under service name: localsite</echo> 770 <antcall target="create-deployment-files"> 771 <param name="axis.sitename" value="localsite"/> 772 <param name="axis.servicesname" value="SOAPServer"/> 773 <param name="axis.siteuri" value="localsite"/> 774 </antcall> 873 775 <antcall target="deploy-site"> 874 776 <param name="axis.sitename" value="localsite"/> 777 <param name="axis.servicesname" value="SOAPServer"/> 778 <param name="axis.siteuri" value="localsite"/> 875 779 </antcall> 876 < antcall target="stop-tomcat"/>780 <!--<antcall target="stop-tomcat"/>--> 877 781 </target> 878 782 879 783 <target name="get-sitename" unless="axis.sitename"> 880 <input addproperty="axis.sitename" message="What site? (press enter for default:localsite)" defaultvalue="localsite"/> 881 </target> 882 883 <target name="get-siteuri" depends="get-sitename" unless="axis.siteuri"> 884 <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.sitename})" defaultvalue="${axis.sitename}"/> 885 <echo>${axis.sitename}, ${axis.siteuri}</echo> 886 </target> 887 888 <target name="check-deployment-files" depends="get-sitename"> 889 <condition property="deploy.exists"> 890 <and> 891 <available file="${basedir}/resources/soap/${axis.sitename}.wsdd"/> 892 <available file="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd"/> 893 <available file="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class"/> 894 </and> 784 <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for? 785 Press enter for default:localsite</input> 786 </target> 787 788 <!-- ADDED --> 789 <target name="get-undeploy-service-name" unless="axis.undeploy.servicename"> 790 <input addproperty="axis.undeploy.servicename" defaultvalue="localsite">Please enter the full name of the service you wish to undeploy. 791 To find out which web services you've got deployed, point your browser to http://HOST:PORT/greenstone3/services 792 Or press Enter for undeploying the default:localsite /></input> 793 <echo>Name of service to undeploy: ${axis.undeploy.servicename}</echo> 794 </target> 795 796 <target name="get-webservices" unless="axis.servicesname"> 797 <input addproperty="axis.servicesname" defaultvalue="SOAPServer">Which set of web services do you want to deploy? 798 Choose from: ${web.services.list} 799 Or press enter for default:SOAPServer /></input> 800 <echo>${axis.servicesname}</echo> 801 </target> 802 803 <target name="get-siteuri" depends="get-sitename,get-webservices" unless="axis.siteuri"> 804 <input addproperty="axis.siteuri" message="What name do you want the service to have? (press enter for default:${axis.servicesname}${axis.sitename})" 805 defaultvalue="${axis.servicesname}${axis.sitename}"/> 806 <echo>Site: ${axis.sitename}, services: ${axis.servicesname}, servicesname: ${axis.siteuri}</echo> 807 </target> 808 809 <target name="set-soapmethod" description="Determines whether the service in the wsdd should have the style attribute set to message or the provider attribute set to java:RPC" if="axis.servicesname"> 810 <condition property="soap.method" value="provider='java:MSG' style='message' use='literal'"> 811 <equals arg1="${axis.servicesname}" arg2="SOAPServer"/> 895 812 </condition> 896 </target> 897 898 <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files" 899 if="axis.sitename" unless="deploy.exists"> 813 814 <!--everything else defaults to java:RPC at present--> 815 <condition property="soap.method" value="provider='java:RPC'"> 816 <not> 817 <equals arg1="${axis.servicesname}" arg2="SOAPServer"/> 818 </not> 819 </condition> 820 </target> 821 822 <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename"> 900 823 <filter token="sitename" value="${axis.sitename}"/> 901 824 <filter token="siteuri" value="${axis.siteuri}"/> 825 <filter token="servicesname" value="${axis.servicesname}"/> 826 <filter token="soapmethod" value="${soap.method}"/> 902 827 <copy file="${basedir}/resources/soap/site.wsdd.template" 903 tofile="${basedir}/resources/soap/${axis.sitename}.wsdd" 904 filtering="true"/> 905 <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" 906 tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd" 907 filtering="true"/> 828 tofile="${basedir}/resources/soap/deploy.wsdd" 829 filtering="true" 830 overwrite="true"/> 908 831 <!-- create the java files and compile them --> 909 <copy file="${basedir}/resources/java/SOAPServer.java.in" 910 tofile="${src.gsdl3.home}/SOAPServer${axis.sitename}.java" 911 filtering="true"/> 832 <copy file="${basedir}/resources/java/${axis.servicesname}.java.in" 833 tofile="${src.gsdl3.home}/${axis.servicesname}${axis.sitename}.java" 834 filtering="true" 835 overwrite="true"/> 912 836 <mkdir dir="${build.home}"/> 913 837 <javac srcdir="${src.home}" … … 917 841 optimize="${compile.optimize}"> 918 842 <classpath refid="compile.classpath"/> 919 <include name="org/greenstone/gsdl3/ SOAPServer${axis.sitename}.java" />843 <include name="org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.java" /> 920 844 </javac> 921 845 <mkdir dir="${web.classes}/org/greenstone/gsdl3"/> 922 <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" /> 923 </target> 924 925 926 <!-- ====================== Core targets ============================== --> 927 <!-- core targets refer to the core gsdl3 java src --> 928 929 <target name="prepare-core" unless="nosvn.mode"> 846 <copy file="${build.home}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/${axis.servicesname}${axis.sitename}.class" 847 overwrite="true" /> 848 </target> 849 850 851 <!-- ====================== Core targets ============================== --> 852 <!-- core targets refer to the core gsdl3 java src --> 853 854 <target name="prepare-core" unless="nocvs.mode"> 930 855 <!-- just get rid of empty directories--> 931 856 <svn> 932 933 857 <update dir="."/> 858 </svn> 934 859 </target> 935 860 … … 939 864 description="Update only the Greenstone core" /> 940 865 941 <target name="svnupdate-core" unless="no svn.mode">942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 866 <target name="svnupdate-core" unless="nocvs.mode"> 867 868 <svn> 869 <update dir="." recurse="false"/> 870 </svn> 871 872 <svn> 873 <update dir="bin"/> 874 <update dir="comms"/> 875 <update dir="dist-resources"/> 876 <update dir="docs"/> 877 <update dir="lib"/> 878 <update dir="resources"/> 879 <update dir="src"/> 880 <update dir="winutil"/> 881 </svn> 957 882 958 883 </target> … … 963 888 </target> 964 889 965 <target name="compile-core" depends="init"890 <target name="compile-core" depends="init" 966 891 description="Compile only the Greenstone core"> 967 892 <mkdir dir="${build.home}"/> … … 997 922 </manifest> 998 923 </jar> 999 924 1000 925 <jar destfile="${build.home}/phind.jar"> 1001 926 <fileset dir="${build.home}"> … … 1040 965 <copy file="${build.home}/server.jar" todir="${basedir}"/> 1041 966 </target> 1042 1043 967 968 <!-- ================== Packages targets ================================ --> 1044 969 <!-- these targets refer to the greenstone source packages - these need 1045 970 updating less often, so are in separate targets to the core --> 1046 971 <target name="prepare-packages" depends="init,prepare-indexers"/> 1047 972 1048 <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nosvn.mode"> 973 <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode"> 974 <!-- <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> --> 1049 975 <svn> 1050 1051 976 <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers" revision="${branch.revision}"/> 977 </svn> 1052 978 </target> 1053 979 … … 1059 985 description="Update only the source packages"/> 1060 986 1061 <target name="svnupdate-packages" unless="no svn.mode">1062 1063 1064 987 <target name="svnupdate-packages" unless="nocvs.mode"> 988 <svn> 989 <update dir="${src.packages.home}"/> 990 </svn> 1065 991 </target> 1066 992 … … 1081 1007 <arg value="--prefix=${basedir}"/> 1082 1008 <arg value="--libdir=${lib.jni}"/> 1083 1009 <arg value="--with-gdbm=${gdbm.installed.path}"/> 1084 1010 </exec> 1085 1011 </target> 1086 1012 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1013 <!-- Message from oran. I removed the condition from this line becuase it meant 1014 the indexers would only be configured if collection building was DISabled. 1015 Shouldn't they be configured when collection building is ENabled? --> 1016 1017 <!-- <target name="configure-indexers" depends="init" if="independent-indexers"> --> 1018 <target name="configure-indexers" depends="init"> 1019 <echo>Configuring Indexers</echo> 1020 <exec executable="${indexers.home}/configure" os="${os.unix}" dir="${indexers.home}"> 1021 <arg value="--prefix=${basedir}"/> 1022 <arg value="--libdir=${lib.jni}"/> 1023 </exec> 1024 </target> 1099 1025 1100 1026 <target name="clean-packages" depends="init,clean-javagdbm,clean-indexers" description="Clean only the packages"/> … … 1113 1039 </exec> 1114 1040 <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" 1115 dir="${indexers.home}"> 1116 <arg value="clean"/> 1117 </exec> 1118 1119 </target> 1120 <target name="distclean-packages" depends="init,distclean-javagdbm,distclean-indexers" description="Distclean only the packages"/> 1121 1122 <target name="distclean-javagdbm" depends="init"> 1123 <exec executable="make" os="${os.unix}" 1124 dir="${javagdbm.home}"> 1125 <arg value="distclean"/> 1126 </exec> 1127 </target> 1128 1129 <target name="distclean-indexers" depends="init" if="independent-indexers"> 1130 <exec executable="make" os="${os.unix}" 1131 dir="${indexers.home}"> 1132 <arg value="distclean"/> 1133 </exec> 1134 <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" 1135 dir="${indexers.home}"> 1136 <arg value="clean"/> 1137 </exec> 1138 1139 </target> 1140 1141 <target name="compile-packages" description="Compile only the source packages"> 1142 1143 <!-- javagdbm --> 1144 <echo>compile javagdbm</echo> 1145 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/> 1146 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"> 1147 <arg value="install"/> 1148 </exec> 1149 1150 <!-- windows: just the java stuff. --> 1151 <echo>Windows: compile javagdbm (java only)</echo> 1152 <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}"> 1153 <arg value="compile"/> 1154 <arg value="javaonly"/> 1155 </exec> 1156 1157 <!-- install the jar file --> 1158 <echo>Install the javagdbm jar file</echo> 1159 <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/> 1160 1161 <!-- Indexers --> 1162 1163 <!-- this may be in gs2build - we will be recompiling, but never mind --> 1164 <echo>Indexers: make (from ${indexers.home})</echo> 1165 <exec executable="make" os="${os.unix}" dir="${indexers.home}"/> 1166 <echo>Indexers: make install</echo> 1167 <exec executable="make" os="${os.unix}" dir="${indexers.home}"> 1168 <arg value="install"/> 1169 </exec> 1170 1171 <echo>Indexers: make</echo> 1172 <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 1173 <arg value="all"/> 1174 </exec> 1175 <echo>Indexers: make install</echo> 1176 <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 1177 <arg value="install"/> 1178 </exec> 1179 1180 <!-- install the jar and jni files --> 1181 <echo>Install the indexers' jar and jni files</echo> 1182 <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 1183 <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 1184 <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 1185 <antcall target="install-jni-files"/> 1186 </target> 1041 dir="${indexers.home}"> 1042 <arg value="clean"/> 1043 </exec> 1044 1045 </target> 1046 1047 <target name="compile-packages" description="Compile only the source packages"> 1048 1049 <!-- javagdbm --> 1050 <echo>compile javagdbm</echo> 1051 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"/> 1052 <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"> 1053 <arg value="install"/> 1054 </exec> 1055 1056 <!-- windows: just the java stuff. --> 1057 <echo>Windows: compile javagdbm (java only)</echo> 1058 <exec executable="${javagdbm.home}/winMake.bat" os="${os.windows}" dir="${javagdbm.home}"> 1059 <arg value="compile"/> 1060 <arg value="javaonly"/> 1061 </exec> 1062 1063 <!-- install the jar file --> 1064 <echo>Install the javagdbm jar file</echo> 1065 <copy file="${javagdbm.home}/javagdbm.jar" todir="${lib.jni}"/> 1066 1067 <!-- Indexers --> 1068 1069 <!-- this may be in gs2build - we will be recompiling, but never mind --> 1070 <echo>Indexers: make (from ${indexers.home})</echo> 1071 <exec executable="make" os="${os.unix}" dir="${indexers.home}"/> 1072 <echo>Indexers: make install</echo> 1073 <exec executable="make" os="${os.unix}" dir="${indexers.home}"> 1074 <arg value="install"/> 1075 </exec> 1076 1077 <echo>Indexers: make</echo> 1078 <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 1079 <arg value="all"/> 1080 </exec> 1081 <echo>Indexers: make install</echo> 1082 <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 1083 <arg value="install"/> 1084 </exec> 1085 1086 <!-- install the jar and jni files --> 1087 <echo>Install the indexers' jar and jni files</echo> 1088 <copy file="${mg.home}/mg.jar" todir="${lib.jni}"/> 1089 <copy file="${mgpp.home}/mgpp.jar" todir="${lib.jni}"/> 1090 <copy file="${lucene.home}/LuceneWrapper.jar" todir="${web.lib}"/> 1091 <antcall target="install-jni-files"/> 1092 </target> 1187 1093 1188 1094 <target name="install-jni-files" depends="init,install-jni-files-linux,install-jni-files-windows,install-jni-files-macos"/> 1189 1095 1190 <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac">1096 <target name="install-jni-files-linux" depends="init" if="current.os.isunixnotmac"> 1191 1097 <copy file="${mg.home}/jni/libmgretrievejni.so" todir="${lib.jni}"/> 1192 1098 <copy file="${mg.home}/jni/libmgsearchjni.so" todir="${lib.jni}"/> 1193 <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/>1099 <copy file="${mg.home}/jni/libmgpassjni.so" todir="${lib.jni}"/> 1194 1100 <copy file="${mgpp.home}/jni/libmgppretrievejni.so" todir="${lib.jni}"/> 1195 1101 <copy file="${mgpp.home}/jni/libmgppsearchjni.so" todir="${lib.jni}"/> 1196 <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/>1197 </target>1198 <target name="install-jni-files-windows" depends="init" if="current.os.iswindows">1102 <copy file="${mgpp.home}/jni/libmgpppassjni.so" todir="${lib.jni}"/> 1103 </target> 1104 <target name="install-jni-files-windows" depends="init" if="current.os.iswindows"> 1199 1105 <copy file="${mg.home}/jni/mgretrievejni.dll" todir="${lib.jni}"/> 1200 1106 <copy file="${mg.home}/jni/mgsearchjni.dll" todir="${lib.jni}"/> 1201 <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/>1107 <copy file="${mg.home}/jni/mgpassjni.dll" todir="${lib.jni}"/> 1202 1108 <copy file="${mgpp.home}/jni/mgppretrievejni.dll" todir="${lib.jni}"/> 1203 1109 <copy file="${mgpp.home}/jni/mgppsearchjni.dll" todir="${lib.jni}"/> 1204 <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/>1205 </target>1206 <target name="install-jni-files-macos" depends="init" if="current.os.ismac">1110 <copy file="${mgpp.home}/jni/mgpppassjni.dll" todir="${lib.jni}"/> 1111 </target> 1112 <target name="install-jni-files-macos" depends="init" if="current.os.ismac"> 1207 1113 <copy file="${mg.home}/jni/libmgretrievejni.jnilib" todir="${lib.jni}"/> 1208 1114 <copy file="${mg.home}/jni/libmgsearchjni.jnilib" todir="${lib.jni}"/> 1209 <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/>1115 <copy file="${mg.home}/jni/libmgpassjni.jnilib" todir="${lib.jni}"/> 1210 1116 <copy file="${mgpp.home}/jni/libmgppretrievejni.jnilib" todir="${lib.jni}"/> 1211 1117 <copy file="${mgpp.home}/jni/libmgppsearchjni.jnilib" todir="${lib.jni}"/> 1212 <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/>1213 </target>1214 1118 <copy file="${mgpp.home}/jni/libmgpppassjni.jnilib" todir="${lib.jni}"/> 1119 </target> 1120 1215 1121 <!-- ================== gs2building targets ===============--> 1216 1122 … … 1220 1126 description="Update only the Greenstone 2 building components"/> 1221 1127 1222 <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nosvn.mode"> 1223 </target> 1224 1225 <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nosvn.mode"> 1226 <!-- please keep this function in sync with checkout-gs2build --> 1227 1228 <echo>updating gs2build</echo> 1229 <!-- svn updates --> 1128 <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nocvs.mode"> 1129 </target> 1130 1131 <target name="svnupdate-gs2build" if="collection.building.enabled" depends="init" unless="nocvs.mode"> 1132 <!-- please keep this function in sync with checkout-gs2build --> 1133 1134 <echo>updating gs2build</echo> 1135 <!-- svn updates --> 1136 <svn> 1137 <!-- perllib --> 1138 <update dir="gs2build/perllib" revision="${branch.revision}"/> 1139 1140 <!-- selected packages --> 1141 <update dir="gs2build/packages/cpan" revision="${branch.revision}" /> 1142 <update dir="gs2build/packages/expat" revision="${branch.revision}" /> 1143 <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" /> 1144 <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 1145 <update dir="gs2build/packages/kea" revision="${branch.revision}" /> 1146 <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 1147 <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 1148 <update dir="gs2build/packages/w3mir" revision="${branch.revision}" /> 1149 <update dir="gs2build/packages/wget" revision="${branch.revision}" /> 1150 <update dir="gs2build/packages/windows" revision="${branch.revision}" /> 1151 <update dir="gs2build/packages/wv" revision="${branch.revision}" /> 1152 <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" /> 1153 <update dir="gs2build/packages/yaz" revision="${branch.revision}" /> 1154 1155 <!-- some of src (db2txt hashfile phind txt2db) --> 1156 <update dir="gs2build/src/db2txt" revision="${branch.revision}" /> 1157 <update dir="gs2build/src/hashfile" revision="${branch.revision}" /> 1158 <update dir="gs2build/src/phind" revision="${branch.revision}" /> 1159 <update dir="gs2build/src/txt2db" revision="${branch.revision}" /> 1160 1161 <!-- bin --> 1162 <update dir="gs2build/bin/script" revision="${branch.revision}" /> 1163 1164 <!-- mappings --> 1165 <update dir="gs2build/mappings" revision="${branch.revision}"/> 1166 1167 <!-- etc/packages --> 1168 <update dir="gs2build/etc/packages" revision="${branch.revision}"/> 1169 1170 <!-- collect --> 1171 <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/> 1172 1173 <!-- gs2build-extra --> 1174 <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/> 1175 1176 <!-- indexers --> 1177 <update dir="gs2build/indexers" revision="${branch.revision}"/> 1178 1179 <!-- single files --> 1180 1181 <!-- some files from lib --> 1182 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 1183 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 1184 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 1185 1186 <!-- some files from etc --> 1187 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 1188 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 1189 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 1190 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 1191 1192 <!-- some files from the gsdl root directory --> 1193 <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 1194 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 1195 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 1196 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 1197 <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 1198 <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 1199 <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 1200 <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 1201 <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 1202 </svn> 1203 </target> 1204 1205 <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nocvs.mode"> 1230 1206 <svn> 1231 <!-- perllib --> 1232 <update dir="gs2build/perllib" revision="${branch.revision}"/> 1233 1234 <!-- selected packages --> 1235 <update dir="gs2build/packages/cpan" revision="${branch.revision}" /> 1236 <update dir="gs2build/packages/expat" revision="${branch.revision}" /> 1237 <update dir="gs2build/packages/html-tidy" revision="${branch.revision}" /> 1238 <update dir="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 1239 <update dir="gs2build/packages/kea" revision="${branch.revision}" /> 1240 <update dir="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 1241 <update dir="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 1242 <update dir="gs2build/packages/w3mir" revision="${branch.revision}" /> 1243 <update dir="gs2build/packages/wget" revision="${branch.revision}" /> 1244 <update dir="gs2build/packages/windows" revision="${branch.revision}" /> 1245 <update dir="gs2build/packages/wv" revision="${branch.revision}" /> 1246 <update dir="gs2build/packages/xlhtml" revision="${branch.revision}" /> 1247 <update dir="gs2build/packages/yaz" revision="${branch.revision}" /> 1248 1249 <!-- some of src (db2txt hashfile phind txt2db) --> 1250 <update dir="gs2build/src/db2txt" revision="${branch.revision}" /> 1251 <update dir="gs2build/src/hashfile" revision="${branch.revision}" /> 1252 <update dir="gs2build/src/phind" revision="${branch.revision}" /> 1253 <update dir="gs2build/src/txt2db" revision="${branch.revision}" /> 1254 1255 <!-- bin --> 1256 <update dir="gs2build/bin/script" revision="${branch.revision}" /> 1257 1258 <!-- mappings --> 1259 <update dir="gs2build/mappings" revision="${branch.revision}"/> 1260 1261 <!-- etc/packages --> 1262 <update dir="gs2build/etc/packages" revision="${branch.revision}"/> 1263 1264 <!-- collect --> 1265 <update dir="gs2build/collect/modelcol" revision="${branch.revision}"/> 1266 1267 <!-- gs2build-extra --> 1268 <update dir="gs2build/gs2build-extra" revision="${branch.revision}"/> 1269 1270 <!-- indexers --> 1271 <update dir="gs2build/indexers" revision="${branch.revision}"/> 1272 1273 <!-- single files --> 1274 1275 <!-- some files from lib --> 1276 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 1277 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 1278 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 1279 1280 <!-- some files from etc --> 1281 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 1282 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 1283 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 1284 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 1285 1286 <!-- some files from the gsdl root directory --> 1287 <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 1288 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 1289 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 1290 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 1291 <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 1292 <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 1293 <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 1294 <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 1295 <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 1296 </svn> 1297 </target> 1298 1299 <target name="svnupdate-gli" if="collection.building.enabled" depends="init" unless="nosvn.mode"> 1300 <svn> 1301 <update dir="${gli.home}" revision="${branch.revision}"/> 1302 </svn> 1207 <update dir="${gli.home}" revision="${branch.revision}"/> 1208 </svn> 1303 1209 </target> 1304 1210 1305 1211 <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled"> 1306 1212 </target> 1307 <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nosvn.mode">1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1213 <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 1214 <!-- please keep this function in sync with update-gs2build --> 1215 <echo>checking out gs2build</echo> 1216 1217 <!-- this has to be created first to avoid errors when trying to export to it later --> 1218 <mkdir dir="${basedir}/gs2build/lib"/> 1219 1220 <!-- svn checkouts --> 1221 <svn> 1222 <!-- perllib --> 1223 <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib" revision="${branch.revision}"/> 1224 1225 <!-- selected packages --> 1226 <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan" revision="${branch.revision}" /> 1227 <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat" revision="${branch.revision}" /> 1228 <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy" revision="${branch.revision}" /> 1229 <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl" revision="${branch.revision}" /> 1230 <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea" revision="${branch.revision}" /> 1231 <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml" revision="${branch.revision}" /> 1232 <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml" revision="${branch.revision}" /> 1233 <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir" revision="${branch.revision}" /> 1234 <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget" revision="${branch.revision}" /> 1235 <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows" revision="${branch.revision}" /> 1236 <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv" revision="${branch.revision}" /> 1237 <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml" revision="${branch.revision}" /> 1238 <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz" revision="${branch.revision}" /> 1239 1240 <!-- some of src (db2txt hashfile phind txt2db) --> 1241 <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt" revision="${branch.revision}" /> 1242 <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile" revision="${branch.revision}" /> 1243 <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind" revision="${branch.revision}" /> 1244 <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db" revision="${branch.revision}" /> 1245 1246 <!-- bin --> 1247 <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script" revision="${branch.revision}" /> 1248 1249 <!-- mappings --> 1250 <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings" revision="${branch.revision}"/> 1251 1252 <!-- etc/packages --> 1253 <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages" revision="${branch.revision}"/> 1254 1255 <!-- collect --> 1256 <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol" revision="${branch.revision}"/> 1257 1258 <!-- gs2build-extra --> 1259 <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra" revision="${branch.revision}"/> 1260 1261 <!-- indexers --> 1262 <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers" revision="${branch.revision}"/> 1263 1264 <!-- single files --> 1265 1266 <!-- some files from lib --> 1267 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.h" destPath="gs2build/lib/text_t.h"/> 1268 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" destPath="gs2build/lib/text_t.cpp"/> 1269 <export srcUrl="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" destPath="gs2build/lib/gsdlconf.h"/> 1270 1271 <!-- some files from etc --> 1272 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" destPath="gs2build/etc/marctodc.txt"/> 1273 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" destPath="gs2build/etc/dc2marc-mapping.xml"/> 1274 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" destPath="gs2build/etc/dc2marc.xsl"/> 1275 <export srcUrl="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" destPath="gs2build/etc/qdc2marc-mapping.xml"/> 1276 1277 <!-- some files from the gsdl root directory --> 1278 <export srcUrl="${svn.root}/gsdl/${branch.path}/setup.bash" destPath="gs2build/setup.bash"/> 1279 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.sub" destPath="gs2build/config.sub"/> 1280 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.guess" destPath="gs2build/config.guess"/> 1281 <export srcUrl="${svn.root}/gsdl/${branch.path}/config.h.in" destPath="gs2build/config.h.in"/> 1282 <export srcUrl="${svn.root}/gsdl/${branch.path}/configtest.pl" destPath="gs2build/configtest.pl"/> 1283 <export srcUrl="${svn.root}/gsdl/${branch.path}/install-sh" destPath="gs2build/install-sh"/> 1284 <export srcUrl="${svn.root}/gsdl/${branch.path}/acconfig.h" destPath="gs2build/acconfig.h"/> 1285 <export srcUrl="${svn.root}/gsdl/${branch.path}/aclocal.m4" destPath="gs2build/aclocal.m4"/> 1286 <export srcUrl="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" destPath="gs2build/WIN32cfg.h"/> 1287 </svn> 1288 </target> 1383 1289 1384 1290 <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present"> … … 1393 1299 1394 1300 <target name="checkout-winbin" depends="init" if="current.os.iswindows" 1395 unless="no svn.mode">1301 unless="nocvs.mode"> 1396 1302 <svn> 1397 1398 1399 </target> 1400 1401 <target name="update-winbin" depends="init" if="current.os.iswindows" unless="no svn.mode">1402 1403 1404 1405 1303 <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/> 1304 </svn> 1305 </target> 1306 1307 <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode"> 1308 <svn> 1309 <update dir="winbin"/> 1310 </svn> 1311 </target> 1406 1312 1407 1313 <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows"> … … 1416 1322 <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows"> 1417 1323 <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip" 1418 1419 1420 1421 <unzip src="${gs2build.home}/packages/windows/expat/expat.zip"1422 1423 </target>1324 dest="${gs2build.home}/packages/windows/gdbm"/> 1325 <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip" 1326 dest="${gs2build.home}/packages/windows/crypt"/> 1327 <unzip src="${gs2build.home}/packages/windows/expat/expat.zip" 1328 dest="${gs2build.home}/packages/windows/expat"/> 1329 </target> 1424 1330 1425 1331 <!-- downloads a good XML-Parser --> 1426 1332 <target name="get-macos-extra" depends="init" if="need.macos.extra"> 1427 <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"1333 <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" 1428 1334 dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 1429 1335 usetimestamp="true"/> … … 1460 1366 <filterset> 1461 1367 <filter token="gsdlhome" value="${gs2build.home.windows}"/> 1462 1368 </filterset> 1463 1369 </move> 1464 1370 <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" /> … … 1488 1394 </target> 1489 1395 1490 <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nosvn.mode"> 1396 <!-- <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> --> 1397 <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 1491 1398 <echo>checking out gli</echo> 1492 1399 <svn> 1493 1494 1495 </target> 1496 1400 <checkout url="${svn.root}/gli/${branch.path}" destPath="gli" revision="${branch.revision}"/> 1401 </svn> 1402 </target> 1403 1497 1404 <target name="configure-gs2building" depends="init" if="collection.building.enabled" 1498 1405 description="Configure only the Greenstone 2 building components"> … … 1531 1438 <!-- windows: --> 1532 1439 <!-- run the setup script --> 1533 <exec executable="${compile.windows.c++.setup}" os="${os.windows}" /> 1440 <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}" />--> 1441 <!--Above does not work: 1442 even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant--> 1534 1443 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}" > 1535 <arg value="/f"/> 1536 <arg value="win32.mak"/> 1537 <arg value="clean"/> 1538 </exec> 1539 </target> 1540 1541 <target name="distclean-gs2building" depends="init,clean-gli,clean-gs2build,distclean-gs2build" 1542 description="Distclean only the Greenstone 2 building components" 1543 if="collection.building.enabled"/> 1544 1444 <arg value="/f"/> 1445 <arg value="win32.mak"/> 1446 <arg value="clean"/> 1447 </exec> 1448 </target> 1449 1545 1450 <target name="distclean-gs2build" depends="init" if="collection.building.enabled"> 1451 <!-- gs2build --> 1452 <!--linux: --> 1546 1453 <exec executable="make" os="${os.unix}" dir="${gs2build.home}"> 1547 1454 <arg value="distclean"/> 1548 1455 </exec> 1456 <!-- windows: --> 1549 1457 </target> 1550 1458 … … 1557 1465 <property name="gli.home" value="${basedir}/gli"/> 1558 1466 1559 1560 1467 <!-- change the version number --> 1468 <rsr file="${gli.home}/src/org/greenstone/gatherer/Gatherer.java" pattern="^(.*)String\s*PROGRAM_VERSION\s*=\s*"(.*)"" replacement="$1String PROGRAM_VERSION = "${app.version}""/> 1561 1469 <!-- linux --> 1562 1470 <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 1563 <!--remote gli-->1564 <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}"1471 <!--remote gli--> 1472 <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 1565 1473 resolveExecutable="true"/> 1566 1474 <!-- windows --> 1567 1475 <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 1568 1476 <!--remote gli--> 1569 <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}"1477 <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 1570 1478 resolveExecutable="true"/> 1571 <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" />1479 <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 1572 1480 </target> 1573 1481 … … 1581 1489 </exec> 1582 1490 <!-- run the setup script --> 1583 <exec executable="${compile.windows.c++.setup}" os="${os.windows}"/> 1491 <!--<exec executable="${compile.windows.c++.setup}" os="${os.windows}"/>--> 1492 <!--Above does not work: 1493 even though vcvars.bat executes, the env changes it makes don't get saved. Need user to run vcvars.bat first before calling ant--> 1584 1494 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 1585 1586 1495 <arg value="/f"/> 1496 <arg value="win32.mak"/> 1587 1497 </exec> 1588 1498 <exec executable="nmake" dir="${gs2build.home}" os="${os.windows}"> 1589 1590 1591 1499 <arg value="/f"/> 1500 <arg value="win32.mak"/> 1501 <arg value="install"/> 1592 1502 </exec> 1593 1503 <!-- LuceneWrapper jar file not installed by default --> … … 1623 1533 </echo> 1624 1534 </target> 1625 1626 1627 1535 1536 1537 <!-- ======================== TESTING Targets ========================= --> 1628 1538 1629 1539 <target name="test" description="Run the (incomplete) JUnit test suite " … … 1648 1558 <echo> 1649 1559 ********************************************* 1650 Test output can be found in directory 'test'1560 Test output can be found in directory 'test' 1651 1561 ********************************************* 1652 1562 </echo> 1653 1563 </target> 1654 1655 <!-- ======================== FLAX Targets ========================= -->1656 1564 <target name="prepare-flax" description="check out flax source code from another repository" if="install.flax"> 1657 1565 <echo>checking out flax ...</echo> 1658 1566 <mkdir dir="${basedir}/src/java/org/flax"/> 1659 1567 <mkdir dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 1660 <mkdir dir="${ web.home}/WEB-INF/classes/flax"/>1661 <mkdir dir="${ web.home}/interfaces/flax"/>1662 <mkdir dir="${ web.home}/sites/flax"/>1568 <mkdir dir="${basedir}/web/WEB-INF/classes/flax"/> 1569 <mkdir dir="${basedir}/web/interfaces/flax"/> 1570 <mkdir dir="${basedir}/web/sites/flax"/> 1663 1571 <mkdir dir="${basedir}/flax-resources"/> 1664 1572 <mkdir dir="${basedir}/flax-lib"/> 1665 1573 <svn> 1666 1574 <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/" 1667 1575 destPath="${basedir}/src/java/org/flax"/> 1668 1576 <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/" 1669 1577 destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 1670 1578 <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/" 1671 destPath="${web.home}/WEB-INF/classes/flax"/>1579 destPath="${basedir}/web/WEB-INF/classes/flax"/> 1672 1580 <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/" 1673 destPath="${web.home}/interfaces/flax"/>1581 destPath="${basedir}/web/interfaces/flax"/> 1674 1582 <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/" 1675 destPath="${web.home}/sites/flax"/>1583 destPath="${basedir}/web/sites/flax"/> 1676 1584 <checkout url="${flax.svn.root}/flax1.0/trunk/flax-resources" 1677 1585 destPath="${basedir}/flax-resources"/> 1678 1586 <checkout url="${flax.svn.root}/flax1.0/trunk/lib" 1679 1587 destPath="${basedir}/flax-lib"/> 1680 1588 </svn> 1681 <echo>prepare flax files...</echo>1682 <move file="${ web.home}/WEB-INF/web.xml" tofile="${web.home}/WEB-INF/web.xml.greenstone3backup"/>1589 <echo>prepare flax files...</echo> 1590 <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/> 1683 1591 <antcall target="flax-copy-files" /> 1684 1592 <antcall target="unzip-flax-collections" /> 1685 1593 <antcall target="unzip-flax-resources" /> 1686 </target>1594 </target> 1687 1595 1688 1596 <target name="update-flax" description="update flax from repository"> 1689 1690 1691 1692 1693 <update dir="${web.home}/WEB-INF/classes/flax"/>1694 <update dir="${web.home}/interfaces/flax"/>1695 <update dir="${web.home}/sites/flax"/>1696 1697 <antcall target="flax-copy-files" />1597 <echo>updating flax ...</echo> 1598 <svn> 1599 <update dir="${basedir}/src/java/org/flax"/> 1600 <update dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 1601 <update dir="${basedir}/web/WEB-INF/classes/flax"/> 1602 <update dir="${basedir}/web/interfaces/flax"/> 1603 <update dir="${basedir}/web/sites/flax"/> 1604 </svn> 1605 <antcall target="flax-copy-files" /> 1698 1606 <antcall target="unzip-flax-collections" /> 1699 </target>1700 1701 <target name="unzip-flax-collections" >1702 <property name="coll.dir" value="${ web.home}/sites/flax/collect"/>1607 </target> 1608 1609 <target name="unzip-flax-collections" > 1610 <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/> 1703 1611 <unzip dest="${coll.dir}"> 1704 1612 <fileset dir="${coll.dir}"> 1705 1613 <include name="*.zip"/> 1706 </fileset>1614 </fileset> 1707 1615 </unzip> 1708 1616 <delete> … … 1711 1619 </target> 1712 1620 1713 1714 <property name="classes.dir" value="${ web.home}/WEB-INF/classes/flax"/>1621 <target name="unzip-flax-resources" > 1622 <property name="classes.dir" value="${basedir}/web//WEB-INF/classes/flax"/> 1715 1623 <unzip dest="${classes.dir}"> 1716 1624 <fileset dir="${classes.dir}"> 1717 1625 <include name="*.zip"/> 1718 </fileset>1626 </fileset> 1719 1627 </unzip> 1720 1628 <delete> … … 1722 1630 </delete> 1723 1631 </target> 1724 1725 <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 1726 <echo>copying flax files ...</echo> 1727 <copy file="${web.home}/WEB-INF/classes/flax/web.xml" todir="${web.home}/WEB-INF" overwrite="true" /> 1728 <!-- A configuration file containing web service binding information for the axis engine --> 1729 <copy file="${web.home}/WEB-INF/classes/flax/server-config.wsdd" todir="${web.home}/WEB-INF" overwrite="true" /> 1730 <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 1731 <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${web.home}/WEB-INF/lib" overwrite="true" /> 1732 </target> 1733 1734 1735 <!-- ======================== GDBM Targets ========================= --> 1736 1632 1633 <target name="flax-copy-files" description="copy some flax files into the appropriate greenstone3 directories"> 1634 <echo>copying flax files ...</echo> 1635 <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" overwrite="true" /> 1636 <!-- A configuration file containing web service binding information for the axis engine --> 1637 <copy file="${basedir}/web/WEB-INF/classes/flax/server-config.wsdd" todir="${basedir}/web/WEB-INF" overwrite="true" /> 1638 <copy file="${basedir}/flax-resources/flax-build.xml" todir="${basedir}" overwrite="true" /> 1639 <copy file="${basedir}/flax-lib/opennlp-tools-1.3.0.jar" todir="${basedir}/web/WEB-INF/lib" overwrite="true" /> 1640 </target> 1641 <!--install gdbm stuff --> 1642 1643 <!-- downloads the gdbm library --> 1737 1644 <target name="prepare-gdbm" depends="init" if="install.gdbm"> 1738 <get src="http://www.greenstone.org/gs3files/${gdbm.version}.tar.gz"1739 dest="${src.packages.home}/${gdbm.version}.tar.gz" usetimestamp="true"/>1740 <untar compression= "gzip" src="${src.packages.home}/${gdbm.version}.tar.gz" dest="${src.packages.home}" />1741 <chmod dir="${src.packages.home}/${gdbm.version}" perm="ugo+wrx" includes="**" />1742 <antcall target="configure-gdbm" />1743 <antcall target="compile-gdbm" />1645 <get src="http://www.greenstone.org/gs3files/gdbm-1.8.3.tar.gz" 1646 dest="${src.packages.home}/gdbm-1.8.3.tar.gz" usetimestamp="true"/> 1647 <untar compression= "gzip" src="${src.packages.home}/gdbm-1.8.3.tar.gz" dest="${src.packages.home}" /> 1648 <chmod dir="${src.packages.home}/gdbm-1.8.3" perm="ugo+wrx" includes="**" /> 1649 <antcall target="configure-gdbm" /> 1650 <antcall target="compile-gdbm" /> 1744 1651 </target> 1745 1652 1746 <target name="configure-gdbm" if="install.gdbm">1653 <target name="configure-gdbm" if="install.gdbm"> 1747 1654 <echo> 1748 1655 Configuring GDBM … … 1752 1659 <arg value="--prefix=${gdbm.home}"/> 1753 1660 </exec> 1754 </target>1755 1756 1661 </target> 1662 1663 <target name="clean-gdbm" depends="init" if="install.gdbm"> 1757 1664 <echo>clean GDBM</echo> 1758 <exec executable="make" os="${os.unix}" dir="${gdbm.home}" > 1759 <arg value="clean"/> 1760 </exec> 1761 </target> 1762 1763 <target name="distclean-gdbm" depends="init" if="install.gdbm"> 1764 <echo>distclean GDBM</echo> 1765 <exec executable="make" os="${os.unix}" dir="${gdbm.home}" > 1766 <arg value="distclean"/> 1665 <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}" > 1666 <arg value="clean"/> 1767 1667 </exec> 1768 1668 </target> … … 1770 1670 <target name="compile-gdbm" depends="init" if="install.gdbm"> 1771 1671 <echo>compile GDBM</echo> 1772 <exec executable="make" os="${os.unix} " dir="${gdbm.home}"/>1773 <exec executable="make" os="${os.unix} " dir="${gdbm.home}">1672 <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}"/> 1673 <exec executable="make" os="${os.unix},${os.mac}" dir="${gdbm.home}"> 1774 1674 <arg value="install"/> 1775 1675 </exec> 1776 1676 </target> 1777 1677 1678 1679 1778 1680 </project> 1779 1681
Note:
See TracChangeset
for help on using the changeset viewer.