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

Build: Move remaining jars to Java 6, as we will require

Browse Source 
API 9 in the next Android release.
This commit is contained in:
zzz
2014-06-27 13:57:43 +00:00
parent 58512b8230
commit 616866cc9e
6 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,6 +25,7 @@
<isfalse value="${require.gettext}" /> <isfalse value="${require.gettext}" />
</condition> </condition>
<!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" /> <property name="javac.compilerargs" value="" />
<property name="javac.version" value="1.6" /> <property name="javac.version" value="1.6" />
<property name="require.gettext" value="true" /> <property name="require.gettext" value="true" />
@ -34,7 +35,7 @@
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac <javac
srcdir="./src" srcdir="./src"
debug="true" deprecation="on" source="1.5" target="1.5" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
destdir="./build/obj" destdir="./build/obj"
includeAntRuntime="false" includeAntRuntime="false"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" > classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
@ -281,7 +282,7 @@
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<!-- We need the ant runtime, as it includes junit --> <!-- We need the ant runtime, as it includes junit -->
<javac srcdir="./src:./test/junit" debug="true" source="1.5" target="1.5" <javac srcdir="./src:./test/junit" debug="true" source="${javac.version}" target="${javac.version}"
includeAntRuntime="true" includeAntRuntime="true"
deprecation="on" destdir="./build/obj" > deprecation="on" destdir="./build/obj" >
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />

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

@ -20,7 +20,9 @@
</depend> </depend>
</target> </target>
<!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" /> <property name="javac.compilerargs" value="" />
<property name="javac.version" value="1.6" />
<property name="require.gettext" value="true" /> <property name="require.gettext" value="true" />
<condition property="no.bundle"> <condition property="no.bundle">
@ -31,7 +33,7 @@
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<!-- half of this is deprecated classes so turn deprecation off --> <!-- half of this is deprecated classes so turn deprecation off -->
<javac srcdir="./src" debug="true" deprecation="off" source="1.5" target="1.5" <javac srcdir="./src" debug="true" deprecation="off" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" > destdir="./build/obj" classpath="../../../core/java/build/i2p.jar" >
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
@ -43,7 +45,7 @@
<mkdir dir="./buildTest/obj" /> <mkdir dir="./buildTest/obj" />
<javac <javac
srcdir="./test/junit" srcdir="./test/junit"
debug="true" deprecation="on" source="1.5" target="1.5" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./buildTest/obj" destdir="./buildTest/obj"
classpath="../../../core/java/build/i2p.jar:./build/mstreaming.jar" > classpath="../../../core/java/build/i2p.jar:./build/mstreaming.jar" >

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

@ -20,13 +20,17 @@
</classpath> </classpath>
</depend> </depend>
</target> </target>
<!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" /> <property name="javac.compilerargs" value="" />
<property name="javac.version" value="1.6" />
<target name="compile" depends="depend"> <target name="compile" depends="depend">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac <javac
srcdir="./src" srcdir="./src"
debug="true" deprecation="on" source="1.5" target="1.5" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" > classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
@ -51,7 +55,7 @@
<javac <javac
srcdir="./test/junit" srcdir="./test/junit"
debug="true" deprecation="on" source="1.5" target="1.5" debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" > destdir="./build/obj" >
<classpath> <classpath>

7
core/java/build.xml
View File

@ -15,13 +15,16 @@
destdir="./build/obj" > destdir="./build/obj" >
</depend> </depend>
</target> </target>
<!-- only used if not set by a higher build.xml --> <!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" /> <property name="javac.compilerargs" value="" />
<property name="javac.classpath" value="" /> <property name="javac.classpath" value="" />
<property name="javac.version" value="1.6" />
<target name="compile" depends="depend"> <target name="compile" depends="depend">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source" debuglevel="lines,vars,source"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" classpath="${javac.classpath}" > destdir="./build/obj" classpath="${javac.classpath}" >
@ -103,7 +106,7 @@
<!-- set hamcrest and junit homes to the old default unless overridden elsewhere --> <!-- set hamcrest and junit homes to the old default unless overridden elsewhere -->
<property name="hamcrest.home" value="${ant.home}/lib/" /> <property name="hamcrest.home" value="${ant.home}/lib/" />
<property name="junit.home" value="${ant.home}/lib/" /> <property name="junit.home" value="${ant.home}/lib/" />
<javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on" <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source" debuglevel="lines,vars,source"
includeAntRuntime="true" includeAntRuntime="true"
destdir="./build/obj" > destdir="./build/obj" >

5
installer/java/build.xml
View File

@ -15,13 +15,16 @@
destdir="./build/obj" > destdir="./build/obj" >
</depend> </depend>
</target> </target>
<!-- only used if not set by a higher build.xml --> <!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" /> <property name="javac.compilerargs" value="" />
<property name="javac.classpath" value="" /> <property name="javac.classpath" value="" />
<property name="javac.version" value="1.6" />
<target name="compile" depends="depend"> <target name="compile" depends="depend">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" classpath="${javac.classpath}:../../core/java/build/obj" > destdir="./build/obj" classpath="${javac.classpath}:../../core/java/build/obj" >
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />

7
router/java/build.xml
View File

@ -27,12 +27,15 @@
<targetfilelist dir="." files="build/obj/net/i2p/router/StatisticsManager.class" /> <targetfilelist dir="." files="build/obj/net/i2p/router/StatisticsManager.class" />
</dependset> </dependset>
</target> </target>
<!-- only used if not set by a higher build.xml --> <!-- only used if not set by a higher build.xml -->
<property name="javac.compilerargs" value="" /> <property name="javac.compilerargs" value="" />
<property name="javac.version" value="1.6" />
<target name="compile" depends="depend, dependVersion"> <target name="compile" depends="depend, dependVersion">
<mkdir dir="./build" /> <mkdir dir="./build" />
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac srcdir="./src" debug="true" source="1.5" target="1.5" deprecation="on" <javac srcdir="./src" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source" debuglevel="lines,vars,source"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" > destdir="./build/obj" classpath="../../core/java/build/obj:../../core/java/build/i2p.jar" >
@ -127,7 +130,7 @@
<!-- set hamcrest and junit homes to the old default unless overridden elsewhere --> <!-- set hamcrest and junit homes to the old default unless overridden elsewhere -->
<property name="hamcrest.home" value="${ant.home}/lib/" /> <property name="hamcrest.home" value="${ant.home}/lib/" />
<property name="junit.home" value="${ant.home}/lib/" /> <property name="junit.home" value="${ant.home}/lib/" />
<javac srcdir="./test/junit" debug="true" source="1.5" target="1.5" deprecation="on" <javac srcdir="./test/junit" debug="true" source="${javac.version}" target="${javac.version}" deprecation="on"
debuglevel="lines,vars,source" debuglevel="lines,vars,source"
includeAntRuntime="true" includeAntRuntime="true"
destdir="./build/obj"> destdir="./build/obj">