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

    rcbaa62d r2c0e6a3  
    2626                <pathelement location="../../systray/java/lib/systray4j.jar" />
    2727                <pathelement location="../../desktopgui/build" />
    28                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
     28                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    2929                <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
    3030            </classpath>
     
    5858                <pathelement location="../../systray/java/lib/systray4j.jar" />
    5959                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    60                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" /> <!-- we dont care if we're not on win32 -->
     60                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    6161                <pathelement location="../../jrobin/jrobin-1.5.9.1.jar" />
    6262            </classpath>
     
    6868
    6969    <!-- the jar without the latest message classes from the jsps -->
    70     <target name="jar1" depends="compile, jarUpToDate" unless="jar.uptodate" >
     70    <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    7171        <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
    7272            <arg value="list" />
     
    8181            <arg value="," />
    8282        </exec>
     83    </target>
     84
     85    <target name="jar1" depends="compile, jarUpToDate, listChangedFiles" unless="jar.uptodate" >
     86        <!-- set if unset -->
     87        <property name="workspace.changes.j.tr" value="" />
    8388        <jar destfile="./build/routerconsole.jar" basedir="./build/obj" includes="**/*.class">
    8489            <manifest>
     
    116121            <srcfiles dir= "build/obj" includes="**/*.class" />
    117122        </uptodate>
     123        <condition property="shouldListChanges" >
     124            <and>
     125                <not>
     126                    <isset property="jar.uptodate" />
     127                </not>
     128                <isset property="mtn.available" />
     129            </and>
     130        </condition>
    118131    </target>
    119132
     
    135148    </target>
    136149
    137     <!-- does NOT update the message classes, as those go in the jar -->
    138     <target name="war" depends="precompilejsp, warUpToDate" unless="war.uptodate" >
     150    <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
    139151        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
    140152            <arg value="list" />
     
    148160            <arg value="," />
    149161        </exec>
     162    </target>
     163
     164    <!-- does NOT update the message classes, as those go in the jar -->
     165    <target name="war" depends="precompilejsp, warUpToDate, listChangedFiles2" unless="war.uptodate" >
     166        <!-- set if unset -->
     167        <property name="workspace.changes.w.tr" value="" />
    150168        <!-- Don't include the css in the war, the main build.xml will copy it to docs/themes/console/ -->
    151169        <war destfile="build/routerconsole.war" webxml="../jsp/web-out.xml"
     
    163181            <srcfiles dir= "../jsp" excludes="web.xml, web-fragment.xml, *.css, **/*.java, *.jsp, *.jsi" />
    164182        </uptodate>
     183        <condition property="shouldListChanges" >
     184            <and>
     185                <not>
     186                    <isset property="jar.uptodate" />
     187                </not>
     188                <isset property="mtn.available" />
     189            </and>
     190        </condition>
    165191    </target>
    166192
     
    212238                <pathelement location="../../systray/java/lib/systray4j.jar" />
    213239                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    214                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
     240                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    215241                <pathelement location="build/routerconsole.jar" />
    216242                <pathelement location="build/" />
     
    244270                <pathelement location="../../systray/java/lib/systray4j.jar" />
    245271                <pathelement location="../../desktopgui/dist/desktopgui.jar" />
    246                 <pathelement location="../../../installer/lib/wrapper/win32/wrapper.jar" />
     272                <pathelement location="../../../installer/lib/wrapper/all/wrapper.jar" />
    247273                <pathelement location="build/routerconsole.jar" />
    248274                <pathelement location="build" />
Note: See TracChangeset for help on using the changeset viewer.