Bug 880245 - move EXTRA_JS_MODULES to moz.build (logic); r=gps
authorMike Shal <mshal@mozilla.com>
Mon, 10 Jun 2013 11:54:44 -0400
changeset 146438 76a9571e528338a2749d29abf14df2c49aa23629
parent 146437 fa6b60d827d4795c00be982b2d26f014e110f66d
child 146439 0d187d59f162cc15cca38819c0526e8d20b14e23
push id2697
push userbbajaj@mozilla.com
push dateMon, 05 Aug 2013 18:49:53 +0000
treeherdermozilla-beta@dfec938c7b63 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs880245
milestone24.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 880245 - move EXTRA_JS_MODULES to moz.build (logic); r=gps From 20ae951b53609df92b021ae1dd52ae833f488f3e Mon Sep 17 00:00:00 2001
python/mozbuild/mozbuild/frontend/emitter.py
python/mozbuild/mozbuild/frontend/sandbox_symbols.py
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -80,19 +80,21 @@ class TreeMetadataEmitter(object):
         varmap = dict(
             # Makefile.in : moz.build
             ASFILES='ASFILES',
             CMMSRCS='CMMSRCS',
             CPPSRCS='CPP_SOURCES',
             CSRCS='CSRCS',
             DEFINES='DEFINES',
             EXTRA_COMPONENTS='EXTRA_COMPONENTS',
+            EXTRA_JS_MODULES='EXTRA_JS_MODULES',
             EXTRA_PP_COMPONENTS='EXTRA_PP_COMPONENTS',
             HOST_CSRCS='HOST_CSRCS',
             HOST_LIBRARY_NAME='HOST_LIBRARY_NAME',
+            JS_MODULES_PATH='JS_MODULES_PATH',
             LIBRARY_NAME='LIBRARY_NAME',
             MODULE='MODULE',
             SIMPLE_PROGRAMS='SIMPLE_PROGRAMS',
             SSRCS='SSRCS',
             XPIDL_FLAGS='XPIDL_FLAGS',
             XPIDL_MODULE='XPIDL_MODULE',
             XPIDLSRCS='XPIDL_SOURCES',
             )
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@@ -99,16 +99,23 @@ VARIABLES = {
         """),
 
     'EXTRA_COMPONENTS': (StrictOrderingOnAppendList, list, [],
         """Additional component files to distribute.
 
        This variable contains a list of files to copy into $(FINAL_TARGET)/components/.
         """),
 
+    '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.
+        """),
+
     'EXTRA_PP_COMPONENTS': (StrictOrderingOnAppendList, list, [],
         """Javascript XPCOM files.
 
        This variable contains a list of files to preprocess.  Generated
        files will be installed in the /components directory of the distribution.
         """),
 
     'HOST_CSRCS': (StrictOrderingOnAppendList, list, [],
@@ -125,16 +132,23 @@ VARIABLES = {
         converted to not use Makefile's for the build frontend, this will
         likely go away.
         """),
 
     'HOST_LIBRARY_NAME': (unicode, unicode, "",
         """Name of target library generated when cross compiling.
         """),
 
+    'JS_MODULES_PATH': (unicode, unicode, "",
+        """Path to install EXTRA_JS_MODULES.
+
+        EXTRA_JS_MODULES files are copied to this path, which defaults to
+        $(FINAL_TARGET)/modules if unspecified.
+        """),
+
     'LIBRARY_NAME': (unicode, unicode, "",
         """The name of the library generated for a directory.
 
         Example:
         In example/components/moz.build,
         LIBRARY_NAME = 'xpcomsample'
         would generate example/components/libxpcomsample.so on Linux, or
         example/components/xpcomsample.lib on Windows.