diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-06-03 12:18:05 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-06-03 12:18:05 +0200 |
| commit | 963472201e86caa2d05f358be39fa4cacaea0409 (patch) | |
| tree | 398f84e610ebe1662f893a0539134caf3ad5456e /python/mozbuild | |
| parent | 2eeab8f39c865c73eb3af26fb996f246313a109e (diff) | |
| parent | dd7046209e4e2e51f48e1499366692e7e8b78ff3 (diff) | |
| download | UXP-963472201e86caa2d05f358be39fa4cacaea0409.tar UXP-963472201e86caa2d05f358be39fa4cacaea0409.tar.gz UXP-963472201e86caa2d05f358be39fa4cacaea0409.tar.lz UXP-963472201e86caa2d05f358be39fa4cacaea0409.tar.xz UXP-963472201e86caa2d05f358be39fa4cacaea0409.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
Diffstat (limited to 'python/mozbuild')
| -rw-r--r-- | python/mozbuild/mozbuild/mach_commands.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index f654db769..1bd5b8d34 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -541,6 +541,16 @@ class Build(MachCommandBase): # as when doing OSX Universal builds) pass + # 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 + # 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] + if grepresult: + print('\nERROR: preprocessor was not applied to the following files:\n\n' + grepresult) + return status @Command('configure', category='build', |