diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-13 22:06:20 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-13 22:06:20 +0200 |
| commit | f2bc0785b9852dae1b6f5c700fbca41e573aa916 (patch) | |
| tree | 22b8e069753b338ae8164dc1341f9f51804f1fb1 /application | |
| parent | 501db456d4d84a9345374e9b15775f6e10883a41 (diff) | |
| download | UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar.gz UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar.lz UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.tar.xz UXP-f2bc0785b9852dae1b6f5c700fbca41e573aa916.zip | |
Convert MOZILLA_OFFICIAL conditionals to MC_OFFICIAL where needed.
- `--enable-official-branding` implies `MC_OFFICIAL` (no need to specifically set it)
- `--enable-official-vendor` can be used to set `MC_OFFICIAL` on builds without `--enable-official-branding` that should still be considered official release versions.
- `MC_OFFICIAL` implies `--enable-release`, meaning `DEVELOPER_OPTIONS` isn't set
- `MC_OFFICIAL` makes `nsXULAppInfo.getIsOfficial` return `true`
- `MC_OFFICIAL` makes `AppConstants.MOZILLA_OFFICIAL` (for compatibility in extensions) and `AppConstants.MC_OFFICIAL` return `true`
- Optional, for the time being: `MOZILLA_OFFICIAL` is still present in some places in case someone wants to build a Mozilla-alike official application and has the rights and necessary keys to use Mozilla-official third-party services. This must always be combined with `MC_OFFICIAL` to have a sane combination of defines. This may be removed in the future.
Diffstat (limited to 'application')
| -rw-r--r-- | application/palemoon/modules/AboutHomeUtils.jsm | 2 | ||||
| -rw-r--r-- | application/palemoon/modules/moz.build | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/application/palemoon/modules/AboutHomeUtils.jsm b/application/palemoon/modules/AboutHomeUtils.jsm index 1d4070eaf..72712e1f3 100644 --- a/application/palemoon/modules/AboutHomeUtils.jsm +++ b/application/palemoon/modules/AboutHomeUtils.jsm @@ -44,7 +44,7 @@ this.AboutHomeUtils = { return !Services.prefs.getBoolPref("browser.EULA.override"); } catch (e) { } -#ifndef MOZILLA_OFFICIAL +#ifndef MC_OFFICIAL // Non-official builds shouldn't show the notification. return false; #endif diff --git a/application/palemoon/modules/moz.build b/application/palemoon/modules/moz.build index 7620b9862..f7717ef89 100644 --- a/application/palemoon/modules/moz.build +++ b/application/palemoon/modules/moz.build @@ -37,5 +37,8 @@ EXTRA_PP_JS_MODULES += [ 'RecentWindow.jsm', ] +# Pass down 'official build' flags +if CONFIG['MC_OFFICIAL']: + DEFINES['MC_OFFICIAL'] = 1 if CONFIG['MOZILLA_OFFICIAL']: - DEFINES['MOZILLA_OFFICIAL'] = 1
\ No newline at end of file + DEFINES['MOZILLA_OFFICIAL'] = 1 |