Ignore:
Timestamp:
Jun 10, 2011 2:53:59 PM (9 years ago)
Author:
kytv <kytv@…>
Branches:
master
Children:
4e99c45
Parents:
cbaa62d (diff), 162c5bc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '14e8f430d97e8e6a9926d59299775ca98d590c8d'

and '2b3daf42c48bc7b83cfa015b1dba87538ee2f8db'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/susimail/build.xml

    rcbaa62d r2c0e6a3  
    2323    <target name="jar" depends="compile, war" />
    2424
    25     <target name="war" depends="compile, bundle, warUpToDate" unless="war.uptodate" >
     25    <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
    2626        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    2727            <arg value="list" />
     
    3535            <arg value="," />
    3636        </exec>
     37    </target>
     38
     39    <target name="war" depends="compile, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
     40        <!-- set if unset -->
     41        <property name="workspace.changes.tr" value="" />
    3742        <war destfile="susimail.war" webxml="src/WEB-INF/web.xml"
    3843             basedir="src/" excludes="WEB-INF/web.xml LICENSE src/**/*">
     
    4954            <srcfiles dir= "src" excludes="LICENSE src/**/*" />
    5055        </uptodate>
     56        <condition property="shouldListChanges" >
     57            <and>
     58                <not>
     59                    <isset property="war.uptodate" />
     60                </not>
     61                <isset property="mtn.available" />
     62            </and>
     63        </condition>
    5164    </target>
    5265
Note: See TracChangeset for help on using the changeset viewer.