Changeset 1121

Show
Ignore:
Timestamp:
12/07/06 21:30:49
Author:
douglm
Message:

Fix build problem

Fix deletion of event refs and handle duplicate names in Trash

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/build.xml

    r1119 r1121  
    196196  </target> 
    197197 
     198  <target name="init.build" depends="init"> 
     199    <mkdir dir="${dist.home}" /> 
     200 
     201    <mkdir dir="${bin.home}" /> 
     202 
     203    <mkdir dir="${org.bedework.empty.dir}" /> 
     204  </target> 
     205 
    198206  <!-- ================================================================= 
    199207       "build" and "clean" targets for the project - does not build 
    …… 
    201209       ================================================================= --> 
    202210 
    203   <target name="build" depends="init,build.rpiutil,build.access,build.davutil, 
    204                                 build.calendarapi,build.dumprestore,build.synchml.if, 
    205                                 build.webdav.if,build.caldav.if,build.caldavTest.if, 
    206                                 build.freebusy.if,build.bwtools,build.webapps, 
     211  <target name="build" depends="init.build,build.rpiutil,build.access,build.davutil, 
     212                                build.calendarapi,build.dumprestore,build.synchml, 
     213                                build.webdav,build.caldav,build.caldavTest, 
     214                                build.freebusy,build.bwtools,build.webapps, 
    207215                                build.deployutil" 
    208216          description="builds the project"/> 
    209217 
    210218  <target name="clean" depends="init,clean.rpiutil,clean.access,clean.davutil, 
    211                                 clean.calendarapi,clean.dumprestore,clean.synchml.if, 
    212                                 clean.webdav.if,clean.caldav.if,clean.caldavTest.if, 
    213                                 clean.freebusy.if,clean.bwtools,clean.webapps" 
     219                                clean.calendarapi,clean.dumprestore,clean.synchml, 
     220                                clean.webdav,clean.caldav,clean.caldavTest, 
     221                                clean.freebusy,clean.bwtools,clean.webapps" 
    214222          description="Remove all generated files."> 
    215223    <delete dir="${dist.home}" /> 
    …… 
    218226 
    219227  <target name="quickstart-clean" depends="init,clean.rpiutil,clean.access,clean.davutil, 
    220                                            clean.calendarapi,clean.dumprestore,clean.synchml.if, 
    221                                            clean.webdav.if,clean.caldav.if,clean.caldavTest.if, 
    222                                            clean.freebusy.if,clean.bwtools,clean.webapps" 
     228                                           clean.calendarapi,clean.dumprestore,clean.synchml, 
     229                                           clean.webdav,clean.caldav,clean.caldavTest, 
     230                                           clean.freebusy,clean.bwtools,clean.webapps" 
    223231          description="partial clean up for quickstart."> 
    224232    <delete dir="${bin.home}" /> 
    …… 
    346354  <target name="build.caldav" depends="init" 
    347355          description="builds the caldav project"> 
    348     <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false" 
    349            target="build-all" /> 
    350  
    351     <copy-to-bin this="${org.bedework.project.caldav}"/> 
     356    <if> 
     357      <isset property="org.bedework.qs.build.caldav"/> 
     358      <then> 
     359        <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false" 
     360             target="build-all" /> 
     361 
     362      <copy-to-bin this="${org.bedework.project.caldav}"/> 
     363      </then> 
     364    </if> 
    352365  </target> 
    353366 
    354367  <target name="clean.caldav" depends="init" 
    355368          description="clean the caldav project"> 
    356     <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false" 
    357            target="deep-clean" /> 
     369    <if> 
     370      <isset property="org.bedework.qs.build.caldav"/> 
     371      <then> 
     372        <ant antfile="${org.bedework.project.caldav}/build.xml" inheritall="false" 
     373             target="deep-clean" /> 
     374      </then> 
     375    </if> 
    358376  </target> 
    359377 
    …… 
    361379          description="clean builds the caldav project"/> 
    362380 
    363   <target name="build.caldav.if" depends="init" 
    364           description="builds the jars" if="org.bedework.qs.build.caldav" > 
    365     <antcall inheritrefs="true" target="build.caldav" /> 
    366   </target> 
    367  
    368   <target name="clean.caldav.if" depends="init" 
    369           description="cleans jars" if="org.bedework.qs.build.caldav" > 
    370     <antcall inheritrefs="true" target="clean.caldav" /> 
    371   </target> 
    372  
    373381  <!-- ................................................................. 
    374382                          caldavTest 
    …… 
    376384  <target name="build.caldavTest" depends="init" 
    377385          description="builds the caldavTest project"> 
    378     <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false" 
    379            target="build-all" /> 
    380  
    381     <copy-to-bin this="${org.bedework.project.caldavTest}"/> 
     386    <if> 
     387      <isset property="org.bedework.qs.build.caldav"/> 
     388      <then> 
     389        <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false" 
     390             target="build-all" /> 
     391 
     392        <copy-to-bin this="${org.bedework.project.caldavTest}"/> 
     393      </then> 
     394    </if> 
    382395  </target> 
    383396 
    384397  <target name="clean.caldavTest" depends="init" 
    385398          description="clean the caldavTest project"> 
    386     <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false" 
    387            target="deep-clean" /> 
     399    <if> 
     400      <isset property="org.bedework.qs.build.caldav"/> 
     401      <then> 
     402        <ant antfile="${org.bedework.project.caldavTest}/build.xml" inheritall="false" 
     403             target="deep-clean" /> 
     404      </then> 
     405    </if> 
    388406  </target> 
    389407 
    390408  <target name="clean.build.caldavTest" depends="clean.caldavTest,build.caldavTest" 
    391409          description="clean builds the caldavTest project"/> 
    392  
    393   <target name="build.caldavTest.if" depends="init" 
    394           description="builds the jars" if="org.bedework.qs.build.caldav" > 
    395     <antcall inheritrefs="true" target="build.caldavTest" /> 
    396   </target> 
    397  
    398   <target name="clean.caldavTest.if" depends="init" 
    399           description="cleans jars" if="org.bedework.qs.build.caldav" > 
    400     <antcall inheritrefs="true" target="clean.caldavTest" /> 
    401   </target> 
    402410 
    403411  <!-- ................................................................. 
    …… 
    496504  <target name="build.freebusy" depends="init" 
    497505          description="builds the freebusy project"> 
    498     <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false" 
    499            target="build-all" /> 
    500  
    501     <copy-to-bin this="${org.bedework.project.freebusy}"/> 
     506    <if> 
     507      <isset property="org.bedework.qs.build.freebusy"/> 
     508      <then> 
     509        <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false" 
     510             target="build-all" /> 
     511 
     512        <copy-to-bin this="${org.bedework.project.freebusy}"/> 
     513      </then> 
     514    </if> 
    502515  </target> 
    503516 
    504517  <target name="clean.freebusy" depends="init" 
    505518          description="cleans the freebusy project"> 
    506     <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false" 
    507            target="deep-clean" /> 
     519    <if> 
     520      <isset property="org.bedework.qs.build.freebusy"/> 
     521      <then> 
     522        <ant antfile="${org.bedework.project.freebusy}/build.xml" inheritall="false" 
     523             target="deep-clean" /> 
     524      </then> 
     525    </if> 
    508526  </target> 
    509527 
    510528  <target name="clean.build.freebusy" depends="clean.freebusy,build.freebusy" 
    511529          description="builds the freebusy project"/> 
    512  
    513   <target name="build.freebusy.if" depends="init" 
    514           description="builds the jars" if="org.bedework.qs.build.freebusy" > 
    515     <antcall inheritrefs="true" target="build.freebusy" /> 
    516   </target> 
    517  
    518   <target name="clean.freebusy.if" depends="init" if="org.bedework.qs.build.freebusy" > 
    519     <antcall inheritrefs="true" target="clean.freebusy" /> 
    520   </target> 
    521530 
    522531  <!-- ................................................................. 
    …… 
    562571  <target name="build.synchml" depends="init" 
    563572          description="builds the synchml project"> 
    564     <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false" 
    565            target="build-all" /> 
    566  
    567     <copy-to-bin this="${org.bedework.project.synchml}"/> 
     573    <if> 
     574      <isset property="org.bedework.qs.build.synchml"/> 
     575      <then> 
     576        <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false" 
     577             target="build-all" /> 
     578 
     579        <copy-to-bin this="${org.bedework.project.synchml}"/> 
     580      </then> 
     581    </if> 
    568582  </target> 
    569583 
    570584  <target name="clean.synchml" depends="init" 
    571585          description="clean the synchml project"> 
    572     <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false" 
    573            target="deep-clean" /> 
     586    <if> 
     587      <isset property="org.bedework.qs.build.synchml"/> 
     588      <then> 
     589        <ant antfile="${org.bedework.project.synchml}/build.xml" inheritall="false" 
     590             target="deep-clean" /> 
     591      </then> 
     592    </if> 
    574593  </target> 
    575594 
    576595  <target name="clean.build.synchml" depends="clean.synchml,clean.synchml" 
    577596          description="builds the synchml project"/> 
    578  
    579   <target name="build.synchml.if" depends="init" 
    580           description="builds the jars" if="org.bedework.qs.build.synchml" > 
    581     <antcall inheritrefs="true" target="build.synchml" /> 
    582   </target> 
    583  
    584   <target name="clean.synchml.if" depends="init" 
    585           description="cleans jars" if="org.bedework.qs.build.synchml" > 
    586     <antcall inheritrefs="true" target="clean.synchml" /> 
    587   </target> 
    588597 
    589598  <!-- ................................................................. 
    …… 
    612621  <target name="build.webdav" depends="init" 
    613622          description="builds the webdav project"> 
    614     <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false" 
    615            target="build-all" /> 
    616  
    617     <copy-to-dependent this="${org.bedework.project.webdav}" 
    618                        target="${org.bedework.project.caldav}" /> 
    619  
    620     <copy-to-bin this="${org.bedework.project.webdav}"/> 
     623    <if> 
     624      <isset property="org.bedework.qs.build.caldav"/> 
     625      <then> 
     626        <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false" 
     627             target="build-all" /> 
     628 
     629        <copy-to-dependent this="${org.bedework.project.webdav}" 
     630                           target="${org.bedework.project.caldav}" /> 
     631 
     632        <copy-to-bin this="${org.bedework.project.webdav}"/> 
     633      </then> 
     634    </if> 
    621635  </target> 
    622636 
    623637  <target name="clean.webdav" depends="init" 
    624638          description="cleans the webdav project"> 
    625     <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false" 
    626            target="deep-clean" /> 
     639    <if> 
     640      <isset property="org.bedework.qs.build.caldav"/> 
     641      <then> 
     642        <ant antfile="${org.bedework.project.webdav}/build.xml" inheritall="false" 
     643             target="deep-clean" /> 
     644      </then> 
     645    </if> 
    627646  </target> 
    628647 
    629648  <target name="clean.build.webdav" depends="clean.webdav,build.webdav" 
    630649          description="builds the webdav project"/> 
    631  
    632   <target name="build.webdav.if" depends="init" 
    633           description="builds the jars" if="org.bedework.qs.build.caldav" > 
    634     <antcall inheritrefs="true" target="build.webdav" /> 
    635   </target> 
    636  
    637   <target name="clean.webdav.if" depends="init" 
    638           description="cleans jars" if="org.bedework.qs.build.caldav" > 
    639     <antcall inheritrefs="true" target="clean.webdav" /> 
    640   </target> 
    641650 
    642651  <!-- =================================================================