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.
This commit is contained in:
Mike Hommey 2015-11-27 08:47:56 +09:00
parent 77c70061bb
commit 5f18a2a5fe
7 changed files with 20 additions and 11 deletions

View File

@ -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

View File

@ -7,6 +7,9 @@
XPI_NAME = 'indexedDB'
DIST_FILES += [
'bootstrap.js',
'install.rdf',
]
FINAL_TARGET_FILES += [
'bootstrap.js',
]

View File

@ -7,7 +7,10 @@
XPI_NAME = 'workerbootstrap'
DIST_FILES += [
'bootstrap.js',
'install.rdf',
]
FINAL_TARGET_FILES += [
'bootstrap.js',
'worker.js',
]

View File

@ -19,5 +19,8 @@ XPI_NAME = 'worker'
DIST_FILES += [
'install.rdf',
]
FINAL_TARGET_FILES += [
'worker.js',
]

View File

@ -162,11 +162,8 @@ class FasterMakeBackend(CommonBackend):
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'):

View File

@ -12,6 +12,9 @@ USE_EXTENSION_MANIFEST = True
NO_JS_MANIFEST = True
DIST_FILES += [
'bootstrap.js',
'install.rdf',
]
FINAL_TARGET_FILES += [
'bootstrap.js',
]

View File

@ -16,6 +16,9 @@ USE_EXTENSION_MANIFEST = True
NO_JS_MANIFEST = True
DIST_FILES += [
'chrome.manifest',
'install.rdf',
]
FINAL_TARGET_FILES += [
'chrome.manifest',
]