Bug 923306 - Add JAVA_JAR_TARGETS. r=glandium

2013-10-09 17:05:36 -07:00 · 2013-10-09 17:05:36 -07:00 · bfb957cc0c
--- a/config/makefiles/java-build.mk
+++ b/config/makefiles/java-build.mk
@ -90,6 +90,40 @@ endif #} ANDROID_EXTRA_JARS
 include $(topsrcdir)/config/android-common.mk
 endif #} ANDROID_APK_NAME

+
+ifdef JAVA_JAR_TARGETS #{
+# Arg 1: Output target name with .jar suffix, like jars/jarfile.jar.
+#        Intermediate class files are generated in jars/jarfile-classes.
+# Arg 2: Java sources list.  We use VPATH and $^ so sources can be
+#        relative to $(srcdir) or $(CURDIR).
+# Arg 3: List of extra jars to link against.  We do not use VPATH so
+#        jars must be relative to $(CURDIR).
+# Arg 4: Additional JAVAC_FLAGS.
+define java_jar_template
+$(1): $(2) $(3)
+	$$(REPORT_BUILD)
+	@$$(NSINSTALL) -D $(1:.jar=)-classes
+	@$$(if $$(filter-out ./,$$(@D)),$$(NSINSTALL) -D $$(@D))
+	$$(JAVAC) $$(JAVAC_FLAGS)\
+    $(4)\
+		-d $(1:.jar=)-classes\
+		$(if $(strip $(3)),-classpath $(subst $(NULL) ,:,$(strip $(3))))\
+		$$(filter %.java,$$^)
+	$$(JAR) cMf $$@ -C $(1:.jar=)-classes .
+
+GARBAGE += $(1)
+
+GARBAGE_DIRS += $(1:.jar=)-classes
+endef
+
+$(foreach jar,$(JAVA_JAR_TARGETS),\
+  $(if $($(jar)_DEST),,$(error Missing $(jar)_DEST))\
+  $(if $($(jar)_JAVAFILES),,$(error Missing $(jar)_JAVAFILES))\
+  $(eval $(call java_jar_template,$($(jar)_DEST),$($(jar)_JAVAFILES) $($(jar)_PP_JAVAFILES),$($(jar)_EXTRA_JARS),$($(jar)_JAVAC_FLAGS)))\
+)
+endif #} JAVA_JAR_TARGETS
+
+
 INCLUDED_JAVA_BUILD_MK := 1

 endif #} INCLUDED_JAVA_BUILD_MK
--- a/config/rules.mk
+++ b/config/rules.mk
@ -1221,7 +1221,7 @@ endif
 ###############################################################################
 # Java rules
 ###############################################################################
-ifneq (,$(value JAVAFILES)$(value ANDROID_RESFILES))
+ifneq (,$(JAVAFILES)$(ANDROID_RESFILES)$(ANDROID_APKNAME)$(JAVA_JAR_TARGETS))
  include $(topsrcdir)/config/makefiles/java-build.mk
 endif

--- a/js/src/config/makefiles/java-build.mk
+++ b/js/src/config/makefiles/java-build.mk
@ -90,6 +90,40 @@ endif #} ANDROID_EXTRA_JARS
 include $(topsrcdir)/config/android-common.mk
 endif #} ANDROID_APK_NAME

+
+ifdef JAVA_JAR_TARGETS #{
+# Arg 1: Output target name with .jar suffix, like jars/jarfile.jar.
+#        Intermediate class files are generated in jars/jarfile-classes.
+# Arg 2: Java sources list.  We use VPATH and $^ so sources can be
+#        relative to $(srcdir) or $(CURDIR).
+# Arg 3: List of extra jars to link against.  We do not use VPATH so
+#        jars must be relative to $(CURDIR).
+# Arg 4: Additional JAVAC_FLAGS.
+define java_jar_template
+$(1): $(2) $(3)
+	$$(REPORT_BUILD)
+	@$$(NSINSTALL) -D $(1:.jar=)-classes
+	@$$(if $$(filter-out ./,$$(@D)),$$(NSINSTALL) -D $$(@D))
+	$$(JAVAC) $$(JAVAC_FLAGS)\
+    $(4)\
+		-d $(1:.jar=)-classes\
+		$(if $(strip $(3)),-classpath $(subst $(NULL) ,:,$(strip $(3))))\
+		$$(filter %.java,$$^)
+	$$(JAR) cMf $$@ -C $(1:.jar=)-classes .
+
+GARBAGE += $(1)
+
+GARBAGE_DIRS += $(1:.jar=)-classes
+endef
+
+$(foreach jar,$(JAVA_JAR_TARGETS),\
+  $(if $($(jar)_DEST),,$(error Missing $(jar)_DEST))\
+  $(if $($(jar)_JAVAFILES),,$(error Missing $(jar)_JAVAFILES))\
+  $(eval $(call java_jar_template,$($(jar)_DEST),$($(jar)_JAVAFILES) $($(jar)_PP_JAVAFILES),$($(jar)_EXTRA_JARS),$($(jar)_JAVAC_FLAGS)))\
+)
+endif #} JAVA_JAR_TARGETS
+
+
 INCLUDED_JAVA_BUILD_MK := 1

 endif #} INCLUDED_JAVA_BUILD_MK
