diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-01-26 20:43:29 -0600 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-01-26 20:43:29 -0600 |
| commit | 2e6aea17c8c911f94a4099224bbc0e6cf333ae18 (patch) | |
| tree | acb399a7e2d1e9e1c3070ff3b7a524c94d32c23d /build | |
| parent | 418e0ad89d2e14472f4f3a889e48c3deeb4be867 (diff) | |
| download | aura-central-2e6aea17c8c911f94a4099224bbc0e6cf333ae18.tar.gz | |
No Issue - Fix common application.ini(.h) for MOZ_APP_BASENAME and MOZ_APP_VENDOR for MCP and BinOC
So parts of the build system are STILL intolerant to spaces unlike previously indicated so handle this more gracefully than in the past and forget about this minor annoyance.
Diffstat (limited to 'build')
| -rw-r--r-- | build/moz.build | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/build/moz.build b/build/moz.build index 6567dd944..2509db1b3 100644 --- a/build/moz.build +++ b/build/moz.build @@ -22,8 +22,9 @@ for var in ('GRE_MILESTONE', 'MOZ_BUILD_APP'): DEFINES[var] = CONFIG[var] -if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']: - DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] +if CONFIG['MOZ_APP_DISPLAYNAME']: + if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']: + DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] if CONFIG['MOZ_PHOENIX']: DEFINES['MOZ_PHOENIX'] = CONFIG['MOZ_PHOENIX'] @@ -40,6 +41,14 @@ for var in ('MOZ_PROFILE_MIGRATOR', if CONFIG[var]: DEFINES[var] = True +if CONFIG['MOZ_APP_BASENAME'] in ('Palemoon', 'PaleMoon'): + DEFINES['MOZ_APP_BASENAME'] = "Pale Moon" + +if CONFIG['MOZ_APP_VENDOR'] in ('Moonchild','MoonchildProductions'): + DEFINES['MOZ_APP_VENDOR'] = "Moonchild Productions" +elif CONFIG['MOZ_APP_VENDOR'] in ('BinOC','Binary Outcast'): + DEFINES['MOZ_APP_VENDOR'] = "Binary Outcast" + if CONFIG['MOZ_PHOENIX']: PYTHON_UNIT_TESTS += [ 'compare-mozconfig/compare-mozconfigs-wrapper.py', |