Use application specific application.ini

This commit is contained in:
NTD 2018-05-05 15:09:57 -04:00 committed by Roy Tam
commit b7158e06ac
4 changed files with 115 additions and 73 deletions

View file

@ -18,9 +18,15 @@ else:
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
DIRS += ['annotationProcessors']
for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
'ACCEPTED_MAR_CHANNEL_IDS', 'MOZ_APP_REMOTINGNAME'):
for var in ('GRE_MILESTONE',
'MOZ_APP_VERSION',
'MOZ_APP_BASENAME',
'MOZ_APP_VENDOR',
'MOZ_APP_ID',
'MAR_CHANNEL_ID',
'ACCEPTED_MAR_CHANNEL_IDS',
'MOZ_APP_REMOTINGNAME',
'MOZ_BUILD_APP'):
DEFINES[var] = CONFIG[var]
if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']:
@ -33,15 +39,6 @@ if CONFIG['MOZ_PHOENIX']:
if CONFIG['MC_OFFICIAL']:
DEFINES['MC_OFFICIAL'] = CONFIG['MC_OFFICIAL']
if CONFIG['MC_BASILISK']:
DEFINES['MC_BASILISK'] = 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']
@ -86,6 +83,7 @@ if CONFIG['MOZ_APP_BASENAME']:
appini.script = 'appini_header.py'
appini.inputs = ['!/dist/bin/application.ini']
DEFINES['TOPSRCDIR'] = TOPSRCDIR
DEFINES['TOPOBJDIR'] = TOPOBJDIR
# NOTE: Keep .gdbinit in the topsrcdir for people who run gdb from the topsrcdir.