Resolve issues with application.ini not allowing non-mcp applications to be official and have their own vendor

Also add BinOC cause two words breaks the build system
This commit is contained in:
NTD 2018-04-22 18:36:16 -04:00 committed by Roy Tam
commit b72012f9c2
2 changed files with 9 additions and 4 deletions

View file

@ -18,12 +18,14 @@
#include @TOPOBJDIR@/buildid.h
#include @TOPOBJDIR@/source-repo.h
[App]
#ifdef MC_OFFICIAL
#if defined(MC_OFFICIAL) && defined(MC_PALEMOON) || defined(MC_BASILISK)
Vendor=Moonchild Productions
#elif defined(MC_OFFICIAL) && defined(BINOC_BOREALIS)
Vendor=Binary Outcast
#else
Vendor=@MOZ_APP_VENDOR@
#endif
#if defined(MOZ_PHOENIX) && defined(MC_PALEMOON)
#if defined(MC_OFFICIAL) && defined(MC_PALEMOON)
Name=Pale Moon
#else
Name=@MOZ_APP_BASENAME@

View file

@ -30,8 +30,8 @@ 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_OFFICIAL']:
DEFINES['MC_OFFICIAL'] = CONFIG['MC_OFFICIAL']
if CONFIG['MC_BASILISK']:
DEFINES['MC_BASILISK'] = CONFIG['MC_BASILISK']
@ -39,6 +39,9 @@ if CONFIG['MC_BASILISK']:
if CONFIG['MC_PALEMOON']:
DEFINES['MC_PALEMOON'] = CONFIG['MC_PALEMOON']
if CONFIG['BINOC_BOREALIS']:
DEFINES['BINOC_BOREALIS'] = CONFIG['BINOC_BOREALIS']
if CONFIG['MOZ_APP_PROFILE']:
DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']