--- a/js/src/config/rules.mk
+++ b/js/src/config/rules.mk
@ -1221,7 +1221,7 @@ endif
 ###############################################################################
 # Java rules
 ###############################################################################
-ifneq (,$(value JAVAFILES)$(value ANDROID_RESFILES))
+ifneq (,$(JAVAFILES)$(ANDROID_RESFILES)$(ANDROID_APKNAME)$(JAVA_JAR_TARGETS))
  include $(topsrcdir)/config/makefiles/java-build.mk
 endif

--- a/mobile/android/base/Makefile.in
+++ b/mobile/android/base/Makefile.in
@ -1230,6 +1230,77 @@ ifdef MOZ_WEBRTC
 ALL_JARS += jars/webrtc.jar
 endif

+JAVA_JAR_TARGETS += websockets
+websockets_DEST := jars/websockets.jar
+websockets_JAVAFILES := \
+  $(WEBSOCKETS_JAVA_FILES) \
+  $(NULL)
+websockets_JAVAC_FLAGS := -Xlint:all,-serial
+
+JAVA_JAR_TARGETS += gecko-browser
+gecko-browser_DEST := jars/gecko-browser.jar
+gecko-browser_JAVAFILES := \
+  $(FENNEC_JAVA_FILES) \
+  $(SYNC_JAVA_FILES) \
+  $(NULL)
+gecko-browser_PP_JAVAFILES := \
+  $(FENNEC_PP_JAVA_FILES) \
+  $(FENNEC_PP_JAVA_VIEW_FILES) \
+  $(SYNC_PP_JAVA_FILES) \
+  R.java \
+  $(NULL)
+gecko-browser_EXTRA_JARS := \
+  jars/gecko-mozglue.jar \
+  jars/gecko-util.jar \
+  jars/sync-thirdparty.jar \
+  jars/websockets.jar \
+  $(NULL)
+gecko-browser_JAVAC_FLAGS := -Xlint:all,-deprecation,-fallthrough
+
+JAVA_JAR_TARGETS += gecko-mozglue
+gecko-mozglue_DEST := jars/gecko-mozglue.jar
+gecko-mozglue_JAVAFILES := \
+  $(MOZGLUE_JAVA_FILES) \
+  $(NULL)
+gecko-mozglue_PP_JAVAFILES := \
+  $(MOZGLUE_PP_JAVA_FILES) \
+  $(NULL)
+gecko-mozglue_JAVAC_FLAGS := -Xlint:all
+
+JAVA_JAR_TARGETS += gecko-util
+gecko-util_DEST := jars/gecko-util.jar
+gecko-util_JAVAFILES := \
+  $(UTIL_JAVA_FILES) \
+  $(UTIL_PP_JAVA_FILES) \
+  $(NULL)
+gecko-util_EXTRA_JARS := \
+  jars/gecko-mozglue.jar \
+  $(NULL)
+gecko-util_JAVAC_FLAGS := -Xlint:all,-deprecation
+
+JAVA_JAR_TARGETS += sync-thirdparty
+sync-thirdparty_DEST := jars/sync-thirdparty.jar
+sync-thirdparty_JAVAFILES := \
+  $(SYNC_THIRDPARTY_JAVA_FILES) \
+  $(NULL)
+sync-thirdparty_JAVAC_FLAGS := -Xlint:none
+
+ifdef MOZ_WEBRTC
+JAVA_JAR_TARGETS += webrtc
+webrtc_DEST := jars/webrtc.jar
+webrtc_JAVAFILES := \
+  $(WEBRTC_JAVA_FILES) \
+  $(NULL)
+webrtc_EXTRA_JARS := \
+  jars/gecko-browser.jar \
+  jars/gecko-util.jar \
+  jars/gecko-mozglue.jar \
+  $(NULL)
+webrtc_JAVAC_FLAGS := -Xlint:all,-deprecation,-cast
+endif
+
+include $(topsrcdir)/config/makefiles/java-build.mk
+
 include $(topsrcdir)/config/rules.mk

 # Override the Java settings with some specific android settings
@ -1242,49 +1313,7 @@ include $(topsrcdir)/config/android-common.mk
 # indices.
 classes.dex: $(ALL_JARS)
 	@echo "DX classes.dex"
