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

    rcbaa62d r2c0e6a3  
    3030            <classpath>
    3131                <pathelement location="../../core/java/build/i2p.jar" />
    32                 <!-- doesn't matter if we're not on win32, we just need the java classes, not the platform-dependent code -->
    33                 <pathelement location="../../installer/lib/wrapper/win32/wrapper.jar" />
     32                <pathelement location="../../installer/lib/wrapper/all/wrapper.jar" />
    3433                <pathelement location="../../router/java/build/router.jar" />
    3534            </classpath>
     
    4039        </target>
    4140
    42         <target name="jar" depends="compile">
     41        <target name="bundle" >
    4342        <exec executable="sh" osfamily="unix" failifexecutionfails="true" >
    4443            <arg value="./bundle-messages.sh" />
     
    5150            <arg value="./bundle-messages.sh" />
    5251        </exec>
     52        </target>
     53
     54        <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
    5355        <exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
    5456            <arg value="list" />
     
    6264            <arg value="," />
    6365        </exec>
     66        </target>
     67
     68        <target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
     69                <!-- set if unset -->
     70                <property name="workspace.changes.tr" value="" />
    6471                <jar basedir="${build}" destfile="${dist}/${jar}">
    6572                        <manifest>
     
    7178                </jar>
    7279        </target>
     80
     81    <target name="jarUpToDate">
     82        <uptodate property="jar.uptodate" targetfile="${dist}/${jar}" >
     83            <srcfiles dir= "." includes="build/**/*.class" />
     84        </uptodate>
     85        <condition property="shouldListChanges" >
     86            <and>
     87                <not>
     88                    <isset property="jar.uptodate" />
     89                </not>
     90                <isset property="mtn.available" />
     91            </and>
     92        </condition>
     93    </target>
    7394
    7495    <target name="javadoc">
Note: See TracChangeset for help on using the changeset viewer.