Bug 923306 - Follow-up: Address review comment. r=me
authorNick Alexander <nalexander@mozilla.com>
Wed, 09 Oct 2013 17:14:20 -0700
changeset 150316 5055f99ce7c9f8723066b0937bd96770553a7980
parent 150315 905feca3578b4aef357eefaa0eb26e0ee98401aa
child 150317 00955d61cc946eaa1e69e5025e646c0cc5b8d1b2
push id34821
push usercbook@mozilla.com
push dateThu, 10 Oct 2013 11:42:34 +0000
treeherdermozilla-inbound@655490859d77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs923306
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 923306 - Follow-up: Address review comment. r=me
config/makefiles/java-build.mk
js/src/config/makefiles/java-build.mk
--- a/config/makefiles/java-build.mk
+++ b/config/makefiles/java-build.mk
@@ -98,17 +98,17 @@ ifdef JAVA_JAR_TARGETS #{
 #        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))
+	@$$(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)
--- a/js/src/config/makefiles/java-build.mk
+++ b/js/src/config/makefiles/java-build.mk
@@ -98,17 +98,17 @@ ifdef JAVA_JAR_TARGETS #{
 #        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))
+	@$$(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)