summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-06-01 16:34:31 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-06-01 16:34:31 +0300
commit6a28a5559ea3f17f236f85b0615dd1213562b984 (patch)
tree3eab63a1a8e0984f3e8bc78a6b21dd4fd5bf753f /python
parent0468922b50702cbaa6f1c26c7f982eb8100915f6 (diff)
downloadUXP-6a28a5559ea3f17f236f85b0615dd1213562b984.tar
UXP-6a28a5559ea3f17f236f85b0615dd1213562b984.tar.gz
UXP-6a28a5559ea3f17f236f85b0615dd1213562b984.tar.lz
UXP-6a28a5559ea3f17f236f85b0615dd1213562b984.tar.xz
UXP-6a28a5559ea3f17f236f85b0615dd1213562b984.zip
Update the list of directives and file extensions for check
Diffstat (limited to 'python')
-rw-r--r--python/mozbuild/mozbuild/mach_commands.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 9e769653e..b8755e260 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -541,9 +541,11 @@ class Build(MachCommandBase):
# as when doing OSX Universal builds)
pass
- # Check if there are any unpreprocessed files
- grepcmd = 'grep -E -r "^(#|%)ifdef" --include=\*.{js\*,css,x\*,h\*,manifest,dtd,properties} '\
- + self.topobjdir + '/dist/bin'
+ # Check if there are any unpreprocessed files in '@MOZ_OBJDIR@/dist/bin'
+ # See python/mozbuild/mozbuild/preprocessor.py#L293-L309 for the list of directives
+ grepcmd = 'grep -E -r "^(#|%)(define|el|endif|error|expand|filter|if|include|literal|undef|unfilter)" '\
+ + '--include=\*.{css,dtd,h\*,js\*,x\*,manifest,properties,rdf} '\
+ + self.topobjdir + '/dist/bin | grep -v ".css:#"'
grepresult = subprocess.Popen(grepcmd, stdout=subprocess.PIPE, shell=True).communicate()[0]
if grepresult:
print('\nERROR: preprocessor was not applied to the following files:\n\n' + grepresult)