Changeset 3174

Show
Ignore:
Timestamp:
02/14/11 10:21:29
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

  • trunk/build/buildTools/deftasks.xml

    r3170 r3174  
    348348        </else> 
    349349      </if>       
     350 
     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}" /> 
    350376 
    351377      <if> 

  • trunk/build/buildTools/getJar.xml

    r3108 r3174  
    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> 

  • trunk/build/buildTools/xjc.xml

    r3170 r3174  
    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> 

  • trunk/deployutil

    • Property svn:ignore set to dist