Changeset 15837


Ignore:
Timestamp:
2008-05-30T16:46:02+12:00 (16 years ago)
Author:
ak19
Message:

Dr Nichols' ant prepare-collections works and so commented out the old code to extract demo-collections again

File:
1 edited

Legend:

Unmodified
Added
Removed

  • greenstone3/trunk/build.xml

    r15809 r15837  
    503503  </target>
    504504
    505 <!--
     505
    506506<target name="prepare-collections" depends="init">
    507     <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    508 <echo message="installing collections..."/>
    509 <antcall target="gs2mgdemo-install"/>
    510 <antcall target="gs2mgppdemo-install"/>
    511 <antcall target="gberg-install"/>
     507  <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
     508  <property name="import.zip" value="import.zip"/>
     509  <property name="metadata.zip" value="metadata.zip"/>
     510  <property name="index.zip" value="index/index.zip"/>
     511
     512  <echo message="installing collections..."/>
     513  <antcall target="gs2mgdemo-install"/>
     514  <antcall target="gs2mgppdemo-install"/>
     515  <antcall target="gberg-install"/>
    512516
    513517</target>
    … …  
    515519<target name="gs2mgdemo-prepare" if="collect.dir">
    516520 <property name="gs2mgdemo.dir" value="${collect.dir}/gs2mgdemo"/>
    517  <property name="gs2mgdemo.import.zip" value="$import.zip"/>
    518   <property name="gs2mgdemo.metadata.zip" value="$metadata.zip"/>
    519   <property name="gs2mgdemo.index.zip" value="index/index.zip"/>
    520 
     521 
    521522<fileset id="gs2mgdemofiles" dir="${gs2mgdemo.dir}">
    522     <include name="${gs2mgdemo.import.zip}"/>
    523     <include name="${gs2mgdemo.metadata.zip}"/>
    524     <include name="${gs2mgdemo.index.zip}"/>
     523    <include name="${import.zip}"/>
     524    <include name="${metadata.zip}"/>
     525    <include name="${index.zip}"/>
    525526</fileset>
    526527
    527528<condition property="gs2mgdemo.present">
    528529    <and>
    529     <available file="${gs2mgdemo.import.zip}"/>
    530     <available file="${gs2mgdemo.metadata.zip}"/>
    531         <available file="${gs2mgdemo.index.zip}"/>
     530    <available file="${gs2mgdemo.dir}/${import.zip}"/>
     531    <available file="${gs2mgdemo.dir}/${metadata.zip}"/>
     532        <available file="${gs2mgdemo.dir}/${index.zip}"/>
    532533    </and>
    533534  </condition>
    … …  
    535536
    536537<target name="gs2mgdemo-install" if="gs2mgdemo.present"  depends="gs2mgdemo-prepare">
    537 <echo> installing gs2mgdemo</echo>
    538 <unzip dest="${gs2mgdemo.dir}">
     538  <echo> installing gs2mgdemo</echo>
     539  <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${import.zip}" />
     540  <unzip dest="${gs2mgdemo.dir}" src="${gs2mgdemo.dir}/${metadata.zip}" />
     541  <unzip dest="${gs2mgdemo.dir}/index" src="${gs2mgdemo.dir}/${index.zip}" />
     542  <delete>
    539543    <fileset refid="gs2mgdemofiles"/>
    540 </unzip>
    541 <delete>
    542     <fileset refid="gs2mgdemofiles"/>
    543 </delete>
    544 <echo>collection gs2mgdemo installed</echo>
     544  </delete>
     545  <echo>collection gs2mgdemo installed</echo>
    545546</target>
    546547
    547548<target name="gs2mgppdemo-prepare" if="collect.dir">
    548549 <property name="gs2mgppdemo.dir" value="${collect.dir}/gs2mgppdemo"/>
    549  <property name="gs2mgppdemo.import.zip" value="${gs2mgppdemo.dir}/import.zip"/>
    550   <property name="gs2mgppdemo.metadata.zip" value="${gs2mgppdemo.dir}/metadata.zip"/>
    551   <property name="gs2mgppdemo.index.zip" value="${gs2mgppdemo.dir}/index.zip"/>
    552 
     550 
    553551<fileset id="gs2mgppdemofiles" dir="${gs2mgppdemo.dir}">
    554         <include name="${gs2mgppdemo.import.zip}"/>
    555         <include name="${gs2mgppdemo.metadata.zip}"/>
    556         <include name="${gs2mgppdemo.index.zip}"/>
     552        <include name="${import.zip}"/>
     553    <include name="${metadata.zip}"/>
     554    <include name="${index.zip}"/>
    557555</fileset>
    558556
    559557<condition property="gs2mgppdemo.present">
    560558    <and>
    561         <available file="${gs2mgppdemo.import.zip}"/>
    562         <available file="${gs2mgppdemo.metadata.zip}"/>
    563         <available file="${gs2mgppdemo.index.zip}"/>
     559        <available file="${gs2mgppdemo.dir}/${import.zip}"/>
     560    <available file="${gs2mgppdemo.dir}/${metadata.zip}"/>
     561        <available file="${gs2mgppdemo.dir}/${index.zip}"/>
    564562    </and>
    565563  </condition>
    … …  
    567565
    568566<target name="gs2mgppdemo-install" if="gs2mgppdemo.present" depends="gs2mgppdemo-prepare">
    569 <unzip dest="${gs2mgppdemo.dir}">
     567  <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${import.zip}" />
     568  <unzip dest="${gs2mgppdemo.dir}" src="${gs2mgppdemo.dir}/${metadata.zip}" />
     569  <unzip dest="${gs2mgppdemo.dir}/index" src="${gs2mgppdemo.dir}/${index.zip}" />
     570  <delete>
    570571        <fileset refid="gs2mgppdemofiles"/>
    571 </unzip>
    572 <delete>
    573         <fileset refid="gs2mgppdemofiles"/>
    574 </delete>
    575 <echo>collection gs2mgppdemo installed</echo>
     572  </delete>
     573  <echo>collection gs2mgppdemo installed</echo>
    576574</target>   
    577575
    578576<target name="gberg-prepare" if="collect.dir">
    579577 <property name="gberg.dir" value="${collect.dir}/gberg"/>
    580  <property name="gberg.index.zip" value="${gberg.dir}/index.zip"/>
    581 
     578 
    582579<fileset id="gbergfiles" dir="${gberg.dir}">
    583         <include name="${gberg.index.zip}"/>
     580        <include name="${index.zip}"/>
    584581</fileset>
    585 <available file="${gberg.index.zip}" property="gberg.present"/>
     582<available file="${gberg.dir}/${index.zip}" property="gberg.present"/>
    586583</target>
    587584
    588585<target name="gberg-install" if="gberg.present" depends="gberg-prepare">
    589 <unzip dest="${gberg.dir}">
     586<unzip dest="${gberg.dir}/index">
    590587        <fileset refid="gbergfiles"/>
    591588</unzip>
    … …  
    596593</target>
    597594
    598 -->
    599 
    600 
     595
     596
     597<!--
    601598  <target name="prepare-collections" depends="init">
    602599    <property name="collect.dir" value="${web.home}/sites/localsite/collect"/>
    … …  
    626623    <delete file="${collect.dir}/gberg/index/index.zip"/>
    627624  </target>
     625-->
    628626
    629627
Note: See TracChangeset for help on using the changeset viewer.