lbt/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build: Fix list of changed files in manifests

Browse Source 
Broken in move from mtn to git
Fix some places that were broken even with mtn
This commit is contained in:
zzz
2023-01-22 10:08:53 -05:00
parent 37104e30bf
commit be5a10194a
20 changed files with 301 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/addressbook/build.xml
View File

@ -84,28 +84,36 @@
</jar> </jar>
</target> </target>
<!-- actually the jar -->
<target name="warUpToDate"> <target name="warUpToDate">
<uptodate property="war.uptodate" targetfile="${dist}/${war}"> <uptodate property="war.uptodate" targetfile="${dist}/${jar}">
<srcfiles dir= "." includes="${build}/**/*.class, web.xml"/> <srcfiles dir= "." includes="${build}/**/*.class"/>
</uptodate> </uptodate>
<condition property="shouldListChanges" > <condition property="shouldListChanges" >
<and> <and>
<not> <not>
<isset property="war.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>
<target name="changes" depends="warUpToDate" if="shouldListChanges" > <target name="changes" depends="warUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="." /> <arg value="--porcelain" />
</exec> <arg value="-uno" />
<arg value="." />
</exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />

31
apps/desktopgui/build.xml
View File

@ -64,17 +64,24 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="." /> <arg value="--porcelain" />
</exec> <arg value="-uno" />
<!-- \n in an attribute value generates an invalid manifest --> <arg value="." />
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > </exec>
<arg value="-s" /> <!-- trim flags -->
<arg value="[:space:]" /> <exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="," /> <arg value="-e" />
</exec> <arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" />
<arg value="[:space:]" />
<arg value="," />
</exec>
</target> </target>
<target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" > <target name="jar" depends="compile, bundle, listChangedFiles" unless="jar.uptodate" >
@ -108,7 +115,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

28
apps/i2pcontrol/build.xml
View File

@ -92,7 +92,29 @@
</javac> </javac>
</target> </target>
<target name="jar" depends="compile"> <target name="listChangedFiles" if="git.available" >
<exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="status" />
<arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." />
<arg value="../resources" />
</exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" />
<arg value="[:space:]" />
<arg value="," />
</exec>
</target>
<target name="jar" depends="compile, listChangedFiles">
<!-- set if unset --> <!-- set if unset -->
<property name="workspace.changes.tr" value="" /> <property name="workspace.changes.tr" value="" />
<jar destfile="build/i2pcontrol.jar" basedir="./build/obj" includes="**/*.class" > <jar destfile="build/i2pcontrol.jar" basedir="./build/obj" includes="**/*.class" >
@ -108,7 +130,7 @@
</jar> </jar>
</target> </target>
<target name="socketJar" depends="compileSocketJar"> <target name="socketJar" depends="compileSocketJar, listChangedFiles">
<!-- set if unset --> <!-- set if unset -->
<property name="workspace.changes.tr" value="" /> <property name="workspace.changes.tr" value="" />
<jar destfile="build/i2pcontrol.jar" basedir="./build/obj" includes="**/*.class" > <jar destfile="build/i2pcontrol.jar" basedir="./build/obj" includes="**/*.class" >
@ -124,7 +146,7 @@
</jar> </jar>
</target> </target>
<target name="war" depends="compile" > <target name="war" depends="compile, listChangedFiles" >
<!-- set if unset --> <!-- set if unset -->
<property name="workspace.changes.tr" value="" /> <property name="workspace.changes.tr" value="" />
<war destfile="build/jsonrpc.war" webxml="web.xml" > <war destfile="build/jsonrpc.war" webxml="web.xml" >

17
apps/i2psnark/java/build.xml
View File

@ -68,13 +68,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value=".." /> <arg value=".." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -111,7 +118,7 @@
<not> <not>
<isset property="war.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

37
apps/i2ptunnel/java/build.xml
View File

@ -68,13 +68,21 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
<arg value="../resources" />
</exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes.j}" outputproperty="workspace.changes.j.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec> </exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.j}" outputproperty="workspace.changes.j.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.j.sed}" outputproperty="workspace.changes.j.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -129,7 +137,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>
@ -162,7 +170,7 @@
<not> <not>
<isset property="uiJar.uptodate" /> <isset property="uiJar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>
@ -271,13 +279,20 @@
</target> </target>
<target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" > <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
<exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="../jsp" /> <arg value="../jsp" />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes.w}" outputproperty="workspace.changes.w.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.w}" outputproperty="workspace.changes.w.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.w.sed}" outputproperty="workspace.changes.w.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -318,7 +333,7 @@
<not> <not>
<isset property="war.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/imagegen/identicon/build.xml
View File

@ -53,13 +53,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -91,7 +98,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

19
apps/imagegen/imagegen/build.xml
View File

@ -46,20 +46,27 @@
</target> </target>
<target name="listChangedFiles" if="shouldListChanges" > <target name="listChangedFiles" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
</exec> </exec>
</target> </target>
<target name="war" depends="compile, warUpToDate" unless="war.uptodate" > <target name="war" depends="compile, warUpToDate, listChangedFiles" unless="war.uptodate" >
<!-- set if unset --> <!-- set if unset -->
<property name="workspace.changes.tr" value="" /> <property name="workspace.changes.tr" value="" />
<!-- put the identicon and zxing classes in the war --> <!-- put the identicon and zxing classes in the war -->
@ -93,7 +100,7 @@
<not> <not>
<isset property="war.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/imagegen/zxing/build.xml
View File

@ -60,13 +60,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -98,7 +105,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/jetty/build.xml
View File

@ -424,13 +424,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -469,7 +476,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/jrobin/java/build.xml
View File

