Changeset 3211

Show
Ignore:
Timestamp:
03/07/11 11:07:46
Author:
douglm
Message:

Add more dependency checking to schema rebuild. Maybe we won't need "clean" so often.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • releases/bedework-3.7/build/buildTools/wsimport.xml

    r3190 r3211  
    2828    <attribute name="jar-file"/> 
    2929    <attribute name="bindingsdir" default="" /> 
     30    <attribute name="dependencies" default="empty.fileset" /> 
    3031    <sequential> 
    3132      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    …… 
    3536      <dirname property="org.bedework.wsdl.dir" file="@{wsdl}"/> 
    3637 
     38      <var name="org.bedework.source.changed" value="false" /> 
     39       
     40      <outofdate outputsources="org.bedework,changed.sources"> 
     41        <sourcefiles> 
     42          <fileset dir="${org.bedework.wsdl.dir}"/> 
     43          <fileset refid="@{dependencies}"/> 
     44        </sourcefiles> 
     45        <targetfiles> 
     46          <pathelement path="@{jar-file}"/> 
     47        </targetfiles> 
     48        <sequential> 
     49          <var name="org.bedework.source.changed" value="true" /> 
     50        </sequential> 
     51      </outofdate> 
     52       
     53      <noisyMsg message="**** org.bedework,changed.sources = ${org.bedework,changed.sources}" /> 
     54      <noisyMsg message="**** org.bedework.source.changed = ${org.bedework.source.changed}" /> 
     55 
    3756      <if> 
    38         <and> 
    39           <available file="${sourcedestdir}" type="dir" /> 
    40           <uptodate property="org.bedework.wsimport.uptodate" 
    41                     targetfile="@{jar-file}" > 
    42             <srcfiles dir="${org.bedework.wsdl.dir}" /> 
    43           </uptodate> 
    44         </and> 
     57        <not> 
     58          <equals arg1="${org.bedework.source.changed}" arg2="true" /> 
     59        </not> 
    4560        <then> 
    4661          <noisyMsg message="**** @{jar.file} is up to date" /> 

  • releases/bedework-3.7/build/buildTools/xjc.xml

    r3173 r3211  
    2727    <attribute name="jar-file"/> 
    2828    <attribute name="bindingsdir" default="" /> 
     29    <attribute name="dependencies" default="empty.fileset" /> 
    2930    <sequential> 
    3031      <taskdef resource="net/sf/antcontrib/antcontrib.properties" /> 
    …… 
    3435      <dirname property="org.bedework.schema.dir" file="@{schema}"/> 
    3536 
     37      <var name="org.bedework.source.changed" value="false" /> 
     38       
     39      <outofdate outputsources="org.bedework,changed.sources"> 
     40        <sourcefiles> 
     41          <fileset dir="${org.bedework.schema.dir}"/> 
     42          <fileset refid="@{dependencies}"/> 
     43        </sourcefiles> 
     44        <targetfiles> 
     45          <pathelement path="@{jar-file}"/> 
     46        </targetfiles> 
     47        <sequential> 
     48          <var name="org.bedework.source.changed" value="true" /> 
     49        </sequential> 
     50      </outofdate> 
     51       
     52      <noisyMsg message="**** org.bedework,changed.sources = ${org.bedework,changed.sources}" /> 
     53      <noisyMsg message="**** org.bedework.source.changed = ${org.bedework.source.changed}" /> 
     54 
    3655      <if> 
    37         <and> 
    38           <available file="${sourcedestdir}" type="dir" /> 
    39           <uptodate targetfile="@{jar-file}" > 
    40             <srcfiles dir="${org.bedework.schema.dir}" /> 
    41           </uptodate> 
    42         </and> 
     56        <not> 
     57          <equals arg1="${org.bedework.source.changed}" arg2="true" /> 
     58        </not> 
    4359        <then> 
    4460          <noisyMsg message="**** @{jar-file} is up to date" />