[PALEMOON] Fix Branding Build Files

This commit is contained in:
NTD 2018-04-04 05:54:48 -04:00 • committed by Roy Tam
commit 1bc40f51f6
4 changed files with 62 additions and 47 deletions

View file

@ -4,4 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
include('../shared/branding.mozbuild') include('../shared/branding.mozbuild')
ApplicationBranding()

View file

@ -4,16 +4,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales'] @template
def ApplicationBranding():
DIST_SUBDIR = 'browser' JS_PREFERENCE_FILES += [
export('DIST_SUBDIR')
JS_PREFERENCE_FILES += [
'pref/palemoon-branding.js', 'pref/palemoon-branding.js',
] ]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
FINAL_TARGET_FILES['..'] += [ FINAL_TARGET_FILES['..'] += [
'palemoon.VisualElementsManifest.xml', 'palemoon.VisualElementsManifest.xml',
] ]
@ -33,7 +30,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
'wizHeaderRTL.bmp', 'wizHeaderRTL.bmp',
'wizWatermark.bmp', 'wizWatermark.bmp',
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
BRANDING_FILES += [ BRANDING_FILES += [
'../shared/background.png', '../shared/background.png',
'disk.icns', 'disk.icns',
@ -41,7 +38,7 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
'dsstore', 'dsstore',
'firefox.icns', 'firefox.icns',
] ]
elif CONFIG['MOZ_WIDGET_GTK']: elif CONFIG['MOZ_WIDGET_GTK']:
BRANDING_FILES += [ BRANDING_FILES += [
'default16.png', 'default16.png',
'default32.png', 'default32.png',
@ -49,7 +46,7 @@ elif CONFIG['MOZ_WIDGET_GTK']:
'mozicon128.png', 'mozicon128.png',
] ]
DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY'] DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY']
DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U'] DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']
DEFINES['MOZILLA_COMPATVERSION_U'] = CONFIG['MOZILLA_COMPATVERSION_U'] DEFINES['MOZILLA_COMPATVERSION_U'] = CONFIG['MOZILLA_COMPATVERSION_U']

View file

@ -4,4 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
include('../shared/branding.mozbuild') include('../shared/branding.mozbuild')
ApplicationBranding()

View file

@ -4,4 +4,10 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
DIRS += ['content', 'locales']
DIST_SUBDIR = 'browser'
export('DIST_SUBDIR')
include('../shared/branding.mozbuild') include('../shared/branding.mozbuild')
ApplicationBranding()