equal
deleted
inserted
replaced
105 endif |
105 endif |
106 |
106 |
107 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true |
107 NO_PROPRIETARY_API_WARNINGS = -XDignore.symbol.file=true |
108 JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) |
108 JAVACFLAGS += $(NO_PROPRIETARY_API_WARNINGS) |
109 |
109 |
110 # Add the source level (currently all source is 1.5, should this be 1.6?) |
110 # Add the source level |
111 LANGUAGE_VERSION = -source 1.5 |
111 LANGUAGE_VERSION = -source 7 |
112 JAVACFLAGS += $(LANGUAGE_VERSION) |
112 JAVACFLAGS += $(LANGUAGE_VERSION) |
113 |
113 |
114 # Add the class version we want (currently this is 5, should it be 6 or even 7?) |
114 # Add the class version we want |
115 TARGET_CLASS_VERSION = 5 |
115 TARGET_CLASS_VERSION = 7 |
116 CLASS_VERSION = -target $(TARGET_CLASS_VERSION) |
116 CLASS_VERSION = -target $(TARGET_CLASS_VERSION) |
117 JAVACFLAGS += $(CLASS_VERSION) |
117 JAVACFLAGS += $(CLASS_VERSION) |
118 JAVACFLAGS += -encoding ascii |
118 JAVACFLAGS += -encoding ascii |
119 JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar |
119 JAVACFLAGS += -classpath $(BOOTDIR)/lib/tools.jar |
120 JAVACFLAGS += $(OTHER_JAVACFLAGS) |
120 JAVACFLAGS += $(OTHER_JAVACFLAGS) |