Bug 1228444 - Don't silence "no preprocessor directives found" warnin…

…gs for DIST_FILES. r=gps and move files without preprocessor directives to FINAL_TARGET_FILES.
dothq · Nov 30, 2015 · 655579a · 655579a
1 parent 5dfa893
commit 655579a
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 11 deletions.
diff --git a/config/rules.mk b/config/rules.mk
@@ -1270,9 +1270,6 @@ 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
 

diff --git a/dom/indexedDB/test/extensions/moz.build b/dom/indexedDB/test/extensions/moz.build
@@ -7,6 +7,9 @@
 XPI_NAME = 'indexedDB'
 
 DIST_FILES += [
-    'bootstrap.js',
     'install.rdf',
 ]
+
+FINAL_TARGET_FILES += [
+    'bootstrap.js',
+]
diff --git a/dom/workers/test/extensions/bootstrap/moz.build b/dom/workers/test/extensions/bootstrap/moz.build
@@ -7,7 +7,10 @@
 XPI_NAME = 'workerbootstrap'
 
 DIST_FILES += [
-    'bootstrap.js',
     'install.rdf',
+]
+
+FINAL_TARGET_FILES += [
+    'bootstrap.js',
     'worker.js',
 ]
diff --git a/dom/workers/test/extensions/traditional/moz.build b/dom/workers/test/extensions/traditional/moz.build
@@ -19,5 +19,8 @@ XPI_NAME = 'worker'
 
 DIST_FILES += [
     'install.rdf',
+]
+
+FINAL_TARGET_FILES += [
     'worker.js',
 ]
diff --git a/python/mozbuild/mozbuild/backend/fastermake.py b/python/mozbuild/mozbuild/backend/fastermake.py
@@ -162,11 +162,8 @@ def consume_object(self, obj):
 
         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'):

diff --git a/testing/specialpowers/moz.build b/testing/specialpowers/moz.build
@@ -12,6 +12,9 @@ USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
 DIST_FILES += [
-    'bootstrap.js',
     'install.rdf',
 ]
+
+FINAL_TARGET_FILES += [
+    'bootstrap.js',
+]
diff --git a/tools/quitter/moz.build b/tools/quitter/moz.build
@@ -16,6 +16,9 @@ USE_EXTENSION_MANIFEST = True
 NO_JS_MANIFEST = True
 
 DIST_FILES += [
-    'chrome.manifest',
     'install.rdf',
 ]
+
+FINAL_TARGET_FILES += [
+    'chrome.manifest',
+]