-	$(DX) --dex --output=classes.dex jars $(ANDROID_COMPAT_LIB)
-
-jars/gecko-browser.jar: jars/gecko-mozglue.jar jars/gecko-util.jar jars/sync-thirdparty.jar jars/websockets.jar $(addprefix $(srcdir)/,$(FENNEC_JAVA_FILES)) $(FENNEC_PP_JAVA_FILES) $(FENNEC_PP_JAVA_VIEW_FILES) $(addprefix $(srcdir)/,$(SYNC_JAVA_FILES)) $(SYNC_PP_JAVA_FILES) R.java
-	@echo "JAR gecko-browser.jar"
-	$(NSINSTALL) -D classes/gecko-browser
-	$(JAVAC) $(JAVAC_FLAGS) -Xlint:all,-deprecation,-fallthrough -d classes/gecko-browser -classpath "jars/gecko-mozglue.jar:jars/gecko-util.jar:jars/sync-thirdparty.jar:jars/websockets.jar" $(addprefix $(srcdir)/,$(FENNEC_JAVA_FILES)) $(FENNEC_PP_JAVA_FILES) $(FENNEC_PP_JAVA_VIEW_FILES) $(addprefix $(srcdir)/,$(SYNC_JAVA_FILES)) $(SYNC_PP_JAVA_FILES) R.java
-	$(JAR) cMf jars/gecko-browser.jar -C classes/gecko-browser .
-
-jars/gecko-mozglue.jar: $(addprefix $(srcdir)/,$(MOZGLUE_JAVA_FILES)) $(MOZGLUE_PP_JAVA_FILES) jars
-	@echo "JAR gecko-mozglue.jar"
-	$(NSINSTALL) -D classes/gecko-mozglue
-	$(JAVAC) $(JAVAC_FLAGS) -Xlint:all -d classes/gecko-mozglue $(addprefix $(srcdir)/,$(MOZGLUE_JAVA_FILES)) $(MOZGLUE_PP_JAVA_FILES)
-	$(JAR) cMf jars/gecko-mozglue.jar -C classes/gecko-mozglue .
-
-jars/gecko-util.jar: jars/gecko-mozglue.jar $(addprefix $(srcdir)/,$(UTIL_JAVA_FILES)) jars
-	@echo "JAR gecko-util.jar"
-	$(NSINSTALL) -D classes/gecko-util
-	$(JAVAC) $(JAVAC_FLAGS) -Xlint:all,-deprecation -d classes/gecko-util -classpath "jars/gecko-mozglue.jar" $(addprefix $(srcdir)/,$(UTIL_JAVA_FILES))
-	$(JAR) cMf jars/gecko-util.jar -C classes/gecko-util .
-
-jars/sync-thirdparty.jar: $(addprefix $(srcdir)/,$(SYNC_THIRDPARTY_JAVA_FILES)) jars
-	@echo "JAR sync-thirdparty.jar"
-	$(NSINSTALL) -D classes/sync-thirdparty
-	$(JAVAC) $(JAVAC_FLAGS) -d classes/sync-thirdparty $(addprefix $(srcdir)/,$(SYNC_THIRDPARTY_JAVA_FILES))
-	$(JAR) cMf jars/sync-thirdparty.jar -C classes/sync-thirdparty .
-
-jars/websockets.jar: $(addprefix $(srcdir)/, $(WEBSOCKETS_JAVA_FILES)) jars
-	@echo "JAR websockets.jar"
-	$(NSINSTALL) -D classes/websockets
-	$(JAVAC) $(JAVAC_FLAGS) -Xlint:all,-serial -d classes/websockets $(addprefix $(srcdir)/,$(WEBSOCKETS_JAVA_FILES))
-	$(JAR) cMf jars/websockets.jar -C classes/websockets .
-
-ifdef MOZ_WEBRTC
-jars/webrtc.jar: $(addprefix $(srcdir)/, $(WEBRTC_JAVA_FILES)) jars jars/gecko-browser.jar jars/gecko-util.jar jars/gecko-mozglue.jar
-	@echo "JAR webrtc.jar"
-	$(NSINSTALL) -D classes/webrtc
-	$(JAVAC) $(JAVAC_FLAGS) -d classes/webrtc -classpath classes/gecko-browser:classes/gecko-util:classes/gecko-mozglue $(addprefix $(srcdir)/,$(WEBRTC_JAVA_FILES))
-	$(JAR) cMf jars/webrtc.jar -C classes/webrtc .
-endif
-
-jars:
-	@echo "MKDIR jars"
-	$(NSINSTALL) -D jars
+	$(DX) --dex --output=classes.dex $(ALL_JARS) $(ANDROID_COMPAT_LIB)

 CLASSES_WITH_JNI= \
    org.mozilla.gecko.GeckoAppShell \
--- a/mobile/android/geckoview_library/Makefile.in
+++ b/mobile/android/geckoview_library/Makefile.in
@ -25,7 +25,7 @@ package:
 	$(MKDIR) -p bin gen libs/$(ABI_DIR) src

 	# Copy the JARs
-	cp ../base/jars/* libs/
+	cp ../base/jars/*.jar libs/

 	# Copy the SOs
 	cp $(DIST)/bin/libmozglue.so $(DIST)/bin/lib/libplugin-container.so libs/$(ABI_DIR)/