diff options
| author | JustOff <Off.Just.Off@gmail.com> | 2018-06-02 21:05:05 +0300 |
|---|---|---|
| committer | JustOff <Off.Just.Off@gmail.com> | 2018-06-02 21:05:05 +0300 |
| commit | 93774317fae6b7f370a43c50f8811e1f8e1f0d5c (patch) | |
| tree | 0912424cf53dda9dc46175675787536e2c6d0e95 | |
| parent | ced9c8b9df1f3672e9b987adbfce95cdcdec2e06 (diff) | |
| download | UXP-93774317fae6b7f370a43c50f8811e1f8e1f0d5c.tar UXP-93774317fae6b7f370a43c50f8811e1f8e1f0d5c.tar.gz UXP-93774317fae6b7f370a43c50f8811e1f8e1f0d5c.tar.lz UXP-93774317fae6b7f370a43c50f8811e1f8e1f0d5c.tar.xz UXP-93774317fae6b7f370a43c50f8811e1f8e1f0d5c.zip | |
Don't search for directives that are never used alone
| -rw-r--r-- | python/mozbuild/mozbuild/mach_commands.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 78d9b40be..1bd5b8d34 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -543,7 +543,8 @@ class Build(MachCommandBase): # 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)" '\ + # We skip if, ifdef, ifndef, else, elif, elifdef and elifndef, because they are never used alone + grepcmd = 'grep -E -r "^(#|%)(define|endif|error|expand|filter|include|literal|undef|unfilter)" '\ + '--include=\*.{css,dtd,html,js,jsm,xhtml,xml,xul,manifest,properties,rdf} '\ + self.topobjdir + '/dist/bin | grep -v ".css:#"' grepresult = subprocess.Popen(grepcmd, stdout=subprocess.PIPE, shell=True).communicate()[0] |