I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit fe391ff2 authored by zzz's avatar zzz
Browse files

Convert all jars and wars to compile to 1.6 target,

except for the following which are used by android,
to maintain compatibility with very old phones, for now:

	addressbook.war
	BOB.jar
	i2p.jar
	i2ptunnel.jar
	mstreaming.jar
	router.jar
	streaming.jar
parent 001b1272
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</target> </target>
<target name="compile" depends="init, depend"> <target name="compile" depends="init, depend">
<javac debug="true" deprecation="on" source="1.5" target="1.5" <javac debug="true" deprecation="on" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
srcdir="${src}" destdir="${build}"> srcdir="${src}" destdir="${build}">
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</target> </target>
<target name="compile" depends="init"> <target name="compile" depends="init">
<javac debug="true" deprecation="on" source="1.5" target="1.5" <javac debug="true" deprecation="on" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
srcdir="${src}" destdir="${build}"> srcdir="${src}" destdir="${build}">
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,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="1.6" target="1.6"
destdir="./build/obj" destdir="./build/obj"
includeAntRuntime="false" includeAntRuntime="false"
classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" > classpath="../../../core/java/build/i2p.jar:../../jetty/jettylib/org.mortbay.jetty.jar:../../jetty/jettylib/javax.servlet.jar:../../jetty/jettylib/jetty-servlet.jar:../../jetty/jettylib/jetty-util.jar:../../ministreaming/java/build/mstreaming.jar" >
......
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
<arg value="-webapp" /> <arg value="-webapp" />
<arg value="../jsp/" /> <arg value="../jsp/" />
</java> </java>
<javac debug="true" deprecation="on" source="1.5" target="1.5" <javac debug="true" deprecation="on" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java"> destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
......
...@@ -227,7 +227,7 @@ ...@@ -227,7 +227,7 @@
<mkdir dir="./build/obj" /> <mkdir dir="./build/obj" />
<javac <javac
srcdir="./java/src" srcdir="./java/src"
debug="true" deprecation="on" source="1.5" target="1.5" debug="true" deprecation="on" source="1.6" target="1.6"
destdir="./build/obj" destdir="./build/obj"
includeAntRuntime="false" includeAntRuntime="false"
classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" > classpath="../../core/java/build/i2p.jar:./jettylib/commons-logging.jar:./jettylib/javax.servlet.jar:./jettylib/org.mortbay.jetty.jar:./jettylib/jetty-http.jar:./jettylib/jetty-io.jar:./jettylib/jetty-security.jar:./jettylib/jetty-util.jar:./jettylib/jetty-xml.jar" >
......
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,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="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj"> destdir="./build/obj">
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
<arg value="../jsp/" /> <arg value="../jsp/" />
</java> </java>
<javac debug="true" deprecation="on" source="1.5" target="1.5" <javac debug="true" deprecation="on" source="1.6" target="1.6"
encoding="UTF-8" encoding="UTF-8"
includeAntRuntime="false" includeAntRuntime="false"
destdir="../jsp/WEB-INF/classes/" destdir="../jsp/WEB-INF/classes/"
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,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="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" > classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" >
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<target name="compileTest" depends="compile"> <target name="compileTest" depends="compile">
<javac <javac
srcdir="./test" srcdir="./test"
debug="true" deprecation="on" source="1.5" target="1.5" debug="true" deprecation="on" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./build/obj" destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" > classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar:../../streaming/java/build/streaming.jar" >
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<target name="compile"> <target name="compile">
<mkdir dir="${bin}" /> <mkdir dir="${bin}" />
<javac debug="true" deprecation="on" source="1.5" target="1.5" <javac debug="true" deprecation="on" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" > classpathref="cp" destdir="${bin}" srcdir="${src}" includes="**/*.java" >
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
<arg value="-webapp" /> <arg value="-webapp" />
<arg value="./jsp" /> <arg value="./jsp" />
</java> </java>
<javac debug="true" deprecation="on" source="1.5" target="1.5" <javac debug="true" deprecation="on" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
destdir="${bin}" srcdir="${tmp}" includes="**/*.java" classpathref="cp"> destdir="${bin}" srcdir="${tmp}" includes="**/*.java" classpathref="cp">
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<mkdir dir="./src/WEB-INF/classes" /> <mkdir dir="./src/WEB-INF/classes" />
<javac <javac
srcdir="./src/src" srcdir="./src/src"
debug="true" deprecation="off" source="1.5" target="1.5" debug="true" deprecation="off" source="1.6" target="1.6"
includeAntRuntime="false" includeAntRuntime="false"
destdir="./src/WEB-INF/classes"> destdir="./src/WEB-INF/classes">
<compilerarg line="${javac.compilerargs}" /> <compilerarg line="${javac.compilerargs}" />
......
...@@ -13,8 +13,8 @@ ...@@ -13,8 +13,8 @@
srcdir="./src" srcdir="./src"
debug="true" debug="true"
deprecation="on" deprecation="on"
source="1.5" source="1.6"
target="1.5" target="1.6"
destdir="./build/obj" destdir="./build/obj"
includeAntRuntime="false" includeAntRuntime="false"
includes="**/*.java" includes="**/*.java"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment