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

Require Java 7 for SAM

Browse Source 
separate option javac.compilerargs7 for Java 7
This commit is contained in:
zzz
2015-11-19 17:48:56 +00:00
parent 8b14afd605
commit c7d68c2a6c
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,9 @@
</depend>
</target>
<property name="javac.compilerargs" value="" />
<!-- ignored for now, we require java 7 here -->
<property name="javac.compilerargs7" value="" />
<!-- ignored for now, we require java 7 here -->
<property name="javac.version" value="1.6" />
<!-- compile everything including client classes -->
@@ -30,22 +32,22 @@
<mkdir dir="./build/obj" />
<javac
srcdir="./src"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
debug="true" deprecation="on" source="1.7" target="1.7"
includeAntRuntime="false"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
<compilerarg line="${javac.compilerargs7}" />
</javac>
</target>
<target name="compileTest" depends="compile">
<javac
srcdir="./test"
debug="true" deprecation="on" source="${javac.version}" target="${javac.version}"
debug="true" deprecation="on" source="1.7" target="1.7"
includeAntRuntime="false"
destdir="./build/obj"
classpath="../../../core/java/build/i2p.jar:../../ministreaming/java/build/mstreaming.jar" >
<compilerarg line="${javac.compilerargs}" />
<compilerarg line="${javac.compilerargs7}" />
</javac>
</target>

3
build.properties
View File

@@ -43,8 +43,11 @@ javac.version=1.6
#javac.classpath=/PATH/TO/pack200.jar
# Optional compiler args
# This one is for subsystems requiring Java 6
# This one keeps gcj a lot quieter
#javac.compilerargs=-warn:-unchecked,raw,unused,serial
# This one is for subsystems requiring Java 7
#javac.compilerargs7=
#
# Note to packagers, embedders, distributors: