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/addressbook/build.xml

    rcbaa62d r2c0e6a3  
    5252        <target name="jar" depends="compile, changes">
    5353                <jar basedir="${build}" destfile="${dist}/${jar}">
     54                <!-- set if unset -->
     55                <property name="workspace.changes" value="" />
    5456                        <manifest>
    5557                                <attribute name="Main-Class" value="addressbook.Daemon"/>
     
    6870                        <fileset dir="${build}"/>
    6971                </copy>
     72                <!-- set if unset -->
     73                <property name="workspace.changes.tr" value="" />
    7074                <war basedir="${dist}/tmp" webxml="web.xml" destfile="${dist}/${war}">
    7175                        <manifest>
     
    8286                            <srcfiles dir= "." includes="${build}/**/*.class, web.xml"/>
    8387                </uptodate>
     88                <condition property="shouldListChanges" >
     89                    <and>
     90                        <not>
     91                            <isset property="war.uptodate" />
     92                        </not>
     93                        <isset property="mtn.available" />
     94                    </and>
     95                </condition>
    8496        </target>
    8597
    86         <target name="changes">
     98        <target name="changes" depends="warUpToDate" if="shouldListChanges" >
    8799                <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    88100                    <arg value="list" />
Note: See TracChangeset for help on using the changeset viewer.