Bug 1228444 - Don't silence "no preprocessor directives found" warnings for DIST_FILES. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 27 Nov 2015 08:47:56 +0900
changeset 274797 78999cfd91067203a9d15cd8f9feecb3afe233c1
parent 274796 b5730e38da61398fcd372cb3e07e8c2a78b1d437
child 274798 f94d5b12e0970ea829dc223da79f892a5f013e87
push id29739
push usercbook@mozilla.com
push dateTue, 01 Dec 2015 14:26:30 +0000
treeherdermozilla-central@974fe614d529 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1228444
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 1228444 - Don't silence "no preprocessor directives found" warnings for DIST_FILES. r=gps and move files without preprocessor directives to FINAL_TARGET_FILES.
config/rules.mk
dom/indexedDB/test/extensions/moz.build
dom/workers/test/extensions/bootstrap/moz.build
dom/workers/test/extensions/traditional/moz.build
python/mozbuild/mozbuild/backend/fastermake.py
testing/specialpowers/moz.build
tools/quitter/moz.build
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -1265,19 +1265,16 @@ endif
 else # No JAR_MANIFEST
 ifneq (,$(wildcard $(srcdir)/jar.mn))
 $(error $(srcdir) contains a jar.mn file but this file is not declared in a JAR_MANIFESTS variable in a moz.build file)
 endif
 endif
 
 ifneq ($(DIST_FILES),)
 DIST_FILES_PATH := $(FINAL_TARGET)
-# We preprocess these, but they don't necessarily have preprocessor directives,
-# so tell them preprocessor to not complain about that.
-DIST_FILES_FLAGS := --silence-missing-directive-warnings
 PP_TARGETS += DIST_FILES
 endif
 
 # When you move this out of the tools tier, please remove the corresponding
 # hacks in recursivemake.py that check if Makefile.in sets the variable.
 ifneq ($(XPI_PKGNAME),)
 tools realchrome::
 ifdef STRIP_XPI
--- a/dom/indexedDB/test/extensions/moz.build
+++ b/dom/indexedDB/test/extensions/moz.build
@@ -2,11 +2,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/.
 
 XPI_NAME = 'indexedDB'
 
 DIST_FILES += [
-    'bootstrap.js',
     'install.rdf',
 ]
+
+FINAL_TARGET_FILES += [
+    'bootstrap.js',
+]
--- a/dom/workers/test/extensions/bootstrap/moz.build
+++ b/dom/workers/test/extensions/bootstrap/moz.build
@@ -2,12 +2,15 @@
 # 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/.
 
 XPI_NAME = 'workerbootstrap'
 
 DIST_FILES += [
+    'install.rdf',
+]
+
+FINAL_TARGET_FILES += [
     'bootstrap.js',
-    'install.rdf',
     'worker.js',
 ]
--- a/dom/workers/test/extensions/traditional/moz.build
+++ b/dom/workers/test/extensions/traditional/moz.build
@@ -14,10 +14,13 @@ EXTRA_COMPONENTS += [
     'WorkerTest.js',
     'WorkerTest.manifest',
 ]
 
 XPI_NAME = 'worker'
 
 DIST_FILES += [
     'install.rdf',
+]
+
+FINAL_TARGET_FILES += [
     'worker.js',
 ]
--- a/python/mozbuild/mozbuild/backend/fastermake.py
+++ b/python/mozbuild/mozbuild/backend/fastermake.py
@@ -157,21 +157,18 @@ class FasterMakeBackend(CommonBackend):
                 for f in strings:
                     self._install_manifests[obj.install_target].add_symlink(
                         mozpath.join(obj.srcdir, f),
                         mozpath.join(path, mozpath.basename(f))
                     )
 
         elif isinstance(obj, DistFiles) and \
                 obj.install_target.startswith('dist/bin'):
-            # We preprocess these, but they don't necessarily have preprocessor
-            # directives, so tell the preprocessor to not complain about that.
             for f in obj.files:
-                self._add_preprocess(obj, f, '', defines=defines,
-                                     silence_missing_directive_warnings=True)
+                self._add_preprocess(obj, f, '', defines=defines)
 
         elif isinstance(obj, ChromeManifestEntry) and \
                 obj.install_target.startswith('dist/bin'):
             top_level = mozpath.join(obj.install_target, 'chrome.manifest')
             if obj.path != top_level:
                 entry = 'manifest %s' % mozpath.relpath(obj.path,
                                                         obj.install_target)
                 if entry not in self._manifest_entries[top_level]:
--- a/testing/specialpowers/moz.build
+++ b/testing/specialpowers/moz.build
@@ -7,11 +7,14 @@
 XPI_NAME = 'specialpowers'
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
 DIST_FILES += [
-    'bootstrap.js',
     'install.rdf',
 ]
+
+FINAL_TARGET_FILES += [
+    'bootstrap.js',
+]
--- a/tools/quitter/moz.build
+++ b/tools/quitter/moz.build
@@ -11,11 +11,14 @@ EXTRA_COMPONENTS += [
 XPI_NAME = 'quitter'
 
 JAR_MANIFESTS += ['jar.mn']
 
 USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
 DIST_FILES += [
-    'chrome.manifest',
     'install.rdf',
 ]
+
+FINAL_TARGET_FILES += [
+    'chrome.manifest',
+]