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

    rcbaa62d r2c0e6a3  
    6868    <target name="all" depends="war"/>
    6969
    70     <target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" >
     70    <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
    7171        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    7272            <arg value="list" />
     
    8080            <arg value="," />
    8181        </exec>
     82    </target>
     83
     84    <target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" >
     85        <!-- set if unset -->
     86        <property name="workspace.changes.tr" value="" />
    8287        <war destfile="${project}.war" webxml="WEB-INF/web-out.xml">
    8388                <fileset dir=".">
     
    103108            <srcfiles dir= "." includes="WEB-INF/web-out.xml WEB-INF/**/*.class images/*.png css.css index.html WEB-INF/classes/${project}.properties" />
    104109        </uptodate>
     110        <condition property="shouldListChanges" >
     111            <and>
     112                <not>
     113                    <isset property="war.uptodate" />
     114                </not>
     115                <isset property="mtn.available" />
     116            </and>
     117        </condition>
    105118    </target>
    106119
Note: See TracChangeset for help on using the changeset viewer.