Bug 1229241 - Differentiate preprocessed and non-preprocessed JS pref files. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 28 Nov 2015 09:42:40 +0900
changeset 308994 81d63799328b2ae690f7135586ea76d3fb911cad
parent 308993 88981a083ec91e7ff8b6cd3f91b91cb9d1246240
child 308995 839564f83b4966f7732d4cf4e24edb70361064c9
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1229241
milestone45.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 1229241 - Differentiate preprocessed and non-preprocessed JS pref files. r=gps
b2g/app/moz.build
b2g/dev/app/moz.build
browser/app/moz.build
devtools/client/preferences/moz.build
devtools/client/webide/moz.build
mobile/android/app/moz.build
mobile/android/b2gdroid/app/moz.build
python/mozbuild/mozbuild/frontend/context.py
python/mozbuild/mozbuild/frontend/emitter.py
webapprt/moz.build
xulrunner/app/moz.build
--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@@ -69,15 +69,15 @@ DISABLE_STL_WRAPPING = True
 if CONFIG['OS_ARCH'] == 'WINNT':
     OS_LIBS += [
         'version',
     ]
 
 if CONFIG['GNU_CXX']:
     CXXFLAGS += ['-Wshadow']
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'b2g.js',
 ]
 
 FINAL_TARGET_PP_FILES += [
   'ua-update.json.in',
 ]
--- a/b2g/dev/app/moz.build
+++ b/b2g/dev/app/moz.build
@@ -1,12 +1,15 @@
 # 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/.
 
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
+JS_PREFERENCE_PP_FILES += [
+    '/b2g/app/b2g.js',
+]
+
 JS_PREFERENCE_FILES += [
-    '/b2g/app/b2g.js',
     '/b2g/dev/app/mulet.js',
 ]
 
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@@ -6,17 +6,17 @@
 
 DIRS += ['profile/extensions']
 
 if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['MOZ_ASAN']:
     GeckoProgram(CONFIG['MOZ_APP_NAME'])
 else:
     GeckoProgram(CONFIG['MOZ_APP_NAME'], msvcrt='static')
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'profile/firefox.js',
 ]
 
 SOURCES += [
     'nsBrowserApp.cpp',
 ]
 
 FINAL_TARGET_FILES += ['blocklist.xml']
--- a/devtools/client/preferences/moz.build
+++ b/devtools/client/preferences/moz.build
@@ -1,9 +1,9 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'devtools.js',
 ]
--- a/devtools/client/webide/moz.build
+++ b/devtools/client/webide/moz.build
@@ -13,11 +13,11 @@ DIRS += [
 
 BROWSER_CHROME_MANIFESTS += [
     'test/browser.ini'
 ]
 MOCHITEST_CHROME_MANIFESTS += [
     'test/chrome.ini'
 ]
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'webide-prefs.js',
 ]
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@@ -8,15 +8,15 @@ for var in ('APP_NAME', 'APP_VERSION'):
     DEFINES[var] = CONFIG['MOZ_%s' % var]
 
 for var in ('MOZ_UPDATER', 'MOZ_APP_UA_NAME', 'ANDROID_PACKAGE_NAME'):
     DEFINES[var] = CONFIG[var]
 
 if CONFIG['MOZ_PKG_SPECIAL']:
     DEFINES['MOZ_PKG_SPECIAL'] = CONFIG['MOZ_PKG_SPECIAL']
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
      'mobile.js',
 ]
 
 FINAL_TARGET_PP_FILES += [
   'ua-update.json.in',
 ]
--- a/mobile/android/b2gdroid/app/moz.build
+++ b/mobile/android/b2gdroid/app/moz.build
@@ -28,11 +28,11 @@ ANDROID_EXTRA_PACKAGES += ['org.mozilla.
 if CONFIG['ANDROID_SUPPORT_V4_AAR']:
     ANDROID_EXTRA_PACKAGES += ['android.support.v4']
     ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_SUPPORT_V4_AAR_RES']]
 
 if CONFIG['ANDROID_APPCOMPAT_V7_AAR']:
     ANDROID_EXTRA_PACKAGES += ['android.support.v7.appcompat']
     ANDROID_EXTRA_RES_DIRS += ['%' + CONFIG['ANDROID_APPCOMPAT_V7_AAR_RES']]
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
      'b2gdroid.js',
 ]
--- a/python/mozbuild/mozbuild/frontend/context.py
+++ b/python/mozbuild/mozbuild/frontend/context.py
@@ -1091,16 +1091,20 @@ VARIABLES = {
 
     'JS_PREFERENCE_FILES': (StrictOrderingOnAppendList, list,
         """Exported javascript files.
 
         A list of files copied into the dist directory for packaging and installation.
         Path will be defined for gre or application prefs dir based on what is building.
         """, 'libs'),
 
+    'JS_PREFERENCE_PP_FILES': (StrictOrderingOnAppendList, list,
+        """Like JS_PREFERENCE_FILES, preprocessed..
+        """, 'libs'),
+
     'LIBRARY_DEFINES': (OrderedDict, dict,
         """Dictionary of compiler defines to declare for the entire library.
 
         This variable works like DEFINES, except that declarations apply to all
         libraries that link into this library via FINAL_LIBRARY.
         """, None),
 
     'LIBRARY_NAME': (unicode, unicode,
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@@ -632,17 +632,18 @@ class TreeMetadataEmitter(LoggingMixin):
         resources = context.get('RESOURCE_FILES')
         if resources:
             if context.get('DIST_SUBDIR') or context.get('XPI_NAME'):
                 raise SandboxValidationError(
                     'RESOURCES_FILES cannot be used with DIST_SUBDIR or '
                     'XPI_NAME.', context)
             yield Resources(context, resources)
 
-        for pref in sorted(context['JS_PREFERENCE_FILES']):
+        for pref in sorted(context['JS_PREFERENCE_FILES'] +
+                           context['JS_PREFERENCE_PP_FILES']):
             yield JsPreferenceFile(context, pref)
 
         self._handle_programs(context)
 
         extra_js_modules = context.get('EXTRA_JS_MODULES')
         if extra_js_modules:
             yield JavaScriptModules(context, extra_js_modules, 'extra')
 
--- a/webapprt/moz.build
+++ b/webapprt/moz.build
@@ -45,15 +45,15 @@ MOCHITEST_WEBAPPRT_CONTENT_MANIFESTS += 
 DIST_SUBDIR = 'webapprt'
 export('DIST_SUBDIR')
 
 DEFINES['GRE_MILESTONE'] = CONFIG['GRE_MILESTONE']
 DEFINES['MOZ_APP_BASENAME'] = CONFIG['MOZ_APP_BASENAME']
 
 JAR_MANIFESTS += ['jar.mn']
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'prefs.js',
 ]
 
 FINAL_TARGET_PP_FILES += [
     'webapprt.ini',
 ]
--- a/xulrunner/app/moz.build
+++ b/xulrunner/app/moz.build
@@ -49,17 +49,17 @@ if CONFIG['OS_ARCH'] == 'WINNT':
         'ole32',
         'oleaut32',
         'version',
         'winspool',
     ]
 
 DISABLE_STL_WRAPPING = True
 
-JS_PREFERENCE_FILES += [
+JS_PREFERENCE_PP_FILES += [
     'xulrunner.js',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     BRANDING_FILES += [
         'app.ico',
         'document.ico',
         'xulrunner.ico',