From f2bc0785b9852dae1b6f5c700fbca41e573aa916 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 13 Apr 2018 22:06:20 +0200 Subject: 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. --- config/version.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config/version.mk') diff --git a/config/version.mk b/config/version.mk index 1b9f68afa..ef8eca9d0 100644 --- a/config/version.mk +++ b/config/version.mk @@ -16,7 +16,7 @@ ifndef RESFILE RCFILE=./module.rc RESFILE=./module.res _RC_STRING = -QUIET 1 -DEPTH $(DEPTH) -TOPSRCDIR $(MOZILLA_DIR) -OBJDIR . -SRCDIR $(srcdir) -DISPNAME $(MOZ_APP_DISPLAYNAME) -APPVERSION $(MOZ_APP_VERSION) -ifdef MOZILLA_OFFICIAL +ifdef MC_OFFICIAL _RC_STRING += -OFFICIAL 1 endif ifdef MOZ_DEBUG -- cgit v1.2.3