Merge

Mon, 27 Jul 2009 23:03:37 -0700

author
tbell
date
Mon, 27 Jul 2009 23:03:37 -0700
changeset 101
ad500347ebc8
parent 97
d5e36cb83d8c
parent 100
2a160e4e0d06
child 102
5182bcc9c60c

Merge

     1.1 --- a/make/Makefile	Fri Jul 24 13:39:48 2009 -0700
     1.2 +++ b/make/Makefile	Mon Jul 27 23:03:37 2009 -0700
     1.3 @@ -110,7 +110,7 @@
     1.4  ifdef TARGET_CLASS_VERSION
     1.5      TARGET_LEVEL = $(TARGET_CLASS_VERSION)
     1.6  else
     1.7 -    TARGET_LEVEL = 6
     1.8 +    TARGET_LEVEL = 7
     1.9  endif
    1.10  
    1.11  ifndef TARGET_JAVA
     2.1 --- a/make/common/shared/Defs-java.gmk	Fri Jul 24 13:39:48 2009 -0700
     2.2 +++ b/make/common/shared/Defs-java.gmk	Mon Jul 27 23:03:37 2009 -0700
     2.3 @@ -107,12 +107,12 @@
     2.4  NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true
     2.5  JAVACFLAGS  += $(NO_PROPRIETARY_API_WARNINGS)
     2.6  
     2.7 -# Add the source level (currently all source is 1.5, should this be 1.6?)
     2.8 -LANGUAGE_VERSION = -source 1.5
     2.9 +# Add the source level
    2.10 +LANGUAGE_VERSION = -source 7
    2.11  JAVACFLAGS  += $(LANGUAGE_VERSION)
    2.12  
    2.13 -# Add the class version we want (currently this is 5, should it be 6 or even 7?)
    2.14 -TARGET_CLASS_VERSION = 5
    2.15 +# Add the class version we want
    2.16 +TARGET_CLASS_VERSION = 7
    2.17  CLASS_VERSION = -target $(TARGET_CLASS_VERSION)
    2.18  JAVACFLAGS  += $(CLASS_VERSION)
    2.19  JAVACFLAGS  += -encoding ascii

mercurial