Changeset 3173

Show
Ignore:
Timestamp:
02/14/11 10:21:21
Author:
douglm
Message:

Further changes to the build. Attempt to catch changed libraries and force a rebuild.

Also use outofdate to suppress running of apt when sources have not changed.

Minor but widespread change to remove debug parameter from a number of classes. For those debugging now depends on log4j level.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r3169 r3173  
    349349      </if>       
    350350 
    351       <if> 
    352         <uptodate targetfile="@{jar-file}" > 
    353           <srcfiles refid="buildjar.java.sources" /> 
    354           <srcfiles refid="buildjar.generated.java.sources" /> 
    355           <srcfiles refid="buildjar.resource.files"/> 
    356           <srcfiles refid="dependency.fileset"/> 
    357         </uptodate> 
     351      <!-- See if the libraries are later than any classes -->  
     352 
     353      <var name="org.bedework.libraries.changed" value="false" /> 
     354       
     355      <outofdate outputsources="org.bedework,changed.sources"> 
     356        <sourcefiles> 
     357          <fileset dir="${lib.dir}"> 
     358             <include name="*.jar"/> 
     359          </fileset> 
     360          <!-- This makes almost everything rebuild all the time 
     361               because it has the generated jars for the current package 
     362          <path refid="compile.classpath"/>  
     363          --> 
     364        </sourcefiles> 
     365        <targetfiles> 
     366          <pathelement path="@{jar-file}"/> 
     367        </targetfiles> 
     368        <sequential> 
     369          <var name="org.bedework.libraries.changed" value="true" /> 
     370          <noisyMsg message="**** @{jar-file} needs rebuilding - libraries changed" /> 
     371        </sequential> 
     372      </outofdate> 
     373       
     374      <noisyMsg message="**** org.bedework,changed.sources = ${org.bedework,changed.sources}" /> 
     375      <noisyMsg message="**** org.bedework.libraries.changed = ${org.bedework.libraries.changed}" /> 
     376 
     377      <if> 
     378        <and> 
     379          <not> 
     380            <equals arg1="${org.bedework.libraries.changed}" arg2="true" /> 
     381          </not> 
     382          <uptodate targetfile="@{jar-file}" > 
     383            <srcfiles refid="buildjar.java.sources" /> 
     384            <srcfiles refid="buildjar.generated.java.sources" /> 
     385            <srcfiles refid="buildjar.resource.files"/> 
     386            <srcfiles refid="dependency.fileset"/> 
     387          </uptodate> 
     388        </and> 
    358389        <then> 
    359390          <noisyMsg message="**** @{jar-file} is up to date" /> 
    360391        </then> 
    361392        <else> 
     393          <echo message="**** @{jar-file} being rebuilt" /> 
    362394          <noisyMsg message="**** @{jar-file} needs rebuilding" /> 
    363395 

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

    r3107 r3173  
    102102                  <noisyMsg message="Fetch ${org.bedework.getjar.jarname} from project @{project}" /> 
    103103                  <copy file="${org.bedework.getjar.project.jar}" 
    104                         todir="@{lib}" overwrite="yes" /> 
     104                        todir="@{lib}" overwrite="yes" preservelastmodified="true" /> 
    105105                </then> 
    106106              </if> 
    …… 
    153153                 
    154154              <copy file="@{libcache}/${org.bedework.getjar.jarname}" 
    155                     todir="@{lib}" overwrite="yes" /> 
     155                    todir="@{lib}" overwrite="yes" preservelastmodified="true" /> 
    156156            </else> 
    157157          </if> 

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

    r3169 r3173  
    4242        </and> 
    4343        <then> 
    44           <noisyMsg message="**** @{jar.file} is up to date" /> 
     44          <noisyMsg message="**** @{jar-file} is up to date" /> 
    4545        </then> 
    4646        <else> 
    47           <noisyMsg message="**** @{jar.file} needs rebuilding" /> 
     47          <noisyMsg message="**** @{jar-file} needs rebuilding" /> 
    4848 
    4949          <delete dir="${sourcedestdir}" /> 

  • releases/bedework-3.7/deployutil

    • Property svn:ignore set to dist