diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-05-05 15:09:57 -0400 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-05-05 15:09:57 -0400 |
| commit | 1fbd4d95796ff084e84e4b9e32d1c23aa2672825 (patch) | |
| tree | ac0087e5574132c20e9d7758e2cc8151c8ded912 /build/moz.build | |
| parent | e899e796245a19235306a4158dfb8892adf752cf (diff) | |
| download | UXP-1fbd4d95796ff084e84e4b9e32d1c23aa2672825.tar UXP-1fbd4d95796ff084e84e4b9e32d1c23aa2672825.tar.gz UXP-1fbd4d95796ff084e84e4b9e32d1c23aa2672825.tar.lz UXP-1fbd4d95796ff084e84e4b9e32d1c23aa2672825.tar.xz UXP-1fbd4d95796ff084e84e4b9e32d1c23aa2672825.zip | |
Use application specific application.ini
Diffstat (limited to 'build/moz.build')
| -rw-r--r-- | build/moz.build | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/build/moz.build b/build/moz.build index d96724cad..616a64c3f 100644 --- a/build/moz.build +++ b/build/moz.build @@ -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. |