Merge
This commit is contained in:
commit
c39be4cb0e
@ -83,6 +83,14 @@ else
|
|||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef SOURCE_LANGUAGE_VERSION
|
||||||
|
ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
|
||||||
|
else
|
||||||
|
ifdef JAVAC_SOURCE_ARG
|
||||||
|
ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
ifdef ALT_BOOTDIR
|
ifdef ALT_BOOTDIR
|
||||||
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
|
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
|
||||||
endif
|
endif
|
||||||
|
@ -30,6 +30,7 @@
|
|||||||
# one of the standard user build.properties files (see build.xml)
|
# one of the standard user build.properties files (see build.xml)
|
||||||
|
|
||||||
# options for the <javac> tasks used to compile the tools
|
# options for the <javac> tasks used to compile the tools
|
||||||
|
javac.source = 5
|
||||||
javac.target = 5
|
javac.target = 5
|
||||||
javac.debug = true
|
javac.debug = true
|
||||||
javac.no.jdk.warnings = -XDignore.symbol.file=true
|
javac.no.jdk.warnings = -XDignore.symbol.file=true
|
||||||
|
@ -85,6 +85,7 @@
|
|||||||
destdir="${build.classes.dir}"
|
destdir="${build.classes.dir}"
|
||||||
memoryInitialSize="${javac.memoryInitialSize}"
|
memoryInitialSize="${javac.memoryInitialSize}"
|
||||||
memoryMaximumSize="${javac.memoryMaximumSize}"
|
memoryMaximumSize="${javac.memoryMaximumSize}"
|
||||||
|
source="${javac.source}"
|
||||||
debug="${javac.debug}"
|
debug="${javac.debug}"
|
||||||
target="${javac.target}">
|
target="${javac.target}">
|
||||||
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
|
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user