Changeset 14722

Show
Ignore:
Timestamp:
23.10.2007 16:54:33 (12 years ago)
Author:
qq6
Message:

updated by Shaoqun

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • greenstone3/branches/3.03/build.xml

    r14704 r14722  
    1 <?xml version="1.0"?> 
    2  
     1<?xml version="1.0" encoding="UTF-8"?> 
    32<!-- ======================================================================  
    43     March 2005                                                     
     
    1110 
    1211    <!-- ============ classpath =================== --> 
     12 
    1313    <path id="project.classpath"> 
    1414       <fileset dir="lib/java"> 
     
    1919    <!-- ============ self defined tasks =================== --> 
    2020 
     21 
    2122    <taskdef name="mysetproxy" classname="org.greenstone.anttasks.MySetProxy" classpath="${basedir}/lib/java/anttasks.jar"/> 
    2223    <taskdef name="getuserandpassword" classname="org.greenstone.anttasks.MyGetUserAndPassword" classpath="${basedir}/lib/java/anttasks.jar"/> 
     
    2627 
    2728<!-- ===================== Property Definitions =========================== --> 
     29 
    2830 
    2931<!-- 
     
    5153--> 
    5254 
     55 
    5356  <property file="build.properties"/> 
    5457  <property file="${user.home}/build.properties"/> 
    5558 
    5659  <!-- get properties from the environment --> 
     60 
    5761  <property environment="env"/> 
    5862  <property name="build.home" value="${basedir}/build"/> 
     
    6266  <!-- this may be set in build.properties, eg if you move the web dir to  
    6367  tomcats webapps directory --> 
     68 
    6469  <property name="web.home" value="${basedir}/web"/> 
    6570  <!-- jar files needed by applets go here --> 
     71 
    6672  <property name="web.applet" value="${web.home}/applet"/> 
    6773  <!-- jar files needed by the servlet (and extra ones) go here --> 
     74 
    6875  <property name="web.lib" value="${web.home}/WEB-INF/lib"/> 
    6976  <!-- other files needed by the servlet go here --> 
     77 
    7078  <property name="web.classes" value="${web.home}/WEB-INF/classes"/> 
    7179  <!-- jni libraries and java wrappers go here --> 
     80 
    7281  <property name="lib.jni" value="${basedir}/lib/jni"/> 
    7382     
    7483  <property name="javadocs" value="${basedir}/docs/javadoc"/> 
    7584 
    76   <property name="app.name"      value="greenstone3"/> 
    77   <property name="app.path"      value="/${app.name}"/> 
     85  <property name="app.name" value="greenstone3"/> 
     86  <property name="app.path" value="/${app.name}"/> 
    7887 
    7988 
    8089  <!-- version number stuff --> 
    8190 
     91 
    8292  <!-- app.version defaults to trunk --> 
     93 
    8394  <condition property="app.version" value="trunk"> 
    8495    <not><isset property="app.version"/></not> 
     
    8697 
    8798    <!-- determine the 'branch path' --> 
     99 
    88100  <condition property="branch.path" value="trunk"> 
    89     <equals arg1="${app.version}" arg2="trunk" /> 
     101    <equals arg1="${app.version}" arg2="trunk"/> 
    90102  </condition> 
    91103  <condition property="branch.path" value="branches/${app.version}"> 
    92     <not><equals arg1="${app.version}" arg2="trunk" /></not> 
     104    <not><equals arg1="${app.version}" arg2="trunk"/></not> 
    93105  </condition> 
    94106 
     
    98110  <property name="svn.root" value="http://svn.greenstone.org"/> 
    99111<!--  <property name="cvs.root" value=":pserver:cvs_anon@cvs.scms.waikato.ac.nz:2402/usr/local/global-cvs/gsdl-src"/> --> 
     112 
    100113  <!-- catalina home is set to tomcat basedir is already installed, otherwise 
    101114  use greenstone's tomcat --> 
     115 
    102116  <condition property="catalina.home" value="${tomcat.installed.path}">  
    103117    <and> 
     
    116130  <property name="os.windows" value="Windows 95,Windows 98,Windows 2000,Windows XP,Windows NT,Windows ME"/> <!-- check this!!!--> 
    117131 
     132 
    118133  <!-- this is true for linux and macs --> 
     134 
    119135  <condition property="current.os.isunix"> 
    120136    <os family="unix"/> 
     
    162178     
    163179  <!-- ============= Base dirs for each package and component ============ --> 
     180 
    164181  <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/> 
    165182  <property name="src.gsdl3.home" value="${src.home}/org/greenstone/gsdl3"/> 
     
    170187 
    171188  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">--> 
     189 
    172190  <condition property="indexers.home" value="${basedir}/src/packages/indexers"> 
    173191    <isset property="disable.collection.building"/> 
     
    186204<!--  ==================== Compilation Control Options ==================== --> 
    187205 
     206 
    188207<!-- 
    189208 
     
    199218--> 
    200219 
    201   <property name="compile.debug"       value="true"/> 
     220 
     221  <property name="compile.debug" value="true"/> 
    202222  <property name="compile.deprecation" value="true"/> 
    203   <property name="compile.optimize"    value="true"/> 
     223  <property name="compile.optimize" value="true"/> 
    204224 
    205225<!-- 
     
    213233 
    214234--> 
     235 
    215236 
    216237  <path id="compile.classpath"> 
     
    277298<!-- ==================== Primary and Global Targets ============================= --> 
    278299 
     300 
    279301  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? --> 
    280302 
    281   <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections" 
    282     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."> 
    283 <!--  <target name="prepare" depends="accept-properties,init,prepare-core,prepare-packages,prepare-gs2building,prepare-tomcat,prepare-axis,prepare-web,prepare-collections" 
    284     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.">--> 
    285  
    286     <!-- make sure .sh files are executable --> 
    287     <chmod dir="${basedir}" perm="ugo+rx"  
    288       includes="*.sh"/> 
    289     <chmod dir="${basedir}/bin/script" perm="ugo+rx"  
    290       includes="*.sh,*.pl"/> 
    291   </target> 
    292   <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile"  
    293     description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/> 
     303 
     304   
     305   
    294306   
    295307<!--  <target name="cvsupdate" depends="init,cvsupdate-packages,cvsupdate-core,cvsupdate-gs2building,cvsupdate-web" 
    296308    description="Do a cvs update for all sources. Doesn't recompile the code. You need to be online to run this."/>--> 
    297   <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web" 
    298     description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/> 
    299  
    300  
    301   <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building" 
    302     description="Configure any C/C+/+ package code and gs2building code if necessary"/> 
    303    
    304   <target name="configure" depends="init,configure-tomcat,configure-web" 
    305     description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/> 
    306  
    307   <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building" 
    308     description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/> 
    309    
    310   <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building" 
    311     description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/> 
     309 
     310  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web" description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/> 
     311 
     312 
     313  <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building" description="Configure any C/C+/+ package code and gs2building code if necessary"/> 
     314   
     315  <target name="configure" depends="init,configure-tomcat,configure-web" description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/> 
     316 
     317  <target name="clean" depends="init,clean-packages,clean-core,clean-gs2building" description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/> 
     318   
     319  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building" description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/> 
    312320     
    313   <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile"  
    314     description="Update (thru Subversion) all the source (including core, packages and gs2building), then clean, configure and recompile."/> 
    315  
    316   <target name="start" depends="init,start-tomcat" 
    317     description="Startup the Tomcat server." /> 
    318  
    319   <target name="stop" depends="init,stop-tomcat"  
    320     description="Shutdown the Tomcat server."/> 
    321    
    322   <target name="restart" description="Shutdown and restart Tomcat"  depends="init,stop,start"/> 
     321   
     322 
     323  <target name="start" depends="init,start-tomcat" description="Startup the Tomcat server."/> 
     324 
     325  <target name="stop" depends="init,stop-tomcat" description="Shutdown the Tomcat server."/> 
     326   
     327  <target name="restart" description="Shutdown and restart Tomcat" depends="init,stop,start"/> 
    323328 
    324329 
    325330<!-- =========== Help targets ===================================  --> 
     331 
    326332   
    327333  <property name="install-command" value="ant [options] prepare install"/> 
     
    330336    <echo message="  Execute 'ant -projecthelp' for a list of targets."/> 
    331337    <echo message="  Execute 'ant -help' for Ant help."/> 
    332     <echo>To install Greenstone3, run '${install-command}'.  
    333 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. 
    334 To log the output, use the '-logfile build.log' option. 
    335 The README.txt file has more information about the ant targets and install process. 
    336     </echo> 
    337338  </target> 
    338339   
     
    344345 
    345346<!-- ====== initialization and setup targets ================== --> 
     347 
    346348 
    347349  <target name="accept-properties" unless="properties.accepted"> 
     
    352354proxy.host=${proxy.host} 
    353355proxy.port=${proxy.port} 
    354 If these are not acceptable, please change them and rerun this target. Continue [y/n]? /> 
     356If these are not acceptable, please change them and rerun this target. Continue [y/n]? /&gt; 
    355357    </input> 
    356358    <condition property="do.abort">  
     
    372374  </target> --> 
    373375 
     376 
    374377  <!-- this sets up some initial properties --> 
     378 
    375379  <target name="init"> 
    376380 
     
    429433      
    430434 <!-- ========== Web app Targets ================================ --> 
    431    
    432   <target name="prepare-web" depends="init,configure-java-version"> 
    433     <mkdir dir="${web.home}/applet"/> 
    434     <mkdir dir="${web.home}/logs"/> 
    435   </target> 
     435 
     436   
     437   
    436438   
    437439  <!-- if we are using java 1.5, we need the xalan.jar file in web/WEB-INF/lib,  but if we are using java 1.4, we can't have it there --> 
    438   <target name="configure-java-version" depends="init" 
    439     description="Run this target if you have changed the default version of java since installing greenstone3"> 
     440 
     441  <target name="configure-java-version" depends="init" description="Run this target if you have changed the default version of java since installing greenstone3"> 
    440442    <condition property="need.xalan.jar"> 
    441443      <equals arg1="1.5" arg2="${ant.java.version}"/> 
     
    453455  </target> 
    454456 
    455   <target name="prepare-collections" depends="init"> 
    456     <property name="collect.dir" value="${web.home}/sites/localsite/collect"/> 
    457     <!-- gs2mgdemo --> 
    458     <unzip src="${collect.dir}/gs2mgdemo/import.zip"  
    459       dest="${collect.dir}/gs2mgdemo"/> 
    460     <unzip src="${collect.dir}/gs2mgdemo/metadata.zip"  
    461       dest="${collect.dir}/gs2mgdemo"/> 
    462     <unzip src="${collect.dir}/gs2mgdemo/index/index.zip"  
    463       dest="${collect.dir}/gs2mgdemo/index"/> 
    464     <delete file="${collect.dir}/gs2mgdemo/import.zip"/> 
    465     <delete file="${collect.dir}/gs2mgdemo/metadata.zip"/> 
    466     <delete file="${collect.dir}/gs2mgdemo/index/index.zip"/> 
    467     <!-- gs2mgppdemo --> 
    468     <unzip src="${collect.dir}/gs2mgppdemo/import.zip"  
    469       dest="${collect.dir}/gs2mgppdemo"/> 
    470     <unzip src="${collect.dir}/gs2mgppdemo/metadata.zip"  
    471       dest="${collect.dir}/gs2mgppdemo"/> 
    472     <unzip src="${collect.dir}/gs2mgppdemo/index/index.zip"  
    473       dest="${collect.dir}/gs2mgppdemo/index"/> 
    474     <delete file="${collect.dir}/gs2mgppdemo/import.zip"/> 
    475     <delete file="${collect.dir}/gs2mgppdemo/metadata.zip"/> 
    476     <delete file="${collect.dir}/gs2mgppdemo/index/index.zip"/> 
    477     <!-- gberg --> 
    478     <unzip src="${collect.dir}/gberg/index/index.zip"  
    479       dest="${collect.dir}/gberg/index"/> 
    480     <delete file="${collect.dir}/gberg/index/index.zip"/> 
    481   </target> 
    482  
    483    
    484   <target name="configure-web" depends="init" 
    485     description="Configure only the web app config files"> 
     457   
     458 
     459   
     460  <target name="configure-web" depends="init" description="Configure only the web app config files"> 
    486461    <!-- we want a unix path in the global.properties file --> 
    487462    <pathconvert targetos="unix" property="src.gsdl3.home.unix"> 
     
    499474 
    500475  <target name="compile-web" depends="init"> 
    501     <javac srcdir="${web.classes}" 
    502       destdir="${web.classes}" 
    503       debug="${compile.debug}" 
    504       deprecation="${compile.deprecation}" 
    505       optimize="${compile.optimize}"> 
     476    <javac srcdir="${web.classes}" destdir="${web.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> 
    506477      <classpath> 
    507478    <path refid="compile.classpath"/> 
     
    516487    </target> 
    517488 
    518   <target name="update-web" depends="init,svnupdate-web,configure-web" 
    519     description="update only the web stuff (config files)"/> 
     489   
    520490 
    521491 
    522492<!-- ======================= Tomcat Targets ========================== --> 
     493 
    523494   
    524495  <!-- this target downloads and installs Tomcat --> 
     496 
    525497  <!-- we download tomcat and the compat module - its needed for 1.4, and doesn't seem to harm 1.5 --> 
    526   <target name="prepare-tomcat" depends="init,setup-proxy" if="tomcat.islocal"> 
    527  
    528     <!-- check that packages dir is there --> 
    529     <mkdir dir="${packages.home}"/> 
    530     <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25.zip" 
    531       dest="${packages.home}/apache-tomcat-5.5.25.zip" 
    532       usetimestamp="true"/> 
    533     <unzip src="${packages.home}/apache-tomcat-5.5.25.zip"  
    534       dest="${packages.home}"/> 
    535     <get src="http://www.greenstone.org/gs3files/apache-tomcat-5.5.25-compat.zip" 
    536       dest="${packages.home}/apache-tomcat-5.5.25-compat.zip" 
    537       usetimestamp="true"/> 
    538     <unzip src="${packages.home}/apache-tomcat-5.5.25-compat.zip"  
    539       dest="${packages.home}"/> 
    540     <!-- delete any existing tomcat --> 
    541     <delete dir="${packages.home}/tomcat"/> 
    542     <move todir="${packages.home}/tomcat"> 
    543       <fileset dir="${packages.home}/apache-tomcat-5.5.25"/> 
    544     </move> 
    545     <copy file="${basedir}/resources/tomcat/setclasspath.bat" 
    546       tofile="${packages.home}/tomcat/bin/setclasspath.bat" 
    547       overwrite="true"/> 
    548     <copy file="${basedir}/resources/tomcat/setclasspath.sh" 
    549       tofile="${packages.home}/tomcat/bin/setclasspath.sh" 
    550       overwrite="true"/> 
    551     <!-- make sure we have execute permission for the .sh files --> 
    552     <chmod dir="${packages.home}/tomcat/bin" perm="ugo+rx"  
    553       includes="*.sh"/>    
    554   </target> 
     498 
     499   
    555500   
    556501  <target name="configure-tomcat" depends="init,configure-tomcat-local,configure-tomcat-external"/> 
     
    608553  </target> 
    609554  <!-- windows: do we want to launch a webrowser?? --> 
     555 
    610556  <target name="stop-tomcat" description="Shutdown only Tomcat" depends="init" if="tomcat.islocal"> 
    611557    <exec executable="${catalina.home}/bin/shutdown.sh" os="${os.unix}" dir="${catalina.home}/bin" spawn="false"> 
     
    619565  <target name="setup-catalina-ant-tasks"> 
    620566    <!-- Configure the custom Ant tasks for the Tomcat Manager application --> 
    621     <taskdef name="deploy"    classname="org.apache.catalina.ant.DeployTask" 
    622       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    623     <taskdef name="list"      classname="org.apache.catalina.ant.ListTask" 
    624       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    625     <taskdef name="reload"    classname="org.apache.catalina.ant.ReloadTask" 
    626       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    627     <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask" 
    628       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    629     <taskdef name="roles"     classname="org.apache.catalina.ant.RolesTask" 
    630       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    631     <taskdef name="start"     classname="org.apache.catalina.ant.StartTask" 
    632       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    633     <taskdef name="stop"      classname="org.apache.catalina.ant.StopTask" 
    634       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    635     <taskdef name="undeploy"  classname="org.apache.catalina.ant.UndeployTask" 
    636       classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
    637   </target> 
    638  
    639  
    640  
    641  
    642  
    643  
    644 <!-- ======================= ant Targets ============================ -->  
    645   <target name="prepare-ant" depends="init"> 
    646     <get src="http://www.greenstone.org/gs3files/apache-ant-1.7.0-bin.zip" 
    647       dest="${packages.home}/apache-ant-1.7.0-bin.zip" 
    648       usetimestamp="true"/> 
    649     <unzip src="${packages.home}/apache-ant-1.7.0-bin.zip" 
    650       dest="${packages.home}"/> 
    651     <move todir="${packages.home}/ant"> 
    652       <fileset dir="${packages.home}/apache-ant-1.7.0"/> 
    653     </move> 
    654   </target> 
    655  
    656 <!-- ======================= Axis Targets ============================ -->  
    657  
    658   <target name="prepare-axis" depends="init"> 
    659     <get src="http://www.greenstone.org/gs3files/axis-bin-1_2_1.zip" 
    660       dest="${packages.home}/axis-bin-1_2_1.zip" 
    661       usetimestamp="true"/> 
    662     <unzip src="${packages.home}/axis-bin-1_2_1.zip" 
    663       dest="${packages.home}"/> 
    664     <move todir="${packages.home}/axis"> 
    665       <fileset dir="${packages.home}/axis-1_2_1"/> 
    666     </move> 
    667     <!-- install axis into greenstone web app --> 
    668     <copy todir="${web.lib}"> 
    669       <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/lib"> 
    670     <include name="*.jar"/> 
    671       </fileset> 
    672     </copy> 
    673     <copy todir="${web.home}"> 
    674       <fileset dir="${packages.home}/axis/webapps/axis/"> 
    675     <include name="*.jsp"/> 
    676     <include name="*.jws"/> 
    677       </fileset> 
    678     </copy> 
    679     <copy tofile="${web.home}/axis.html" file="${packages.home}/axis/webapps/axis/index.html"/> 
    680     <copy todir="${web.classes}"> 
    681       <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/classes"> 
    682     <include name="*.properties"/> 
    683       </fileset> 
    684     </copy> 
    685   </target> 
    686  
    687   <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,create-deployment-files,deploy-site" 
    688     description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/> 
     567    <taskdef name="deploy" classname="org.apache.catalina.ant.DeployTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     568    <taskdef name="list" classname="org.apache.catalina.ant.ListTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     569    <taskdef name="reload" classname="org.apache.catalina.ant.ReloadTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     570    <taskdef name="resources" classname="org.apache.catalina.ant.ResourcesTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     571    <taskdef name="roles" classname="org.apache.catalina.ant.RolesTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     572    <taskdef name="start" classname="org.apache.catalina.ant.StartTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     573    <taskdef name="stop" classname="org.apache.catalina.ant.StopTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     574    <taskdef name="undeploy" classname="org.apache.catalina.ant.UndeployTask" classpath="${catalina.home}/server/lib/catalina-ant.jar"/> 
     575  </target> 
     576 
     577 
     578 
     579 
     580 
     581 
     582<!-- ======================= ant Targets ============================ --> 
     583  
     584   
     585 
     586<!-- ======================= Axis Targets ============================ --> 
     587  
     588 
     589   
     590 
     591  <target name="soap-deploy-site" depends="init,get-sitename,get-siteuri,create-deployment-files,deploy-site" description="Deploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."/> 
    689592   
    690593  <target name="deploy-site"> 
     
    697600  </target> 
    698601   
    699   <target name="soap-undeploy-site" depends="get-sitename" 
    700     description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."> 
     602  <target name="soap-undeploy-site" depends="get-sitename" description="Undeploy a SOAP web service for a local Greenstone site. Tomcat must be running for this to work."> 
    701603    <java classname="org.apache.axis.client.AdminClient"> 
    702604      <classpath refid="compile.classpath"/> 
     
    708610 
    709611  <!-- this target used to deploy the preprepared localsite server  --> 
    710   <target name="deploy-localsite" depends="init"  
    711     description="Deploy the SOAP server for localsite. Will start and stop Tomcat."> 
     612 
     613  <target name="deploy-localsite" depends="init" description="Deploy the SOAP server for localsite. Will start and stop Tomcat."> 
    712614    <antcall target="start-tomcat"/> 
    713615    <antcall target="deploy-site"> 
     
    736638   </target>  
    737639 
    738   <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files"  
    739     if="axis.sitename" unless="deploy.exists"> 
     640  <target name="create-deployment-files" depends="get-sitename,get-siteuri,check-deployment-files" if="axis.sitename" unless="deploy.exists"> 
    740641    <filter token="sitename" value="${axis.sitename}"/> 
    741642    <filter token="siteuri" value="${axis.siteuri}"/> 
    742     <copy file="${basedir}/resources/soap/site.wsdd.template" 
    743       tofile="${basedir}/resources/soap/${axis.sitename}.wsdd" 
    744       filtering="true"/> 
    745      <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" 
    746       tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd" 
    747       filtering="true"/> 
     643    <copy file="${basedir}/resources/soap/site.wsdd.template" tofile="${basedir}/resources/soap/${axis.sitename}.wsdd" filtering="true"/> 
     644     <copy file="${basedir}/resources/soap/undeploy-site.wsdd.template" tofile="${basedir}/resources/soap/undeploy-${axis.sitename}.wsdd" filtering="true"/> 
    748645    <!-- create the java files and compile them --> 
    749     <copy file="${basedir}/resources/java/SOAPServer.java.in" 
    750       tofile="${src.gsdl3.home}/SOAPServer${axis.sitename}.java" 
    751       filtering="true"/> 
     646    <copy file="${basedir}/resources/java/SOAPServer.java.in" tofile="${src.gsdl3.home}/SOAPServer${axis.sitename}.java" filtering="true"/> 
    752647    <mkdir dir="${build.home}"/> 
    753     <javac srcdir="${src.home}" 
    754       destdir="${build.home}"  
    755       debug="${compile.debug}" 
    756       deprecation="${compile.deprecation}" 
    757       optimize="${compile.optimize}"> 
     648    <javac srcdir="${src.home}" destdir="${build.home}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> 
    758649      <classpath refid="compile.classpath"/> 
    759       <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java" /> 
     650      <include name="org/greenstone/gsdl3/SOAPServer${axis.sitename}.java"/> 
    760651    </javac> 
    761652    <mkdir dir="${web.classes}/org/greenstone/gsdl3"/> 
    762     <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" /> 
     653    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServer${axis.sitename}.class"/> 
    763654  </target> 
    764655     
    765656 
    766657<!-- ====================== Core targets ============================== --> 
     658 
    767659<!-- core targets refer to the core gsdl3 java src --> 
    768    
    769   <target name="prepare-core" unless="nocvs.mode"> 
    770     <!-- just get rid of empty directories--> 
    771     <svn> 
    772         <update dir="."/> 
    773     </svn> 
    774   </target> 
     660 
     661   
     662   
    775663   
    776664  <target name="configure-core"/> 
    777665 
    778   <target name="update-core" depends="init,svnupdate-core,clean-core,compile-core" 
    779     description="Update only the Greenstone core" /> 
     666   
    780667   
    781668  <target name="svnupdate-core" unless="nocvs.mode"> 
     
    798685  </target> 
    799686 
    800   <target name="clean-core" 
    801     description="Clean only the Greenstone core"> 
     687  <target name="clean-core" description="Clean only the Greenstone core"> 
    802688    <delete dir="${build.home}"/> 
    803689  </target> 
    804690 
    805    <target name="compile-core" depends="init"  
    806     description="Compile only the Greenstone core"> 
     691   <target name="compile-core" depends="init" description="Compile only the Greenstone core"> 
    807692    <mkdir dir="${build.home}"/> 
    808     <javac srcdir="${src.home}" 
    809       destdir="${build.home}" 
    810       debug="${compile.debug}" 
    811       deprecation="${compile.deprecation}" 
    812       optimize="${compile.optimize}"> 
     693    <javac srcdir="${src.home}" destdir="${build.home}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> 
    813694      <classpath> 
    814695    <path refid="compile.classpath"/> 
     
    822703      </fileset> 
    823704      <manifest> 
    824     <attribute name="Built-By" value="${user.name}" /> 
     705    <attribute name="Built-By" value="${user.name}"/> 
    825706      </manifest> 
    826707    </jar> 
    827708    <copy file="${build.home}/gsdl3.jar" todir="${web.lib}"/> 
    828709    <!-- copy the localsite server in case we need it --> 
    829     <copy file="${build.home}/org/greenstone/gsdl3/SOAPServerlocalsite.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServerlocalsite.class" /> 
     710    <copy file="${build.home}/org/greenstone/gsdl3/SOAPServerlocalsite.class" tofile="${web.classes}/org/greenstone/gsdl3/SOAPServerlocalsite.class"/> 
    830711 
    831712    <jar destfile="${build.home}/GAI.jar"> 
     
    834715      </fileset> 
    835716      <manifest> 
    836     <attribute name="Built-By" value="${user.name}" /> 
     717    <attribute name="Built-By" value="${user.name}"/> 
    837718      </manifest> 
    838719    </jar> 
     
    843724      </fileset> 
    844725      <manifest> 
    845     <attribute name="Built-By" value="${user.name}" /> 
     726    <attribute name="Built-By" value="${user.name}"/> 
    846727      </manifest> 
    847728    </jar> 
     
    856737      </fileset> 
    857738      <manifest> 
    858     <attribute name="Built-By" value="${user.name}" /> 
     739    <attribute name="Built-By" value="${user.name}"/> 
    859740      </manifest> 
    860741    </jar> 
     
    866747      </fileset> 
    867748      <manifest> 
    868     <attribute name="Built-By" value="${user.name}" /> 
     749    <attribute name="Built-By" value="${user.name}"/> 
    869750      </manifest> 
    870751    </jar> 
     
    882763  
    883764<!-- ================== Packages targets ================================ --> 
     765 
    884766  <!-- these targets refer to the greenstone source packages - these need  
    885767  updating less often, so are in  separate targets to the core --> 
    886   <target name="prepare-packages" depends="init,prepare-indexers"/> 
    887    
    888   <target name="checkout-indexers" depends="init" if="independent-indexers" unless="nocvs.mode"> 
    889 <!--  <target name="checkout-indexers" depends="check-svnroot,init" if="independent-indexers" unless="nocvs.mode"> --> 
    890     <svn> 
    891         <checkout url="${svn.root}/indexers/${branch.path}" dest="${src.packages.home}/indexers"/> 
    892     </svn> 
    893   </target> 
    894    
    895   <target name="prepare-indexers" depends="init" if="independent-indexers" unless="indexers.present"> 
    896     <antcall target="checkout-indexers"/> 
    897   </target> 
    898  
    899   <target name="update-packages" depends="init,svnupdate-packages,configure-packages,clean-packages,compile-packages" 
    900     description="Update only the source packages"/> 
     768 
     769   
     770   
     771   
     772   
     773   
     774 
     775   
    901776 
    902777  <target name="svnupdate-packages" unless="nocvs.mode">  
     
    906781  </target> 
    907782   
    908   <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers"  
    909     description="Configure only the packages."/> 
     783  <target name="configure-packages" depends="init,configure-javagdbm,configure-indexers" description="Configure only the packages."/> 
    910784   
    911785  <target name="configure-javagdbm"> 
     
    913787      Configuring JavaGDBM 
    914788    </echo> 
    915     <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}" 
    916       dir="${javagdbm.home}"> 
     789    <exec executable="${javagdbm.home}/configure" os="${os.linux},${os.solaris}" dir="${javagdbm.home}"> 
    917790      <arg value="--prefix=${basedir}"/> 
    918791      <arg value="--libdir=${lib.jni}"/> 
    919792    </exec>     
    920     <exec executable="${javagdbm.home}/configure" os="${os.mac}" 
    921       dir="${javagdbm.home}"> 
     793    <exec executable="${javagdbm.home}/configure" os="${os.mac}" dir="${javagdbm.home}"> 
    922794      <arg value="--prefix=${basedir}"/> 
    923795      <arg value="--libdir=${lib.jni}"/> 
     
    930802    Shouldn't they be configured when collection building is ENabled? --> 
    931803 
     804 
    932805<!--    <target name="configure-indexers" depends="init" if="independent-indexers"> --> 
     806 
    933807<target name="configure-indexers" depends="init"> 
    934808        <echo>Configuring Indexers</echo> 
     
    942816 
    943817  <target name="clean-javagdbm" depends="init"> 
    944     <exec executable="make" os="${os.unix}" 
    945       dir="${javagdbm.home}"> 
     818    <exec executable="make" os="${os.unix}" dir="${javagdbm.home}"> 
    946819      <arg value="clean"/> 
    947820    </exec> 
     
    949822   
    950823  <target name="clean-indexers" depends="init" if="independent-indexers"> 
    951     <exec executable="make" os="${os.unix}" 
    952       dir="${indexers.home}"> 
     824    <exec executable="make" os="${os.unix}" dir="${indexers.home}"> 
    953825      <arg value="clean"/> 
    954826    </exec> 
    955     <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" 
    956        dir="${indexers.home}"> 
     827    <exec executable="${indexers.home}/winMake.bat" os="${os.windows}" dir="${indexers.home}"> 
    957828       <arg value="clean"/> 
    958829    </exec> 
     
    1037908 
    1038909 
    1039   <target name="update-gs2building" if="collection.building.enabled"  
    1040     depends="init,svnupdate-gs2building,rename-gs2build-files,configure-gs2building,clean-gs2building,compile-gs2building" 
    1041     description="Update only the Greenstone 2 building components"/> 
     910 
     911   
    1042912 
    1043913  <target name="svnupdate-gs2building" if="collection.building.enabled" depends="init,svnupdate-gs2build,svnupdate-gli" unless="nocvs.mode"> 
     
    1055925  </target> 
    1056926 
    1057   <target name="prepare-gs2building" depends="init,prepare-gs2build,prepare-gli" if="collection.building.enabled"> 
    1058   </target> 
    1059  
    1060   <target name="checkout-gs2build" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
    1061     <echo>checking out gs2build</echo> 
    1062         <!-- svn checkouts --> 
    1063         <svn> 
    1064             <!-- perllib --> 
    1065             <checkout url="${svn.root}/gsdl/${branch.path}/perllib" destPath="gs2build/perllib"/> 
    1066  
    1067             <!-- selected packages --> 
    1068             <checkout url="${svn.root}/gsdl/${branch.path}/packages/cpan" destPath="gs2build/packages/cpan"/> 
    1069             <checkout url="${svn.root}/gsdl/${branch.path}/packages/expat" destPath="gs2build/packages/expat"/> 
    1070             <checkout url="${svn.root}/gsdl/${branch.path}/packages/html-tidy" destPath="gs2build/packages/html-tidy"/> 
    1071             <checkout url="${svn.root}/gsdl/${branch.path}/packages/isis-gdl" destPath="gs2build/packages/isis-gdl"/> 
    1072             <checkout url="${svn.root}/gsdl/${branch.path}/packages/kea" destPath="gs2build/packages/kea"/> 
    1073             <checkout url="${svn.root}/gsdl/${branch.path}/packages/pdftohtml" destPath="gs2build/packages/pdftohtml"/> 
    1074             <checkout url="${svn.root}/gsdl/${branch.path}/packages/rtftohtml" destPath="gs2build/packages/rtftohtml"/> 
    1075             <checkout url="${svn.root}/gsdl/${branch.path}/packages/w3mir" destPath="gs2build/packages/w3mir"/> 
    1076             <checkout url="${svn.root}/gsdl/${branch.path}/packages/wget" destPath="gs2build/packages/wget"/> 
    1077             <checkout url="${svn.root}/gsdl/${branch.path}/packages/windows" destPath="gs2build/packages/windows"/> 
    1078             <checkout url="${svn.root}/gsdl/${branch.path}/packages/wv" destPath="gs2build/packages/wv"/> 
    1079             <checkout url="${svn.root}/gsdl/${branch.path}/packages/xlhtml" destPath="gs2build/packages/xlhtml"/> 
    1080             <checkout url="${svn.root}/gsdl/${branch.path}/packages/yaz" destPath="gs2build/packages/yaz"/> 
    1081              
    1082             <!-- some of src (db2txt hashfile phind txt2db) --> 
    1083             <checkout url="${svn.root}/gsdl/${branch.path}/src/db2txt" destPath="gs2build/src/db2txt"/> 
    1084             <checkout url="${svn.root}/gsdl/${branch.path}/src/hashfile" destPath="gs2build/src/hashfile"/> 
    1085             <checkout url="${svn.root}/gsdl/${branch.path}/src/phind" destPath="gs2build/src/phind"/> 
    1086             <checkout url="${svn.root}/gsdl/${branch.path}/src/txt2db" destPath="gs2build/src/txt2db"/> 
    1087  
    1088             <!-- bin --> 
    1089             <checkout url="${svn.root}/gsdl/${branch.path}/bin/script" destPath="gs2build/bin/script"/> 
    1090  
    1091             <!-- mappings --> 
    1092             <checkout url="${svn.root}/gsdl/${branch.path}/mappings" destPath="gs2build/mappings"/> 
    1093  
    1094             <!-- etc/packages --> 
    1095             <checkout url="${svn.root}/gsdl/${branch.path}/etc/packages" destPath="gs2build/etc/packages"/> 
    1096      
    1097             <!-- collect --> 
    1098             <checkout url="${svn.root}/gsdl/${branch.path}/collect/modelcol" destPath="gs2build/collect/modelcol"/> 
    1099  
    1100             <!-- gs2build-extra --> 
    1101             <checkout url="${svn.root}/other-projects/trunk/gs2build-extra" destPath="gs2build/gs2build-extra"/> 
    1102  
    1103             <!-- indexers --> 
    1104             <checkout url="${svn.root}/indexers/${branch.path}" destPath="gs2build/indexers"/> 
    1105  
    1106  
    1107         </svn> 
    1108         <!-- regular downloads --> 
    1109  
    1110         <!-- some files from lib --> 
    1111         <mkdir dir="gs2build/lib"/> 
    1112         <get src="${svn.root}/gsdl/${branch.path}/lib/text_t.h" dest="gs2build/lib/text_t.h"/> 
    1113         <get src="${svn.root}/gsdl/${branch.path}/lib/text_t.cpp" dest="gs2build/lib/text_t.cpp"/> 
    1114         <get src="${svn.root}/gsdl/${branch.path}/lib/gsdlconf.h" dest="gs2build/lib/gsdlconf.h"/> 
    1115  
    1116         <!-- some files from etc --> 
    1117         <get src="${svn.root}/gsdl/${branch.path}/etc/marctodc.txt" dest="gs2build/etc/marctodc.txt"/> 
    1118         <get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc-mapping.xml" dest="gs2build/etc/dc2marc-mapping.xml"/> 
    1119         <get src="${svn.root}/gsdl/${branch.path}/etc/dc2marc.xsl" dest="gs2build/etc/dc2marc.xsl"/> 
    1120         <get src="${svn.root}/gsdl/${branch.path}/etc/qdc2marc-mapping.xml" dest="gs2build/etc/qdc2marc-mapping.xml"/> 
    1121  
    1122         <!-- some files from the gsdl root directory --> 
    1123         <get src="${svn.root}/gsdl/${branch.path}/setup.bash" dest="gs2build/setup.bash"/> 
    1124         <get src="${svn.root}/gsdl/${branch.path}/config.sub" dest="gs2build/config.sub"/> 
    1125         <get src="${svn.root}/gsdl/${branch.path}/config.guess" dest="gs2build/config.guess"/> 
    1126         <get src="${svn.root}/gsdl/${branch.path}/config.h.in" dest="gs2build/config.h.in"/> 
    1127         <get src="${svn.root}/gsdl/${branch.path}/configtest.pl" dest="gs2build/configtest.pl"/> 
    1128         <get src="${svn.root}/gsdl/${branch.path}/install-sh" dest="gs2build/install-sh"/> 
    1129         <get src="${svn.root}/gsdl/${branch.path}/acconfig.h" dest="gs2build/acconfig.h"/> 
    1130         <get src="${svn.root}/gsdl/${branch.path}/aclocal.m4" dest="gs2build/aclocal.m4"/> 
    1131         <get src="${svn.root}/gsdl/${branch.path}/WIN32cfg.h" dest="gs2build/WIN32cfg.h"/> 
    1132  
    1133     </target> 
    1134  
    1135   <target name="prepare-gs2build" depends="init" if="collection.building.enabled" unless="gs2build.present"> 
    1136     <antcall target="checkout-gs2build"/> 
    1137     <antcall target="rename-gs2build-files"/> 
    1138     <antcall target="unzip-windows-packages"/> 
    1139     <antcall target="checkout-winbin"/> 
    1140     <antcall target="get-windows-binaries"/> 
    1141     <antcall target="delete-winbin"/> 
    1142     <antcall target="get-macos-extra"/> 
    1143   </target> 
    1144  
    1145   <target name="checkout-winbin" depends="init" if="current.os.iswindows"  
    1146     unless="nocvs.mode"> 
    1147     <svn> 
    1148         <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin"/> 
    1149     </svn>   
    1150   </target> 
    1151  
    1152   <target name="update-winbin" depends="init" if="current.os.iswindows" unless="nocvs.mode"> 
    1153         <svn> 
    1154             <update dir="${svn.root}/other-projects/trunk/winbin"/> 
    1155         </svn>   
    1156     </target> 
    1157    
    1158   <target name="get-windows-binaries" depends="init" if="collection.building.enabled.windows"> 
    1159     <move todir="${gs2build.home}/bin/windows" failonerror="false"> 
    1160       <fileset dir="${basedir}/winbin/bin"/> 
    1161     </move> 
    1162   </target> 
     927   
     928 
     929   
     930 
     931   
     932 
     933   
     934 
     935   
     936   
     937   
    1163938  <target name="delete-winbin" depends="init" if="collection.building.enabled.windows"> 
    1164939    <delete dir="${basedir}/winbin"/> 
     
    1166941   
    1167942  <target name="unzip-windows-packages" depends="init" if="collection.building.enabled.windows">   
    1168     <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip" 
    1169     dest="${gs2build.home}/packages/windows/gdbm"/> 
    1170    <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip" 
    1171     dest="${gs2build.home}/packages/windows/crypt"/> 
    1172        <unzip src="${gs2build.home}/packages/windows/expat/expat.zip" 
    1173     dest="${gs2build.home}/packages/windows/expat"/> 
     943    <unzip src="${gs2build.home}/packages/windows/gdbm/gdbm.zip" dest="${gs2build.home}/packages/windows/gdbm"/> 
     944   <unzip src="${gs2build.home}/packages/windows/crypt/crypt.zip" dest="${gs2build.home}/packages/windows/crypt"/> 
     945       <unzip src="${gs2build.home}/packages/windows/expat/expat.zip" dest="${gs2build.home}/packages/windows/expat"/> 
    1174946   </target> 
    1175947   
    1176948  <!-- downloads a good XML-Parser --> 
     949 
    1177950  <target name="get-macos-extra" depends="init" if="need.macos.extra">   
    1178       <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" 
    1179       dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 
    1180       usetimestamp="true"/> 
     951      <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz" dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" usetimestamp="true"/> 
    1181952  </target>   
    1182953 
    1183954  <!-- untars the XML-Parser. need to do this after compiling in gs2build--> 
     955 
    1184956  <target name="install-macos-extra" depends="init,get-macos-extra" if="need.macos.extra"> 
    1185957    <!-- make sure these directories are present, otherwise chmod craps out  
     
    1189961    <chmod dir="${gs2build.home}/perllib/cpan/perl-5.8" perm="ug+w" includes="**"/> 
    1190962    <chmod dir="${gs2build.home}/perllib/cpan/perl-5.6" perm="ug+w" includes="**"/> 
    1191     <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" 
    1192       dest="${gs2build.home}/perllib/cpan/" 
    1193       compression="gzip"/> 
     963    <untar src="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz" dest="${gs2build.home}/perllib/cpan/" compression="gzip"/> 
    1194964  </target> 
    1195965 
    1196966  <target name="install-indexer-files" depends="init" unless="indexers.present"> 
    1197967    <copy todir="${indexers.home}"> 
    1198       <fileset dir="${gs2build.home}/indexers" /> 
     968      <fileset dir="${gs2build.home}/indexers"/> 
    1199969    </copy> 
    1200970    <chmod file="${indexers.home}/configure" perm="a+x"/> 
    1201971  </target> 
    1202972 
    1203   <target name="rename-gs2build-files" depends="rename-gs2build-files-unix,rename-gs2build-files-windows,gs2build-edit-setup-bat" if="collection.building.enabled"/> 
     973   
    1204974   
    1205975  <target name="gs2build-edit-setup-bat" if="collection.building.enabled.windows"> 
     
    1213983     </filterset> 
    1214984    </move>   
    1215     <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat" /> 
    1216   </target> 
    1217    
    1218   <target name="rename-gs2build-files-windows" if="collection.building.enabled.windows"> 
    1219     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
    1220     <copy file="${gs2build-extra.home}/lib.win32.mak" tofile="${gs2build.home}/lib/win32.mak"/> 
    1221     <copy file="${gs2build-extra.home}/win32.mak" tofile="${gs2build.home}/win32.mak"/> 
    1222     <copy file="${gs2build-extra.home}/setup.bat" tofile="${gs2build.home}/setup.bat"/> 
    1223   </target>  
    1224    
    1225   <target name="rename-gs2build-files-unix" if="collection.building.enabled.unix"> 
    1226     <property name="gs2build-extra.home" value="${gs2build.home}/gs2build-extra"/> 
    1227     <copy file="${gs2build-extra.home}/configure" tofile="${gs2build.home}/configure"/>     
    1228     <chmod file="${gs2build.home}/configure" perm="a+x"/> 
    1229     <copy file="${gs2build-extra.home}/configure.in" tofile="${gs2build.home}/configure.in"/> 
    1230     <copy file="${gs2build-extra.home}/Makefile.in" tofile="${gs2build.home}/Makefile.in"/>   
    1231     <copy file="${gs2build-extra.home}/packages.configure" tofile="${gs2build.home}/packages/configure"/> 
    1232     <chmod file="${gs2build.home}/packages/configure" perm="a+x"/> 
    1233     <copy file="${gs2build-extra.home}/packages.Makefile.in" tofile="${gs2build.home}/packages/Makefile.in"/> 
    1234     <copy file="${gs2build-extra.home}/lib.Makefile.in" tofile="${gs2build.home}/lib/Makefile.in"/>   
    1235   </target> 
    1236    
    1237   <target name="prepare-gli" depends="init" if="collection.building.enabled" unless="gli.present"> 
    1238     <antcall target="checkout-gli"/> 
    1239   </target> 
     985    <move file="${gs2build.home}/setup-tmp.bat" tofile="${gs2build.home}/setup.bat"/> 
     986  </target> 
     987   
     988    
     989   
     990   
     991   
     992   
    1240993   
    1241994<!--  <target name="checkout-gli" depends="check-cvsroot,init" if="collection.building.enabled" unless="nocvs.mode"> --> 
    1242   <target name="checkout-gli" depends="init" if="collection.building.enabled" unless="nocvs.mode"> 
    1243     <echo>checking out gli</echo> 
    1244     <svn> 
    1245         <checkout url="${svn.root}/gli/${branch.path}" destPath="gli"/> 
    1246     </svn> 
    1247   </target> 
     995 
     996   
    1248997     
    1249   <target name="configure-gs2building" depends="init" if="collection.building.enabled" 
    1250     description="Configure only the Greenstone 2 building components"> 
    1251     <exec executable="${gs2build.home}/configure" os="${os.linux},${os.solaris}" 
    1252       dir="${gs2build.home}"> 
     998  <target name="configure-gs2building" depends="init" if="collection.building.enabled" description="Configure only the Greenstone 2 building components"> 
     999    <exec executable="${gs2build.home}/configure" os="${os.linux},${os.solaris}" dir="${gs2build.home}"> 
    12531000      <arg value="--prefix=${gs2build.home}"/> 
    12541001    </exec> 
    1255     <exec executable="${gs2build.home}/configure" os="${os.mac}" 
    1256       dir="${gs2build.home}"> 
     1002    <exec executable="${gs2build.home}/configure" os="${os.mac}" dir="${gs2build.home}"> 
    12571003      <arg value="--prefix=${gs2build.home}"/> 
    12581004      <arg value="--with-gdbm=${gdbm.installed.path}"/> 
     
    12601006  </target> 
    12611007 
    1262   <target name="clean-gs2building" depends="init,clean-gli,clean-gs2build"  
    1263     description="Clean only the Greenstone 2 building components"  
    1264     if="collection.building.enabled"/> 
     1008  <target name="clean-gs2building" depends="init,clean-gli,clean-gs2build" description="Clean only the Greenstone 2 building components" if="collection.building.enabled"/> 
    12651009   
    12661010  <target name="clean-gli" depends="init" if="collection.building.enabled"> 
     
    12681012    <property name="gli.home" value="${basedir}/gli"/> 
    12691013    <!-- linux --> 
    1270     <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}" 
    1271       resolveExecutable="true"/> 
     1014    <exec executable="clean.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 
    12721015    <!-- windows --> 
    1273     <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}" 
    1274       resolveExecutable="true"/> 
     1016    <exec executable="clean.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 
    12751017  </target> 
    12761018   
     
    13001042  </target> 
    13011043   
    1302   <target name="compile-gs2building" depends="init,compile-gs2build,compile-gli" if="collection.building.enabled" 
    1303     description="Compile only the Greenstone 2 building components"> 
     1044  <target name="compile-gs2building" depends="init,compile-gs2build,compile-gli" if="collection.building.enabled" description="Compile only the Greenstone 2 building components"> 
    13041045  </target> 
    13051046   
     
    13131054    <exec executable="makegli.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 
    13141055     <!--remote gli--> 
    1315      <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" 
    1316       resolveExecutable="true"/> 
     1056     <exec executable="makejar.sh" os="${os.unix}" dir="${gli.home}" resolveExecutable="true"/> 
    13171057    <!-- windows --> 
    13181058    <exec executable="makegli.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/> 
    13191059    <!--remote gli--> 
    1320      <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" 
    1321       resolveExecutable="true"/>  
    1322      <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java" /> 
     1060     <exec executable="makejar.bat" os="${os.windows}" dir="${gli.home}" resolveExecutable="true"/>  
     1061     <copy file="${gli.home}/GLIServer.jar" todir="${gs2build.home}/bin/java"/> 
    13231062  </target> 
    13241063   
     
    13771116 
    13781117<!-- ======================== TESTING Targets ========================= --> 
    1379    
    1380   <target name="test" description="Run the (incomplete) JUnit test suite " 
    1381     depends="init"> 
    1382     <mkdir dir="${basedir}/test"/> 
    1383     <junit printsummary="withOutAndErr" 
    1384       errorproperty="test.failed" 
    1385       failureproperty="test.failed" 
    1386       fork="${junit.fork}"> 
    1387       <formatter type="plain"/> 
    1388       <classpath> 
    1389     <pathelement location="${build.home}/gsdl3test.jar"/> 
    1390     <path refid="compile.classpath"/> 
    1391       </classpath> 
    1392       <test name="${testcase}" if="testcase"/> 
    1393       <batchtest todir="${basedir}/test" unless="testcase"> 
    1394     <fileset dir="${build.home}" 
    1395       includes="**/*Test.class" 
    1396       /> 
    1397       </batchtest> 
    1398     </junit> 
    1399     <echo> 
    1400       ********************************************* 
    1401        Test output can be found in directory 'test' 
    1402       ********************************************* 
    1403     </echo> 
    1404   </target> 
    1405   <target name="checkout-flax" description="check out flax source code from another repository"> 
    1406     <echo>checking out flax ...</echo> 
    1407     <mkdir dir="${basedir}/src/java/org/flax"/> 
    1408     <mkdir dir="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1409     <mkdir dir="${basedir}/web/WEB-INF/classes/flax"/> 
    1410     <mkdir dir="${basedir}/web/interfaces/flax"/> 
    1411     <mkdir dir="${basedir}/web/sites/flax"/> 
    1412     <svn> 
    1413       <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/flax/"   
    1414                 destPath="${basedir}/src/java/org/flax"/> 
    1415       <checkout url="${flax.svn.root}/flax1.0/trunk/src/java/org/greenstone/gsdl3/flax/"  
    1416                 destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/> 
    1417       <checkout url="${flax.svn.root}/flax1.0/trunk/web/WEB-INF/classes/flax/"  
    1418                 destPath="${basedir}/web/WEB-INF/classes/flax"/> 
    1419       <checkout url="${flax.svn.root}/flax1.0/trunk/web/interfaces/flax/"  
    1420                 destPath="${basedir}/web/interfaces/flax"/> 
    1421       <checkout url="${flax.svn.root}/flax1.0/trunk/web/sites/flax/"  
    1422                 destPath="${basedir}/web/sites/flax"/> 
    1423     </svn> 
    1424     <move file="${basedir}/web/WEB-INF/web.xml" tofile="${basedir}/web/WEB-INF/web.xml.greenstone3backup"/> 
    1425     <copy file="${basedir}/web/WEB-INF/classes/flax/web.xml" todir="${basedir}/web/WEB-INF" /> 
    1426  
    1427     <property name="coll.dir" value="${basedir}/web/sites/flax/collect"/> 
    1428     <!-- betterfa --> 
    1429     <unzip src="${coll.dir}/betterfa/archives/archives.zip" dest="${coll.dir}/betterfa/archives"/> 
    1430     <unzip src="${coll.dir}/betterfa/import/import.zip" dest="${coll.dir}/betterfa/import"/> 
    1431     <unzip src="${coll.dir}/betterfa/index/index.zip" dest="${coll.dir}/betterfa/index"/> 
    1432     <!-- imagegue --> 
    1433     <unzip src="${coll.dir}/imagegue/archives/archives.zip" dest="${coll.dir}/imagegue/archives"/> 
    1434     <unzip src="${coll.dir}/imagegue/import/import.zip" dest="${coll.dir}/imagegue/import"/> 
    1435     <unzip src="${coll.dir}/imagegue/index/index.zip" dest="${coll.dir}/imagegue/index"/> 
    1436     <!-- wikill --> 
    1437     <unzip src="${coll.dir}/wikill/archives/archives.zip" dest="${coll.dir}/wikill/archives"/> 
    1438     <unzip src="${coll.dir}/wikill/import/import.zip" dest="${coll.dir}/wikill/import"/> 
    1439     <unzip src="${coll.dir}/wikill/index/index.zip" dest="${coll.dir}/wikill/index"/> 
    1440  
    1441   </target> 
     1118 
     1119   
     1120   
     1121   
    14421122 
    14431123</project> 
    1444  
    1445