6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair
This commit is contained in:
parent
7290b272ce
commit
3cba2870f9
@ -77,7 +77,15 @@ else
|
||||
ifdef JAVAC_TARGET_ARG
|
||||
ANT_OPTIONS += -Djavac.target=$(JAVAC_TARGET_ARG)
|
||||
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
|
||||
ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
|
||||
|
@ -30,6 +30,7 @@
|
||||
# one of the standard user build.properties files (see build.xml)
|
||||
|
||||
# options for the <javac> tasks used to compile the tools
|
||||
javac.source = 5
|
||||
javac.target = 5
|
||||
javac.debug = true
|
||||
javac.debuglevel = source,lines
|
||||
|
@ -85,6 +85,7 @@
|
||||
destdir="${build.classes.dir}"
|
||||
memoryInitialSize="${javac.memoryInitialSize}"
|
||||
memoryMaximumSize="${javac.memoryMaximumSize}"
|
||||
source="${javac.source}"
|
||||
target="${javac.target}">
|
||||
<compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>
|
||||
<compilerarg line="${javac.version.opt}"/>
|
||||
|
Loading…
Reference in New Issue
Block a user