Bug 880245 - Convert JS_MODULES_PATH to be relative to $(FINAL_TARGET); r=gps

browser/components/sessionstore/src/Makefile.in

@@ -16,7 +16,7 @@ DISABLED_EXTRA_COMPONENTS = \
   nsSessionStartup.js \
   $(NULL)
 
-JS_MODULES_PATH := $(FINAL_TARGET)/modules/sessionstore
+JS_MODULES_PATH := modules/sessionstore
 
 EXTRA_JS_MODULES := \
   DocumentUtils.jsm \

config/rules.mk

@@ -1487,21 +1487,23 @@ libs:: $(call mkdir_deps,$(FINAL_TARGET))
 endif
 
 ################################################################################
-# Copy each element of EXTRA_JS_MODULES to JS_MODULES_PATH, or
-# $(FINAL_TARGET)/modules if that isn't defined.
-JS_MODULES_PATH ?= $(FINAL_TARGET)/modules
+# Copy each element of EXTRA_JS_MODULES to
+# $(FINAL_TARGET)/$(JS_MODULES_PATH). JS_MODULES_PATH defaults to "modules"
+# if it is undefined.
+JS_MODULES_PATH ?= modules
+FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/$(JS_MODULES_PATH)
 
 ifdef EXTRA_JS_MODULES
 ifndef NO_DIST_INSTALL
 EXTRA_JS_MODULES_FILES := $(EXTRA_JS_MODULES)
-EXTRA_JS_MODULES_DEST := $(JS_MODULES_PATH)
+EXTRA_JS_MODULES_DEST := $(FINAL_JS_MODULES_PATH)
 INSTALL_TARGETS += EXTRA_JS_MODULES
 endif
 endif
 
 ifdef EXTRA_PP_JS_MODULES
 ifndef NO_DIST_INSTALL
-EXTRA_PP_JS_MODULES_PATH := $(JS_MODULES_PATH)
+EXTRA_PP_JS_MODULES_PATH := $(FINAL_JS_MODULES_PATH)
 PP_TARGETS += EXTRA_PP_JS_MODULES
 endif
 endif

js/src/config/rules.mk

@@ -1487,21 +1487,23 @@ libs:: $(call mkdir_deps,$(FINAL_TARGET))
 endif
 
 ################################################################################
-# Copy each element of EXTRA_JS_MODULES to JS_MODULES_PATH, or
-# $(FINAL_TARGET)/modules if that isn't defined.
-JS_MODULES_PATH ?= $(FINAL_TARGET)/modules
+# Copy each element of EXTRA_JS_MODULES to
+# $(FINAL_TARGET)/$(JS_MODULES_PATH). JS_MODULES_PATH defaults to "modules"
+# if it is undefined.
+JS_MODULES_PATH ?= modules
+FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/$(JS_MODULES_PATH)
 
 ifdef EXTRA_JS_MODULES
 ifndef NO_DIST_INSTALL
 EXTRA_JS_MODULES_FILES := $(EXTRA_JS_MODULES)
-EXTRA_JS_MODULES_DEST := $(JS_MODULES_PATH)
+EXTRA_JS_MODULES_DEST := $(FINAL_JS_MODULES_PATH)
 INSTALL_TARGETS += EXTRA_JS_MODULES
 endif
 endif
 
 ifdef EXTRA_PP_JS_MODULES
 ifndef NO_DIST_INSTALL
-EXTRA_PP_JS_MODULES_PATH := $(JS_MODULES_PATH)
+EXTRA_PP_JS_MODULES_PATH := $(FINAL_JS_MODULES_PATH)
 PP_TARGETS += EXTRA_PP_JS_MODULES
 endif
 endif

python/mozbuild/mozbuild/frontend/sandbox_symbols.py

@@ -107,8 +107,9 @@ VARIABLES = {
     'EXTRA_JS_MODULES': (StrictOrderingOnAppendList, list, [],
         """Additional JavaScript files to distribute.
 
-        This variable contains a list of files to copy into JS_MODULES_PATH,
-        which is $(FINAL_TARGET)/modules by default.
+        This variable contains a list of files to copy into
+        $(FINAL_TARGET)/$(JS_MODULES_PATH). JS_MODULES_PATH defaults to
+        "modules" if left undefined.
         """),
 
     'EXTRA_PP_COMPONENTS': (StrictOrderingOnAppendList, list, [],
@@ -138,10 +139,12 @@ VARIABLES = {
         """),
 
     'JS_MODULES_PATH': (unicode, unicode, "",
-        """Path to install EXTRA_JS_MODULES.
+        """Sub-directory of $(FINAL_TARGET) to install EXTRA_JS_MODULES.
 
-        EXTRA_JS_MODULES files are copied to this path, which defaults to
-        $(FINAL_TARGET)/modules if unspecified.
+        EXTRA_JS_MODULES files are copied to
+        $(FINAL_TARGET)/$(JS_MODULES_PATH). This variable does not
+        need to be defined if the desired destination directory is
+        $(FINAL_TARGET)/modules.
         """),
 
     'LIBRARY_NAME': (unicode, unicode, "",

services/metrics/Makefile.in

@@ -25,9 +25,8 @@ MAIN_JS_MODULE := Metrics.jsm
 MAIN_JS_MODULE_PATH = $(FINAL_TARGET)/modules
 PP_TARGETS += MAIN_JS_MODULE
 
-JS_MODULES := $(modules)
-JS_MODULES_PATH = $(FINAL_TARGET)/modules/services/metrics
-PP_TARGETS += JS_MODULES
+EXTRA_PP_JS_MODULES := $(modules)
+JS_MODULES_PATH = modules/services/metrics
 
 TESTING_JS_MODULES := $(addprefix modules-testing/,$(testing_modules))
 TESTING_JS_MODULE_DIR := services/metrics

toolkit/identity/Makefile.in

@@ -29,6 +29,6 @@ EXTRA_JS_MODULES = \
 	Sandbox.jsm \
 	$(NULL)
 
-JS_MODULES_PATH = $(FINAL_TARGET)/modules/identity
+JS_MODULES_PATH = modules/identity
 
 include $(topsrcdir)/config/rules.mk