@ -41,13 +41,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -79,7 +86,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/ministreaming/java/build.xml
View File

@ -64,13 +64,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -108,7 +115,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

41
apps/routerconsole/java/build.xml
View File

@ -117,14 +117,21 @@
<!-- the jar without the latest message classes from the jsps --> <!-- the jar without the latest message classes from the jsps -->
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes.j" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
<arg value="../locale" /> <arg value="../locale" />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes.j}" outputproperty="workspace.changes.j.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.j}" outputproperty="workspace.changes.j.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.j.sed}" outputproperty="workspace.changes.j.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -211,7 +218,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>
@ -332,13 +339,23 @@
</target> </target>
<target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" > <target name="listChangedFiles2" depends="warUpToDate" if="shouldListChanges2" >
<exec executable="mtn" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes.w" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="../jsp" /> <arg value="../jsp" />
<arg value="../resources" />
<arg value="src/net/i2p/router/web/helpers" />
<arg value="src/net/i2p/router/web/servlets" />
</exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes.w}" outputproperty="workspace.changes.w.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec> </exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes.w}" outputproperty="workspace.changes.w.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.w.sed}" outputproperty="workspace.changes.w.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -376,12 +393,12 @@
<srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class net/i2p/router/web/servlets/*.class" /> <srcfiles dir= "build/obj" includes="net/i2p/router/web/helpers/*.class net/i2p/router/web/servlets/*.class" />
<srcfiles dir= "../resources" /> <srcfiles dir= "../resources" />
</uptodate> </uptodate>
<condition property="shouldListChanges" > <condition property="shouldListChanges2" >
<and> <and>
<not> <not>
<isset property="jar.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/sam/java/build.xml
View File

@ -58,13 +58,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -115,7 +122,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/streaming/java/build.xml
View File

@ -191,13 +191,20 @@
<!-- end unit tests --> <!-- end unit tests -->
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -234,7 +241,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

21
apps/susidns/src/build.xml
View File

@ -150,20 +150,27 @@
<target name="all" depends="war"/> <target name="all" depends="war"/>
<target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
</exec> </exec>
</target> </target>
<target name="war" depends="compile, precompilejsp, bundle, warUpToDate" unless="war.uptodate" > <target name="war" depends="compile, precompilejsp, bundle, warUpToDate, listChangedFiles" unless="war.uptodate" >
<!-- set if unset --> <!-- set if unset -->
<property name="workspace.changes.tr" value="" /> <property name="workspace.changes.tr" value="" />
<war destfile="${project}.war" webxml="WEB-INF/web-out.xml"> <war destfile="${project}.war" webxml="WEB-INF/web-out.xml">
@ -187,14 +194,14 @@
<target name="warUpToDate"> <target name="warUpToDate">
<uptodate property="war.uptodate" targetfile="${project}.war"> <uptodate property="war.uptodate" targetfile="${project}.war">
<srcfiles dir= "." includes="WEB-INF/web-out.xml WEB-INF/**/*.class js/* svg/*" /> <srcfiles dir= "." includes="WEB-INF/web-out.xml WEB-INF/**/*.class js/* svg/* themes/**/*" />
</uptodate> </uptodate>
<condition property="shouldListChanges" > <condition property="shouldListChanges" >
<and> <and>
<not> <not>
<isset property="war.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/susimail/build.xml
View File

@ -78,13 +78,20 @@
</target> </target>
<target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="warUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -118,7 +125,7 @@
<not> <not>
<isset property="war.uptodate" /> <isset property="war.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

17
apps/systray/java/build.xml
View File

@ -46,13 +46,20 @@
</target> </target>
<target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" > <target name="listChangedFiles" depends="jarUpToDate" if="shouldListChanges" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />
@ -85,7 +92,7 @@
<not> <not>
<isset property="jar.uptodate" /> <isset property="jar.uptodate" />
</not> </not>
<isset property="mtn.available" /> <isset property="git.available" />
</and> </and>
</condition> </condition>
</target> </target>

18
core/java/build.xml
View File

@ -81,14 +81,22 @@
</javac> </javac>
</target> </target>
<target name="listChangedFiles" if="mtn.available" > <target name="listChangedFiles" if="git.available" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
<arg value="../resources" />
</exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec> </exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />

17
installer/java/build.xml
View File

@ -34,14 +34,21 @@
</javac> </javac>
</target> </target>
<target name="listChangedFiles" if="mtn.available" > <target name="listChangedFiles" if="git.available" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
</exec> </exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />

18
router/java/build.xml
View File

@ -53,14 +53,22 @@
</javac> </javac>
</target> </target>
<target name="listChangedFiles" if="mtn.available" > <target name="listChangedFiles" if="git.available" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="git" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" /> <arg value="status" />
<arg value="changed" /> <arg value="-s" />
<arg value="--porcelain" />
<arg value="-uno" />
<arg value="." /> <arg value="." />
<arg value="../resources" />
</exec>
<!-- trim flags -->
<exec executable="sed" inputstring="${workspace.changes}" outputproperty="workspace.changes.sed" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-e" />
<arg value="s/^[MTADRCU ]*//" />
</exec> </exec>
<!-- \n in an attribute value generates an invalid manifest --> <!-- \n in an attribute value generates an invalid manifest -->
<exec executable="tr" inputstring="${workspace.changes}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" > <exec executable="tr" inputstring="${workspace.changes.sed}" outputproperty="workspace.changes.tr" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="-s" /> <arg value="-s" />
<arg value="[:space:]" /> <arg value="[:space:]" />
<arg value="," /> <arg value="," />