diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-03-28 10:48:10 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2020-03-28 10:48:10 -0400 |
| commit | 6676a7d6f1feb9ca9013bf01281ca01f4a8cf4f3 (patch) | |
| tree | a0743127de1d280accbfdab8735071176e1dcc62 | |
| parent | 9a31bea935396ac022c649c070b68c062cf2e863 (diff) | |
| parent | 070eca4c2340abfb0e2e6830d53ade1318525e5a (diff) | |
| download | UXP-6676a7d6f1feb9ca9013bf01281ca01f4a8cf4f3.tar UXP-6676a7d6f1feb9ca9013bf01281ca01f4a8cf4f3.tar.gz UXP-6676a7d6f1feb9ca9013bf01281ca01f4a8cf4f3.tar.lz UXP-6676a7d6f1feb9ca9013bf01281ca01f4a8cf4f3.tar.xz UXP-6676a7d6f1feb9ca9013bf01281ca01f4a8cf4f3.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | python/mozbuild/mozbuild/mach_commands.py | 15 |
2 files changed, 1 insertions, 16 deletions
@@ -36,4 +36,4 @@ improvement patches upstream to its origin to mutually improve the platform and a future for XUL. ## Looking for Pale Moon and Basilisk? -As of [`Issue #969`](https://github.com/MoonchildProductions/UXP/issues/969), release versions `29.0.0` and `2020.03.04` respectively, they have been split off into their own dedicated repositories located at [`MoonchildProductions/Pale-Moon`](https://github.com/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://github.com/MoonchildProductions/Basilisk). +As of [`Issue #969`](https://github.com/MoonchildProductions/UXP/issues/969), release versions `28.9.0` and `2020.03.04` respectively, they have been split off into their own dedicated repositories located at [`MoonchildProductions/Pale-Moon`](https://github.com/MoonchildProductions/Pale-Moon) and [`MoonchildProductions/Basilisk`](https://github.com/MoonchildProductions/Basilisk). diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 5933a5aa9..6e57ab5ae 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -541,21 +541,6 @@ 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 - # - # The original version of this script only worked with GNU grep because of the --include flag. - # Not a problem in and of itself, except that it didn't take TOOLCHAIN_PREFIX and simply assumed - # all operating systems use GNU grep as the system grep (often it's called ggrep or something). - # This script is a bit slower, but should do the same thing on all Unix platforms. - - grepcmd = 'find ' + self.topobjdir + '/dist/bin' + ' -name \'\*.{css,dtd,html,js,jsm,xhtml,xml,xul,manifest,properties,rdf}\' ' + '| xargs grep -E "^(#|%)(define|endif|error|expand|filter|include|literal|undef|unfilter)" '\ - + '| awk "/\.css:%/ || (!/\.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', |