diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-05 06:27:57 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-05 06:27:57 -0500 |
| commit | 591ff8e63813bd4af50f4441d5bbc77c79d35dae (patch) | |
| tree | d60872a901ed822bfff9d1b47621af13d4a395cc /build | |
| parent | d2b88bf812a9f13ac02e5cd116ae19e34a198ada (diff) | |
| parent | b7852aab25b8ab06e0463bbe7c5d20cdd6f89750 (diff) | |
| download | UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.gz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.lz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.tar.xz UXP-591ff8e63813bd4af50f4441d5bbc77c79d35dae.zip | |
Merge branch 'branding-work'
Diffstat (limited to 'build')
| -rw-r--r-- | build/application.ini | 8 | ||||
| -rw-r--r-- | build/moz.build | 10 | ||||
| -rw-r--r-- | build/moz.configure/old.configure | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/build/application.ini b/build/application.ini index 6d27b4097..6b2e43a34 100644 --- a/build/application.ini +++ b/build/application.ini @@ -18,8 +18,16 @@ #include @TOPOBJDIR@/buildid.h #include @TOPOBJDIR@/source-repo.h [App] +#ifdef MC_OFFICIAL +Vendor=Moonchild Productions +#else Vendor=@MOZ_APP_VENDOR@ +#endif +#if defined(MOZ_PHOENIX) && defined(MC_PALEMOON) +Name=Pale Moon +#else Name=@MOZ_APP_BASENAME@ +#endif RemotingName=@MOZ_APP_REMOTINGNAME@ #ifdef MOZ_APP_DISPLAYNAME CodeName=@MOZ_APP_DISPLAYNAME@ diff --git a/build/moz.build b/build/moz.build index 7b414ce12..8d86b52bf 100644 --- a/build/moz.build +++ b/build/moz.build @@ -27,7 +27,17 @@ 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'] DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True + +if CONFIG['MC_OFFICAL']: + DEFINES['MC_OFFICAL'] = CONFIG['MC_OFFICAL'] + +if CONFIG['MC_BASILISK']: + DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK'] + +if CONFIG['MC_PALEMOON']: + DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON'] if CONFIG['MOZ_APP_PROFILE']: DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE'] diff --git a/build/moz.configure/old.configure b/build/moz.configure/old.configure index b32c3f7b7..581fa9c50 100644 --- a/build/moz.configure/old.configure +++ b/build/moz.configure/old.configure @@ -201,6 +201,7 @@ def old_configure_options(*options): '--enable-nfc', '--enable-nspr-build', '--enable-official-branding', + '--enable-official-vendor', '--enable-omx-plugin', '--enable-oom-breakpoint', '--enable-optimize', |