6827026: Change javac source and target default to 7

Wed, 20 May 2009 13:50:44 -0700

author
jjg
date
Wed, 20 May 2009 13:50:44 -0700
changeset 63
605e1cdeba48
parent 53
4fa7398559d0
child 64
2ec98e99e4ea

6827026: Change javac source and target default to 7
Reviewed-by: darcy, ohair

make/Makefile file | annotate | diff | comparison | revisions
make/build.properties file | annotate | diff | comparison | revisions
make/build.xml file | annotate | diff | comparison | revisions
     1.1 --- a/make/Makefile	Thu May 14 10:58:02 2009 -0700
     1.2 +++ b/make/Makefile	Wed May 20 13:50:44 2009 -0700
     1.3 @@ -79,6 +79,14 @@
     1.4    endif
     1.5  endif
     1.6  
     1.7 +ifdef SOURCE_LANGUAGE_VERSION
     1.8 +  ANT_OPTIONS += -Djavac.source=$(SOURCE_LANGUAGE_VERSION)
     1.9 +else
    1.10 +  ifdef JAVAC_SOURCE_ARG 
    1.11 +    ANT_OPTIONS += -Djavac.source=$(JAVAC_SOURCE_ARG)
    1.12 +  endif
    1.13 +endif 
    1.14 +
    1.15  ifdef ALT_BOOTDIR
    1.16    ANT_JAVA_HOME = JAVA_HOME=$(ALT_BOOTDIR)
    1.17  endif
     2.1 --- a/make/build.properties	Thu May 14 10:58:02 2009 -0700
     2.2 +++ b/make/build.properties	Wed May 20 13:50:44 2009 -0700
     2.3 @@ -30,6 +30,7 @@
     2.4  # one of the standard user build.properties files (see build.xml)
     2.5  
     2.6  # options for the <javac> tasks used to compile the tools
     2.7 +javac.source = 5
     2.8  javac.target = 5
     2.9  javac.debug = true
    2.10  javac.debuglevel = source,lines
     3.1 --- a/make/build.xml	Thu May 14 10:58:02 2009 -0700
     3.2 +++ b/make/build.xml	Wed May 20 13:50:44 2009 -0700
     3.3 @@ -107,6 +107,7 @@
     3.4               destdir="${build.classes.dir}"
     3.5               memoryInitialSize="${javac.memoryInitialSize}"
     3.6               memoryMaximumSize="${javac.memoryMaximumSize}"
     3.7 +             source="${javac.source}"
     3.8               target="${javac.target}"
     3.9               excludes="com/sun/tools/internal/txw2/**">
    3.10           <compilerarg value="-J-Xbootclasspath/p:${bootstrap.dir}/lib/javac.jar"/>

mercurial