Changeset 16936


Ignore:
Timestamp:
2008-08-21T12:19:47+12:00 (16 years ago)
Author:
oranfry
Message:

tidied up whitespace in the build.xml file to make it easier to read and edit

File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r16796 r16936  
    4848
    4949  -->
    50 
    5150 
    5251  <!--the first three properties have to be put on the top to be used by build.properties-->
    … …  
    106105      <isset property="tomcat.installed.path"/>
    107106      <not>
    108     <equals arg1="" arg2="${tomcat.installed.path}"/>
     107      <equals arg1="" arg2="${tomcat.installed.path}"/>
    109108      </not>
    110109    </and>
    … …  
    127126      <os family="unix"/>
    128127      <not>
    129     <os family="mac"/>
     128  <os family="mac"/>
    130129      </not>
    131130    </and>
    … …  
    236235    <!-- Include the axis jar files -->
    237236    <!--<fileset dir="${basedir}/comms/soap/axis/lib">
    238     <include name="*.jar"/>
    239   </fileset>-->
     237      <include name="*.jar"/>
     238    </fileset>-->
    240239   
    241240    <!-- include the jar files from the source packages -->
    … …  
    299298      includes="*.sh,*.pl"/>
    300299  </target>
     300
    301301  <target name="install" depends="init,install-indexer-files,configure,configure-c++,compile"
    302302    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
    … …  
    307307    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
    308308
    309 
    310309  <target name="configure-c++" depends="init,configure-packages,configure-core,configure-gs2building"
    311310    description="Configure any C/C+/+ package code and gs2building code if necessary"/>
    … …  
    329328    description="Startup the Tomcat server." >
    330329    <echo>${app.name} (${app.version}) server running using Apache Tomcat and Java</echo>
    331     <echo>Tomcat:   ${catalina.home}</echo>
    332     <echo>Java: ${java.home}</echo>
    333     <echo>URL:  http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
     330    <echo>Tomcat: ${catalina.home}</echo>
     331    <echo>Java  : ${java.home}</echo>
     332    <echo>URL   : http://${tomcat.server}:${tomcat.port}${app.path}/</echo>
    334333    <!-- assuming that index.html is not needed here -->   
    335334  </target>
    … …  
    384383    <condition property="java.too.old">
    385384      <or>
    386     <equals arg1="1.1" arg2="${ant.java.version}"/>
    387     <equals arg1="1.2" arg2="${ant.java.version}"/>
    388     <equals arg1="1.3" arg2="${ant.java.version}"/>
     385        <equals arg1="1.1" arg2="${ant.java.version}"/>
     386        <equals arg1="1.2" arg2="${ant.java.version}"/>
     387        <equals arg1="1.3" arg2="${ant.java.version}"/>
    389388      </or>
    390389    </condition>
    … …  
    397396    <condition property="tomcat.islocal">
    398397      <or>
    399     <not>
    400       <isset property="tomcat.installed.path"/>
    401     </not>
    402     <equals arg1="" arg2="${tomcat.installed.path}"/>
     398        <not><isset property="tomcat.installed.path"/></not>
     399        <equals arg1="" arg2="${tomcat.installed.path}"/>
    403400      </or>
    404401    </condition>
    … …  
    415412    <condition property="proxy.present">
    416413      <and>
    417     <isset property="proxy.host"/>
    418     <not>
    419       <equals arg1="" arg2="${proxy.host}"/>
    420     </not>
     414        <isset property="proxy.host"/>
     415        <not><equals arg1="" arg2="${proxy.host}"/></not>
    421416      </and>
    422417    </condition>
    … …  
    424419    <condition property="need.macos.extra">
    425420      <and>
    426     <isset property="current.os.ismac"/>
    427     <not>
    428       <isset property="disable.collection.building"/>
    429     </not>
     421        <isset property="current.os.ismac"/>
     422        <not><isset property="disable.collection.building"/></not>
    430423      </and>
    431424    </condition>
    … …  
    435428    <condition property="ask.user">
    436429      <or>
    437     <equals arg1="" arg2="${proxy.user}"/>
    438     <equals arg1="" arg2="${proxy.password}"/>
     430        <equals arg1="" arg2="${proxy.user}"/>
     431        <equals arg1="" arg2="${proxy.password}"/>
    439432      </or>
    440433    </condition>
    … …  
    457450    <condition property="need.xalan.jar">
    458451      <or>
    459     <equals arg1="1.5" arg2="${ant.java.version}"/>
    460     <equals arg1="1.6" arg2="${ant.java.version}"/>
     452        <equals arg1="1.5" arg2="${ant.java.version}"/>
     453        <equals arg1="1.6" arg2="${ant.java.version}"/>
    461454      </or>
    462455    </condition>
    … …  
    465458    <if>
    466459      <bool>
    467     <and>
    468       <isset property="have.xalan.jar"/>
    469       <not><isset property="need.xalan.jar"/></not>
    470     </and>
     460        <and>
     461          <isset property="have.xalan.jar"/>
     462          <not><isset property="need.xalan.jar"/></not>
     463        </and>
    471464      </bool>
    472465      <antcall target="deactivate-xalan-jar"/>
    … …  
    476469    <if>
    477470      <bool>
    478     <and>
    479       <not><isset property="have.xalan.jar"/></not>
    480       <isset property="need.xalan.jar"/>
    481     </and>
     471        <and>
     472          <not><isset property="have.xalan.jar"/></not>
     473          <isset property="need.xalan.jar"/>
     474        </and>
    482475      </bool>
    483476      <antcall target="activate-xalan-jar"/>
    … …  
    503496
    504497
    505 <target name="prepare-collections" depends="init">
    506   <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    507   <property name="import.zip" value="import.zip"/>
    508   <property name="metadata.zip" value="metadata.zip"/>
    509   <property name="index.zip" value="index/index.zip"/>
    510 
    511   <echo message="installing collections..."/>
    512   <antcall target="gs2mgdemo-install"/>
    513   <antcall target="gs2mgppdemo-install"/>
    514   <antcall target="gberg-install"/>
    515 
    516 </target>
    517 
    518 <target name="gs2mgdemo-prepare" if="collect.dir">
    519  <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>
    520  
    521 <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">
    522     <include name="${import.zip}"/>
    523     <include name="${metadata.zip}"/>
    524     <include name="${index.zip}"/>
    525 </fileset>
    526 
    527 <condition property="gs2mgdemo.present">
    528     <and>
    529     <available file="${gs2mgdemo.dir}/${import.zip}"/>
    530     <available file="${gs2mgdemo.dir}/${metadata.zip}"/>
    531         <available file="${gs2mgdemo.dir}/${index.zip}"/>
    532     </and>
    533   </condition>
    534 </target>
    535 
    536 <target name="gs2mgdemo-install" if="gs2mgdemo.present"  depends="gs2mgdemo-prepare">
    537   <echo> installing gs2mgdemo</echo>
    538   <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${import.zip}" />
    539   <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" />
    540   <unzip dest="${gs2mgdemo.dir}/index" src="${gs2mgdemo.dir}/${index.zip}" />
    541   <!--Don't delete the zips, else doing an svn update will get them all over again.-->
    542   <!--<delete><fileset refid="gs2mgdemofiles"/></delete>-->
    543   <echo>collection gs2mgdemo installed</echo>
    544 </target>
    545 
    546 <target name="gs2mgppdemo-prepare" if="collect.dir">
    547  <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>
    548  
    549 <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">
    550         <include name="${import.zip}"/>
    551     <include name="${metadata.zip}"/>
    552     <include name="${index.zip}"/>
    553 </fileset>
    554 
    555 <condition property="gs2mgppdemo.present">
    556     <and>
    557         <available file="${gs2mgppdemo.dir}/${import.zip}"/>
    558     <available file="${gs2mgppdemo.dir}/${metadata.zip}"/>
    559         <available file="${gs2mgppdemo.dir}/${index.zip}"/>
    560     </and>
    561   </condition>
    562 </target>
    563 
    564 <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">
    565   <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${import.zip}" />
    566   <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" />
    567   <unzip dest="${gs2mgppdemo.dir}/index" src="${gs2mgppdemo.dir}/${index.zip}" />
    568   <!--<delete><fileset refid="gs2mgppdemofiles"/></delete>-->
    569   <echo>collection gs2mgppdemo installed</echo>
    570 </target>   
    571 
    572 <target name="gberg-prepare" if="collect.dir">
    573  <property name="gberg.dir" value="${collect.dir}/gberg"/>
    574  
    575 <fileset id="gbergfiles" dir="${gberg.dir}">
    576         <include name="${index.zip}"/>
    577 </fileset>
    578 <available file="${gberg.dir}/${index.zip}" property="gberg.present"/>
    579 </target>
    580 
    581 <target name="gberg-install" if="gberg.present" depends="gberg-prepare">
    582 <unzip dest="${gberg.dir}/index">
    583         <fileset refid="gbergfiles"/>
    584 </unzip>
    585 <!--<delete><fileset refid="gbergfiles"/></delete>-->
    586 <echo>collection gberg installed</echo>
    587 </target>
    588 
    589 
    590 
    591 <!--
    592498  <target name="prepare-collections" depends="init">
    593499    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    594    
     500    <property name="import.zip" value="import.zip"/>
     501    <property name="metadata.zip" value="metadata.zip"/>
     502    <property name="index.zip" value="index/index.zip"/>
     503
     504    <echo message="installing collections..."/>
     505    <antcall target="gs2mgdemo-install"/>
     506    <antcall target="gs2mgppdemo-install"/>
     507    <antcall target="gberg-install"/>
     508  </target>
     509
     510  <target name="gs2mgdemo-prepare" if="collect.dir">
     511    <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>
     512    <fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">
     513      <include name="${import.zip}"/>
     514      <include name="${metadata.zip}"/>
     515      <include name="${index.zip}"/>
     516    </fileset>
     517
     518    <condition property="gs2mgdemo.present">
     519      <and>
     520        <available file="${gs2mgdemo.dir}/${import.zip}"/>
     521        <available file="${gs2mgdemo.dir}/${metadata.zip}"/>
     522        <available file="${gs2mgdemo.dir}/${index.zip}"/>
     523      </and>
     524    </condition>
     525  </target>
     526
     527  <target name="gs2mgdemo-install" if="gs2mgdemo.present"  depends="gs2mgdemo-prepare">
     528    <echo> installing gs2mgdemo</echo>
     529    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${import.zip}" />
     530    <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" />
     531    <unzip dest="${gs2mgdemo.dir}/index" src="${gs2mgdemo.dir}/${index.zip}" />
     532    <!--Don't delete the zips, else doing an svn update will get them all over again.-->
     533    <!--<delete><fileset refid="gs2mgdemofiles"/></delete>-->
     534    <echo>collection gs2mgdemo installed</echo>
     535  </target>
     536
     537  <target name="gs2mgppdemo-prepare" if="collect.dir">
     538    <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>
     539 
     540    <fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">
     541      <include name="${import.zip}"/>
     542      <include name="${metadata.zip}"/>
     543      <include name="${index.zip}"/>
     544    </fileset>
     545
     546    <condition property="gs2mgppdemo.present">
     547      <and>
     548        <available file="${gs2mgppdemo.dir}/${import.zip}"/>
     549        <available file="${gs2mgppdemo.dir}/${metadata.zip}"/>
     550        <available file="${gs2mgppdemo.dir}/${index.zip}"/>
     551      </and>
     552    </condition>
     553  </target>
     554
     555  <target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">
     556    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${import.zip}" />
     557    <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" />
     558    <unzip dest="${gs2mgppdemo.dir}/index" src="${gs2mgppdemo.dir}/${index.zip}" />
     559    <!--<delete><fileset refid="gs2mgppdemofiles"/></delete>-->
     560    <echo>collection gs2mgppdemo installed</echo>
     561  </target>   
     562
     563  <target name="gberg-prepare" if="collect.dir">
     564    <property name="gberg.dir" value="${collect.dir}/gberg"/>
     565    <fileset id="gbergfiles" dir="${gberg.dir}">
     566      <include name="${index.zip}"/>
     567    </fileset>
     568    <available file="${gberg.dir}/${index.zip}" property="gberg.present"/>
     569  </target>
     570
     571  <target name="gberg-install" if="gberg.present" depends="gberg-prepare">
     572    <unzip dest="${gberg.dir}/index">
     573      <fileset refid="gbergfiles"/>
     574    </unzip>
     575    <!--<delete><fileset refid="gbergfiles"/></delete>-->
     576    <echo>collection gberg installed</echo>
     577  </target>
     578
     579  <!--
     580  <target name="prepare-collections" depends="init">
     581    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    595582    <unzip src="${collect.dir}/gs2mgdemo/import.zip"
    596583      dest="${collect.dir}/gs2mgdemo"/>
    … …  
    617604    <delete file="${collect.dir}/gberg/index/index.zip"/>
    618605  </target>
    619 -->
    620 
    621 
    622  
     606  -->
     607
    623608  <target name="configure-web" depends="init"
    624609    description="Configure only the web app config files">
    … …  
    643628      deprecation="${compile.deprecation}"
    644629      optimize="${compile.optimize}">
    645       <classpath>
    646     <path refid="compile.classpath"/>
    647       </classpath>
     630      <classpath><path refid="compile.classpath"/></classpath>
    648631    </javac>
    649632  </target>
    … …  
    657640  <target name="update-web" depends="init,svnupdate-web,configure-web"
    658641    description="update only the web stuff (config files)"/>
    659 
    660642
    661643  <!-- ======================= Tomcat Targets ========================== -->
    … …  
    699681    <copy file="${basedir}/resources/tomcat/server.xml" tofile="${packages.home}/tomcat/conf/server.xml" overwrite="true">
    700682      <filterset>
    701     <filter token="port" value="${tomcat.port}"/>
    702     <filter token="shutdown-port" value="${tomcat.shutdown.port}"/>
     683        <filter token="port" value="${tomcat.port}"/>
     684        <filter token="shutdown-port" value="${tomcat.shutdown.port}"/>
    703685      </filterset>
    704686    </copy>
    … …  
    706688    <copy file="${basedir}/resources/tomcat/greenstone3.xml" tofile="${packages.home}/tomcat/conf/Catalina/localhost/greenstone3.xml" overwrite="true">
    707689      <filterset>
    708     <filter token="gsdl3webhome" value="${web.home}"/>
     690        <filter token="gsdl3webhome" value="${web.home}"/>
    709691      </filterset>
    710692    </copy>
    … …  
    743725    <waitfor maxwait="5" maxwaitunit="second">
    744726      <and>
    745     <socket server="${tomcat.server}" port="${tomcat.port}"/>
    746     <http url="http://${tomcat.server}:${tomcat.port}${app.path}/index.html"/>
     727        <socket server="${tomcat.server}" port="${tomcat.port}"/>
     728        <http url="http://${tomcat.server}:${tomcat.port}${app.path}/index.html"/>
    747729      </and>
    748730    </waitfor>
    … …  
    783765
    784766
    785 
    786 
    787 
    788 
    789767  <!-- ======================= ant Targets ============================ -->
    790768  <target name="prepare-ant" depends="init">
    … …  
    813791    <copy todir="${web.lib}">
    814792      <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/lib">
    815     <include name="*.jar"/>
     793        <include name="*.jar"/>
    816794      </fileset>
    817795    </copy>
    818796    <copy todir="${web.home}">
    819797      <fileset dir="${packages.home}/axis/webapps/axis/">
    820     <include name="*.jsp"/>
    821     <include name="*.jws"/>
     798        <include name="*.jsp"/>
     799        <include name="*.jws"/>
    822800      </fileset>
    823801    </copy>
    … …  
    825803    <copy todir="${web.classes}">
    826804      <fileset dir="${packages.home}/axis/webapps/axis/WEB-INF/classes">
    827     <include name="*.properties"/>
     805        <include name="*.properties"/>
    828806      </fileset>
    829807    </copy>
    … …  
    859837  </target> 
    860838
    861  <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server
    862 with the default servicename of localsite-->
     839  <!-- this target used to deploy the default web service SOAPServer (base.webservice.name) on the localsite server
     840  with the default servicename of localsite-->
    863841  <target name="deploy-localsite" depends="init"
    864842    description="Deploy the SOAP server for localsite. Will start and stop Tomcat.">
    … …  
    878856  </target>
    879857   
    880 <target name="get-sitename" unless="axis.sitename">
     858  <target name="get-sitename" unless="axis.sitename">
    881859    <input addproperty="axis.sitename" defaultvalue="localsite">What site do you want to deploy services for?
    882860Press Enter for default:localsite</input>
    … …  
    913891    </not>
    914892    </condition>
    915  </target>
     893  </target>
    916894   
    917  <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename">
     895  <target name="create-deployment-files" depends="set-soapmethod" if="axis.sitename">
    918896    <filter token="sitename" value="${axis.sitename}"/>
    919897    <filter token="siteuri" value="${axis.siteuri}"/>
    … …  
    993971      optimize="${compile.optimize}">
    994972      <classpath>
    995     <path refid="compile.classpath"/>
     973        <path refid="compile.classpath"/>
    996974      </classpath>
    997975    </javac>
    998976    <jar destfile="${build.home}/gsdl3.jar">
    999977      <fileset dir="${build.home}">
    1000     <include name="org/greenstone/gsdl3/**"/>
     978        <include name="org/greenstone/gsdl3/**"/>
    1001979        <include name="org/flax/**"/>
    1002     <exclude name="**/Test.class"/>
     980        <exclude name="**/Test.class"/>
    1003981      </fileset>
    1004982      <manifest>
    1005     <attribute name="Built-By" value="${user.name}" />
     983        <attribute name="Built-By" value="${user.name}" />
    1006984      </manifest>
    1007985    </jar>
    … …  
    1012990    <jar destfile="${build.home}/GAI.jar">
    1013991      <fileset dir="${build.home}">
    1014     <include name="org/greenstone/admin/**"/>
     992        <include name="org/greenstone/admin/**"/>
    1015993      </fileset>
    1016994      <manifest>
    1017     <attribute name="Built-By" value="${user.name}" />
     995        <attribute name="Built-By" value="${user.name}" />
    1018996      </manifest>
    1019997    </jar>
    … …  
    1021999    <jar destfile="${build.home}/phind.jar">
    10221000      <fileset dir="${build.home}">
    1023     <include name="org/greenstone/applet/phind/**"/>
     1001        <include name="org/greenstone/applet/phind/**"/>
    10241002      </fileset>
    10251003      <manifest>
    1026     <attribute name="Built-By" value="${user.name}" />
     1004        <attribute name="Built-By" value="${user.name}" />
    10271005      </manifest>
    10281006    </jar>
    … …  
    10341012    <jar destfile="${build.home}/anttasks.jar">
    10351013      <fileset dir="${build.home}">
    1036     <include name="org/greenstone/anttasks/**"/>
     1014        <include name="org/greenstone/anttasks/**"/>
    10371015      </fileset>
    10381016      <manifest>
    1039     <attribute name="Built-By" value="${user.name}" />
     1017        <attribute name="Built-By" value="${user.name}" />
    10401018      </manifest>
    10411019    </jar>
    … …  
    10431021    <jar destfile="${build.home}/gsdl3test.jar">
    10441022      <fileset dir="${build.home}">
    1045     <include name="org/greenstone/gsdl3/**/*Test.class"/>
    1046     <include name="org/greenstone/testing/**"/>
     1023        <include name="org/greenstone/gsdl3/**/*Test.class"/>
     1024        <include name="org/greenstone/testing/**"/>
    10471025      </fileset>
    10481026      <manifest>
    1049     <attribute name="Built-By" value="${user.name}" />
     1027        <attribute name="Built-By" value="${user.name}" />
    10501028      </manifest>
    10511029    </jar>
    10521030    <jar destfile="${build.home}/server.jar">
    10531031      <fileset dir="${build.home}">
    1054     <include name="org/greenstone/server/**"/>
     1032        <include name="org/greenstone/server/**"/>
    10551033      </fileset>
    10561034      <fileset file="${basedir}/resources/java/server.properties"/>
    10571035      <manifest>
    1058     <attribute name="Built-By" value="${user.name}"/>
     1036        <attribute name="Built-By" value="${user.name}"/>
    10591037      </manifest>
    10601038    </jar>
    … …  
    11101088  Shouldn't they be configured when collection building is ENabled? -->
    11111089
    1112   <!--  <target name="configure-indexers" depends="init" if="independent-indexers"> -->
     1090  <!-- <target name="configure-indexers" depends="init" if="independent-indexers"> -->
    11131091  <target name="configure-indexers" depends="init">
    11141092    <echo>Configuring Indexers</echo>
    … …  
    11371115      <arg value="clean"/>
    11381116    </exec>
    1139 
    1140   </target>
     1117  </target>
     1118
    11411119  <target name="distclean-packages" depends="init,distclean-javagdbm,distclean-indexers" description="Distclean only the packages"/>
    11421120
    … …  
    11571135      <arg value="clean"/>
    11581136    </exec>
    1159 
    11601137  </target>
    11611138 
    … …  
    12911268    <svn>
    12921269      <checkout url="${svn.root}/other-projects/trunk/winbin" destPath="${basedir}/winbin" revision="${branch.revision}"/>
    1293     </svn> 
     1270    </svn>
    12941271  </target>
    12951272
    … …  
    12971274    <svn>
    12981275      <update dir="winbin" revision="${branch.revision}"/>
    1299     </svn> 
     1276    </svn>
    13001277  </target>
    13011278 
    … …  
    13191296 
    13201297  <!-- downloads a good XML-Parser -->
    1321   <target name="get-macos-extra" depends="init" if="need.macos.extra"> 
    1322 <!--
    1323       <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
     1298  <target name="get-macos-extra" depends="init" if="need.macos.extra">
     1299    <!--
     1300    <get src="http://www.greenstone.org/gs3files/XML-Parser.tar.gz"
    13241301      dest="${gs2build.home}/perllib/cpan/XML-Parser.tar.gz"
    13251302      usetimestamp="true"/>
    1326 -->
     1303      -->
    13271304    <echo>Nothing extra currently needed for MacOs prepare</echo>
    13281305  </target>
    13291306
    1330 <!-- untars the XML-Parser. need to do this after compiling in gs2build-->
     1307  <!-- untars the XML-Parser. need to do this after compiling in gs2build-->
    13311308  <target name="install-macos-extra" depends="init,get-macos-extra" if="need.macos.extra">
    13321309    <!-- make sure these directories are present, otherwise chmod craps out
    13331310    this chmod is needed in case we are unpacking for a second time -->
    1334 <!--
     1311    <!--
    13351312    <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.8"/>
    13361313    <mkdir dir="${gs2build.home}/perllib/cpan/perl-5.6"/>
    … …  
    13401317      dest="${gs2build.home}/perllib/cpan/"
    13411318      compression="gzip"/>
    1342 -->
     1319    -->
    13431320    <echo>Nothing extra currently needed for MacOs install</echo>
    13441321  </target>
    … …  
    14831460    <copy todir="${gs2build.home}/bin/windows">
    14841461      <fileset dir="${gs2build.home}/common-src/indexers/bin">
    1485     <include name="*.*"/>
     1462        <include name="*.*"/>
    14861463      </fileset>
    14871464    </copy>
    … …  
    15181495      <formatter type="plain"/>
    15191496      <classpath>
    1520     <pathelement location="${build.home}/gsdl3test.jar"/>
    1521     <path refid="compile.classpath"/>
     1497        <pathelement location="${build.home}/gsdl3test.jar"/>
     1498        <path refid="compile.classpath"/>
    15221499      </classpath>
    15231500      <test name="${testcase}" if="testcase"/>
    15241501      <batchtest todir="${basedir}/test" unless="testcase">
    1525     <fileset dir="${build.home}"
    1526       includes="**/*Test.class"
    1527       />
     1502        <fileset dir="${build.home}" ncludes="**/*Test.class" />
    15281503      </batchtest>
    15291504    </junit>
    … …  
    15471522    <svn>
    15481523      <checkout url="${flax.checkout.path}/src/java/org/flax/" 
    1549     destPath="${basedir}/src/java/org/flax"/>
     1524        destPath="${basedir}/src/java/org/flax"/>
    15501525      <checkout url="${flax.checkout.path}/src/java/org/greenstone/gsdl3/flax/"
    1551     destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
     1526        destPath="${basedir}/src/java/org/greenstone/gsdl3/flax"/>
    15521527      <checkout url="${flax.checkout.path}/web/WEB-INF/classes/flax/"
    1553     destPath="${web.home}/WEB-INF/classes/flax"/>
     1528        destPath="${web.home}/WEB-INF/classes/flax"/>
    15541529      <checkout url="${flax.checkout.path}/web/interfaces/flax/"
    1555     destPath="${web.home}/interfaces/flax"/>
     1530        destPath="${web.home}/interfaces/flax"/>
    15561531      <checkout url="${flax.checkout.path}/web/sites/flax/"
    1557     destPath="${web.home}/sites/flax"/>
     1532        destPath="${web.home}/sites/flax"/>
    15581533      <checkout url="${flax.checkout.path}/flax-resources"
    1559     destPath="${basedir}/flax-resources"/>
     1534        destPath="${basedir}/flax-resources"/>
    15601535      <checkout url="${flax.checkout.path}/lib"
    1561     destPath="${basedir}/flax-lib"/>
     1536        destPath="${basedir}/flax-lib"/>
    15621537    </svn>
    15631538    <echo>prepare flax files...</echo>
    … …  
    15851560    <unzip dest="${coll.dir}"> 
    15861561      <fileset dir="${coll.dir}">
    1587     <include name="*.zip"/>
     1562        <include name="*.zip"/>
    15881563      </fileset>   
    15891564    </unzip>   
    … …  
    15971572    <unzip dest="${classes.dir}"> 
    15981573      <fileset dir="${classes.dir}">
    1599     <include name="*.zip"/>
     1574        <include name="*.zip"/>
    16001575      </fileset>   
    16011576    </unzip>   
    … …  
    16671642
    16681643</project>
    1669 
    1670 
Note: See TracChangeset for help on using the changeset viewer.