Bug 1046638 - Port |Bug 1044162 - make install locations for EXTRA_{PP_,}JS_MODULES better| to comm-central r=standard8 for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 31 Jul 2014 21:49:46 +0100
changeset 16420 321473e98f56c0574514296206a19e1fdf242213
parent 16419 400d3f9380fb71bcea42d763cdfc1f53cfe83470
child 16421 9594eef26b92b5621dda6cd0480fe70db997f5ae
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersstandard8
bugs1046638, 1044162
Bug 1046638 - Port |Bug 1044162 - make install locations for EXTRA_{PP_,}JS_MODULES better| to comm-central r=standard8 for a CLOSED TREE
config/config.mk
config/rules.mk
mail/components/activity/moz.build
mailnews/db/gloda/modules/moz.build
mailnews/mime/moz.build
--- a/config/config.mk
+++ b/config/config.mk
@@ -48,17 +48,16 @@ endif
   FINAL_TARGET \
   GTEST_CMMSRCS \
   GTEST_CPPSRCS \
   GTEST_CSRCS \
   HOST_CSRCS \
   HOST_LIBRARY_NAME \
   IS_COMPONENT \
   JAR_MANIFEST \
-  JS_MODULES_PATH \
   LIBRARY_NAME \
   LIBS \
   LIBXUL_LIBRARY \
   MAKE_FRAMEWORK \
   MODULE \
   MSVC_ENABLE_PGO \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1250,20 +1250,18 @@ endif
 EXTRA_MANIFESTS = $(filter %.manifest,$(EXTRA_COMPONENTS) $(EXTRA_PP_COMPONENTS))
 ifneq (,$(EXTRA_MANIFESTS))
 libs:: $(call mkdir_deps,$(FINAL_TARGET))
 	$(call py_action,buildlist,$(FINAL_TARGET)/chrome.manifest $(patsubst %,'manifest components/%',$(notdir $(EXTRA_MANIFESTS))))
 endif
 
 ################################################################################
 # 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)
+# $(FINAL_TARGET)/modules
+FINAL_JS_MODULES_PATH := $(FINAL_TARGET)/modules
 
 ifdef EXTRA_JS_MODULES
 ifndef NO_DIST_INSTALL
 EXTRA_JS_MODULES_FILES := $(EXTRA_JS_MODULES)
 EXTRA_JS_MODULES_DEST := $(FINAL_JS_MODULES_PATH)
 INSTALL_TARGETS += EXTRA_JS_MODULES
 endif
 endif
--- a/mail/components/activity/moz.build
+++ b/mail/components/activity/moz.build
@@ -13,21 +13,19 @@ XPIDL_MODULE = 'activity'
 
 EXTRA_COMPONENTS += [
     'activityComponents.manifest',
     'nsActivity.js',
     'nsActivityManager.js',
     'nsActivityManagerUI.js',
 ]
 
-EXTRA_JS_MODULES += [
+EXTRA_JS_MODULES.activity += [
     'modules/activityModules.js',
     'modules/alertHook.js',
     'modules/autosync.js',
     'modules/glodaIndexer.js',
     'modules/moveCopy.js',
     'modules/pop3Download.js',
     'modules/sendLater.js',
 ]
 
-JS_MODULES_PATH = 'modules/activity'
-
 JAR_MANIFESTS += ['jar.mn']
--- a/mailnews/db/gloda/modules/moz.build
+++ b/mailnews/db/gloda/modules/moz.build
@@ -1,14 +1,14 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-EXTRA_JS_MODULES += [
+EXTRA_JS_MODULES.gloda += [
     'collection.js',
     'connotent.js',
     'databind.js',
     'datamodel.js',
     'datastore.js',
     'dbview.js',
     'everybody.js',
     'explattr.js',
@@ -25,11 +25,8 @@ EXTRA_JS_MODULES += [
     'noun_freetag.js',
     'noun_mimetype.js',
     'noun_tag.js',
     'public.js',
     'query.js',
     'suffixtree.js',
     'utils.js',
 ]
-
-JS_MODULES_PATH = 'modules/gloda'
-
--- a/mailnews/mime/moz.build
+++ b/mailnews/mime/moz.build
@@ -7,15 +7,13 @@ DIRS += [
     'public',
     'src',
     'emitters',
     'cthandlers',
 ]
 
 TEST_DIRS += ['test']
 
-EXTRA_JS_MODULES += [
+EXTRA_JS_MODULES.jsmime += [
     'jsmime/jsmime.js',
 ]
 
-JS_MODULES_PATH = 'modules/jsmime'
-
 XPCSHELL_TESTS_MANIFESTS += ['jsmime/test/xpcshell.ini']