diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-04-22 18:36:16 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-04-22 18:36:16 -0400 |
| commit | 3c48cc85098587c7f3a6cefe133a94468927d100 (patch) | |
| tree | c5b5f16f88b9241ca2d8bb6e24e161b515eb5631 | |
| parent | 8ae405b6934a1e04cd8c294731175e0f66c3ba29 (diff) | |
| download | UXP-3c48cc85098587c7f3a6cefe133a94468927d100.tar UXP-3c48cc85098587c7f3a6cefe133a94468927d100.tar.gz UXP-3c48cc85098587c7f3a6cefe133a94468927d100.tar.lz UXP-3c48cc85098587c7f3a6cefe133a94468927d100.tar.xz UXP-3c48cc85098587c7f3a6cefe133a94468927d100.zip | |
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
| -rw-r--r-- | build/application.ini | 6 | ||||
| -rw-r--r-- | build/moz.build | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/build/application.ini b/build/application.ini index e60f86b69..c3ab3abdd 100644 --- a/build/application.ini +++ b/build/application.ini @@ -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@ diff --git a/build/moz.build b/build/moz.build index f25e5cfa5..d96724cad 100644 --- a/build/moz.build +++ b/build/moz.build @@ -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'] |