Bug 315917 - Make sure javac compiles JVM 1.4 compatible class files. r=bsmedberg

config/config.mk

@@ -898,3 +898,14 @@ DEFINES += -DBUILD_ID=$(BUILD_ID)
 ifeq (,$(filter WINCE WINNT OS2,$(OS_ARCH)))
 RUN_TEST_PROGRAM = $(DIST)/bin/run-mozilla.sh
 endif
+
+#
+# Java macros
+#
+
+# Make sure any compiled classes work with at least JVM 1.4
+JAVAC_FLAGS += -source 1.4
+
+ifdef MOZ_DEBUG
+JAVAC_FLAGS += -g
+endif

extensions/java/xpcom/interfaces/Makefile.in

@@ -68,10 +68,6 @@ GARBAGE_DIRS += _javagen org
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_DEBUG
-JAVAC_FLAGS = -g
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 RUN =
 OUTPUT_DIR = $(shell cygpath -w $(CURDIR)/_javagen/org/mozilla/xpcom)

extensions/java/xpcom/src/Makefile.in

@@ -97,10 +97,6 @@ GARBAGE_DIRS += _javagen org
 
 include $(topsrcdir)/config/rules.mk
 
-ifdef MOZ_DEBUG
-JAVAC_FLAGS = -g
-endif
-
 ifeq ($(OS_ARCH),WINNT)
 RUN =
 SEP = ;

extensions/java/xpcom/tests/Makefile.in

@@ -78,8 +78,8 @@ include $(topsrcdir)/config/rules.mk
 
 %.class: %.java Makefile Makefile.in
 	$(REPORT_BUILD)
-	$(ELOG) $(CYGWIN_WRAPPER) $(JAVAC) -classpath $(_JAVA_CLASSPATH) -d . \
+	$(ELOG) $(CYGWIN_WRAPPER) $(JAVAC) $(JAVAC_FLAGS) \
-			$(_VPATH_SRCS)
+			-classpath $(_JAVA_CLASSPATH) -d . $(_VPATH_SRCS)
 
 # make sure to rebuild Java interfaces if our XPIDLSRCS change
 $(REBUILD_JAR): $(XPIDLSRCS)