Changeset 35a0be6d


Ignore:
Timestamp:
Mar 1, 2011 7:32:42 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
28bd180
Parents:
7b29481
Message:

cleanup/fix console build dependencies

File:
1 edited

Legend:

Unmodified
Added
Removed
  • apps/routerconsole/java/build.xml

    r7b29481 r35a0be6d  
    6464    </target>
    6565
    66     <target name="jar" depends="compile, jarUpToDate" unless="jar.uptodate" >
     66    <!-- the jar with the latest message classes from the jsps, and the war too -->
     67    <target name="jar" depends="jar1, war, bundle" />
     68
     69    <!-- the jar without the latest message classes from the jsps -->
     70    <target name="jar1" depends="compile, jarUpToDate" unless="jar.uptodate" >
    6771        <exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
    6872            <arg value="list" />
    6973            <arg value="changed" />
    7074            <arg value="." />
     75            <arg value="../locale" />
    7176        </exec>
    7277        <!-- \n in an attribute value generates an invalid manifest -->
     
    8691            </manifest>
    8792        </jar>
     93       <!-- jrobin taken out of routerconsole.jar in 0.7.12
    8894        <delete dir="./tmpextract" />
    89        <!-- jrobin taken out of routerconsole.jar in 0.7.12
    9095        <unjar src="../../jrobin/jrobin-1.4.0.jar" dest="./tmpextract" />
    9196        <jar destfile="./build/routerconsole.jar" basedir="./tmpextract" update="true" />
    9297        <delete dir="./tmpextract" />
    9398       -->
    94        
    95         <ant target="war" />
    96 
     99    </target>
     100
     101    <!-- this is tricky because the message classes go in the jar, not in the war -->
     102    <target name="bundle" depends="jar1, precompilejsp" >
    97103        <!-- Update the messages_*.po files.
    98104             We need to supply the bat file for windows, and then change the fail property to true -->
     
    118124    </target>
    119125
    120     <target name="poupdate" depends="build">
    121         <ant target="war" />
     126    <target name="poupdate" depends="precompilejsp">
    122127        <!-- Update the messages_*.po files.
    123128             We need to supply the bat file for windows, and then change the fail property to true -->
     
    136141    </target>
    137142
     143    <!-- does NOT update the message classes, as those go in the jar -->
    138144    <target name="war" depends="precompilejsp, warUpToDate" unless="war.uptodate" >
    139145        <exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
     
    165171    </target>
    166172
    167     <target name="precompilejsp" unless="precompilejsp.uptodate">
     173    <target name="precompilejsp" depends="jar1" unless="precompilejsp.uptodate">
    168174        <delete dir="../jsp/WEB-INF/" />
    169175        <delete file="../jsp/web-fragment.xml" />
     
    266272
    267273    <uptodate property="precompilejsp.uptodate" targetfile="../jsp/web-out.xml">
    268         <srcfiles dir= "../jsp" includes="**/*.jsp, **/*.html, *.css, susimail/susimail, web.xml"/>
     274        <srcfiles dir= "../jsp" includes="**/*.jsp, *.jsi, **/*.html, *.css, susimail/susimail, web.xml"/>
    269275    </uptodate>
    270276
Note: See TracChangeset for help on using the changeset viewer.