Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 56 insertions, 0 deletions

diff --git a/application/basilisk/branding/shared/branding.mozbuild b/application/basilisk/branding/shared/branding.mozbuild
new file mode 100644
index 000000000..823439c3f
--- /dev/null
+++ b/application/basilisk/branding/shared/branding.mozbuild
@@ -0,0 +1,56 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+@template
+def ApplicationBranding():
+    JS_PREFERENCE_PP_FILES += [
+        'pref/basilisk-branding.js',
+    ]
+
+    if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+        FINAL_TARGET_FILES['..'] += [
+            'basilisk.VisualElementsManifest.xml',
+        ]
+        FINAL_TARGET_FILES.VisualElements += [
+            'VisualElements_150.png',
+            'VisualElements_70.png',
+        ]
+        BRANDING_FILES += [
+            '../shared/newtab.ico',
+            '../shared/newwindow.ico',
+            '../shared/pbmode.ico',
+            'appname.bmp',
+            'branding.nsi',
+            'document.ico',
+            'firefox.ico',
+            'wizHeader.bmp',
+            'wizHeaderRTL.bmp',
+            'wizWatermark.bmp',
+         ]
+    elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+        BRANDING_FILES += [
+            '../shared/dsstore',
+            'background.png',
+            'disk.icns',
+            'document.icns',
+            'firefox.icns',
+        ]
+    elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
+        BRANDING_FILES += [
+            'default16.png',
+            'default32.png',
+            'default48.png',
+            'mozicon128.png',
+        ]
+        FINAL_TARGET_FILES.icons += ['mozicon128.png']
+        FINAL_TARGET_FILES.chrome.icons.default += [
+            'default16.png',
+            'default32.png',
+            'default48.png',
+        ]
+    DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+    DEFINES['MOZ_BRANDING_DIRECTORY'] = CONFIG['MOZ_BRANDING_DIRECTORY']
+    DEFINES['MOZILLA_UAVERSION_U'] = CONFIG['MOZILLA_UAVERSION_U']