зеркало из https://github.com/mozilla/gecko-dev.git
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:
Родитель
5dfa8936e1
Коммит
655579a1fa
|
@ -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
|
||||
|
||||
|
|
|
@ -7,6 +7,9 @@
|
|||
XPI_NAME = 'indexedDB'
|
||||
|
||||
DIST_FILES += [
|
||||
'bootstrap.js',
|
||||
'install.rdf',
|
||||
]
|
||||
|
||||
FINAL_TARGET_FILES += [
|
||||
'bootstrap.js',
|
||||
]
|
||||
|
|
|
@ -7,7 +7,10 @@
|
|||
XPI_NAME = 'workerbootstrap'
|
||||
|
||||
DIST_FILES += [
|
||||
'bootstrap.js',
|
||||
'install.rdf',
|
||||
]
|
||||
|
||||
FINAL_TARGET_FILES += [
|
||||
'bootstrap.js',
|
||||
'worker.js',
|
||||
]
|
||||
|
|
|
@ -19,5 +19,8 @@ XPI_NAME = 'worker'
|
|||
|
||||
DIST_FILES += [
|
||||
'install.rdf',
|
||||
]
|
||||
|
||||
FINAL_TARGET_FILES += [
|
||||
'worker.js',
|
||||
]
|
||||
|
|
|
@ -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'):
|
||||
|
|
|
@ -12,6 +12,9 @@ USE_EXTENSION_MANIFEST = True
|
|||
NO_JS_MANIFEST = True
|
||||
|
||||
DIST_FILES += [
|
||||
'bootstrap.js',
|
||||
'install.rdf',
|
||||
]
|
||||
|
||||
FINAL_TARGET_FILES += [
|
||||
'bootstrap.js',
|
||||
]
|
||||
|
|
|
@ -16,6 +16,9 @@ USE_EXTENSION_MANIFEST = True
|
|||
NO_JS_MANIFEST = True
|
||||
|
||||
DIST_FILES += [
|
||||
'chrome.manifest',
|
||||
'install.rdf',
|
||||
]
|
||||
|
||||
FINAL_TARGET_FILES += [
|
||||
'chrome.manifest',
|
||||
]
|
||||
|
|
Загрузка…
Ссылка в новой задаче