Reduce redundencies in Basilisk branding

21 files changed, 146 insertions, 122 deletions

diff --git a/browser/branding/official/moz.build b/browser/branding/official/moz.build
index 7fda7496c..e3b7fd1ab 100644
--- a/browser/branding/official/moz.build
+++ b/browser/branding/official/moz.build
@@ -9,48 +9,5 @@ DIRS += ['content', 'locales']
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
-JS_PREFERENCE_FILES += [
-    'pref/firefox-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 += [
-        'appname.bmp',
-        'branding.nsi',
-        'document.ico',
-        'firefox.ico',
-        'newtab.ico',
-        'newwindow.ico',
-        'pbmode.ico',
-        'wizHeader.bmp',
-        'wizHeaderRTL.bmp',
-        'wizWatermark.bmp',
-     ]
-elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    BRANDING_FILES += [
-        'background.png',
-        'disk.icns',
-        'document.icns',
-        'dsstore',
-        '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',
-    ]
+include('../shared/branding.mozbuild')
+ApplicationBranding()
\ No newline at end of file
diff --git a/browser/branding/official/pref/firefox-branding.js b/browser/branding/official/pref/firefox-branding.js
index a3d6927bb..eb2bf489b 100644
--- a/browser/branding/official/pref/firefox-branding.js
+++ b/browser/branding/official/pref/firefox-branding.js
@@ -2,55 +2,43 @@
  * 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/. */
 
-pref("startup.homepage_override_url", "https://www.basilisk-browser.org/releasenotes.shtml");
-pref("startup.homepage_welcome_url", "http://www.basilisk-browser.org/firstrun/");
+#filter substitution
+#filter emptyLines
+
+// Set defines to construct URLs
+#define BRANDING_BASEURL basilisk-browser.org
+#define BRANDING_SITEURL www.@BRANDING_BASEURL@
+#define BRANDING_RELNOTESPATH releasenotes.shtml
+#define BRANDING_FIRSTRUNPATH firstrun/
+#define BRANDING_APPUPDATEURL aus.@BRANDING_BASEURL@
+#define BRANDING_APPUPDATEPATH ?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%
+
+// Shared Branding Preferences
+// XXX: These should REALLY go back to application preferences
+#include ../../shared/preferences.inc
+
+// Branding Specific Preferences
+pref("startup.homepage_override_url", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@");
+pref("startup.homepage_welcome_url", "http://@BRANDING_SITEURL@/@BRANDING_FIRSTRUNPATH@");
 pref("startup.homepage_welcome_url.additional", "");
 
-pref("app.update.url", "https://aus.basilisk-browser.org/?application=%PRODUCT%&version=%VERSION%&arch=%BUILD_TARGET%&buildid=%BUILD_ID%&channel=%CHANNEL%");
-// Interval: Time between checks for a new version (in seconds)
-pref("app.update.interval", 86400); // 1 day
-// The time interval between the downloading of mar file chunks in the
-// background (in seconds)
-// 0 means "download everything at once"
-pref("app.update.download.backgroundInterval", 0);
-// Give the user x seconds to react before showing the big UI. default=192 hours
-pref("app.update.promptWaitTime", 691200);
+// Version release notes
+pref("app.releaseNotesURL", "http://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@");
+
+// Vendor home page
+pref("app.vendorURL", "http://@BRANDING_SITEURL@/");
+
+pref("app.update.url", "https://@BRANDING_APPUPDATEURL@/@BRANDING_APPUPDATEPATH@");
+
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
-pref("app.update.url.manual", "https://www.basilisk-browser.org/");
+pref("app.update.url.manual", "https://@BRANDING_SITEURL@/");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "https://www.basilisk-browser.org/releasenotes.shtml");
+pref("app.update.url.details", "https://@BRANDING_SITEURL@/@BRANDING_RELNOTESPATH@");
 
 // Switch Application Updates off for now
 pref("app.update.enabled", false);
 
-// Version release notes
-pref("app.releaseNotesURL", "http://www.basilisk-browser.org/releasenotes.shtml");
-// Vendor home page
-pref("app.vendorURL", "http://www.basilisk-browser.org/");
-
-// The number of days a binary is permitted to be old
-// without checking for an update.  This assumes that
-// app.update.checkInstallTime is true.
-pref("app.update.checkInstallTime.days", 14);
-
-// Give the user x seconds to reboot before showing a badge on the hamburger
-// button. default=immediately
-pref("app.update.badgeWaitTime", 0);
-
-// Number of usages of the web console or scratchpad.
-// If this is less than 5, then pasting code into the web console or scratchpad is disabled
-pref("devtools.selfxss.count", 100);
-
-// Disable Google Safebrowsing by default. Without an API key, this won't work.
-pref("browser.safebrowsing.phishing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
-pref("browser.safebrowsing.downloads.enabled", false);
-pref("browser.safebrowsing.downloads.remote.enabled", false);
-// Disable the UI controls for it as well for Basilisk-official.
-pref("browser.safebrowsing.UI.enabled", false);
-
-// FxA override
-pref("general.useragent.override.accounts.firefox.com", "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:55.0) Gecko/20100101 Goanna/4.0 Basilisk/55.0.0");
-
+// Shared User Agent Overrides
+#include ../../shared/uaoverrides.inc
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/shared/branding.mozbuild
index f74724f4a..29d25094f 100644
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/shared/branding.mozbuild
@@ -5,42 +5,37 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 @template
-def FirefoxBranding():
-    JS_PREFERENCE_FILES += [
+def ApplicationBranding():
+    JS_PREFERENCE_PP_FILES += [
         'pref/firefox-branding.js',
     ]
 
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
         FINAL_TARGET_FILES['..'] += [
-            'firefox.VisualElementsManifest.xml',
+            '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',
-            'bgintro.bmp',
             'branding.nsi',
-            'clock.bmp',
             'document.ico',
             'firefox.ico',
-            'newtab.ico',
-            'newwindow.ico',
-            'particles.bmp',
-            'pbmode.ico',
-            'pencil-rtl.bmp',
-            'pencil.bmp',
             'wizHeader.bmp',
             'wizHeaderRTL.bmp',
             'wizWatermark.bmp',
          ]
     elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
         BRANDING_FILES += [
-            'background.png',
+            '../shared/dsstore',
             'disk.icns',
             'document.icns',
-            'dsstore',
+            'background.png',
             'firefox.icns',
         ]
     elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
@@ -56,3 +51,6 @@ def FirefoxBranding():
             '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']
\ No newline at end of file
diff --git a/browser/branding/official/dsstore b/browser/branding/shared/dsstore
index 8ea703674..8ea703674 100644
--- a/browser/branding/official/dsstore
+++ b/browser/branding/shared/dsstore
diff --git a/browser/branding/official/newtab.ico b/browser/branding/shared/newtab.ico
index a9b37c08c..a9b37c08c 100644
--- a/browser/branding/official/newtab.ico
+++ b/browser/branding/shared/newtab.ico
diff --git a/browser/branding/official/newwindow.ico b/browser/branding/shared/newwindow.ico
index 553720771..553720771 100644
--- a/browser/branding/official/newwindow.ico
+++ b/browser/branding/shared/newwindow.ico
diff --git a/browser/branding/official/pbmode.ico b/browser/branding/shared/pbmode.ico
index 47677c13f..47677c13f 100644
--- a/browser/branding/official/pbmode.ico
+++ b/browser/branding/shared/pbmode.ico
diff --git a/browser/branding/shared/preferences.inc b/browser/branding/shared/preferences.inc
new file mode 100644
index 000000000..08f6c950b
--- /dev/null
+++ b/browser/branding/shared/preferences.inc
@@ -0,0 +1,33 @@
+// Interval: Time between checks for a new version (in seconds)
+pref("app.update.interval", 86400); // 1 day
+
+// The time interval between the downloading of mar file chunks in the
+// background (in seconds)
+// 0 means "download everything at once"
+pref("app.update.download.backgroundInterval", 0);
+
+// Give the user x seconds to react before showing the big UI. default=192 hours
+pref("app.update.promptWaitTime", 691200);
+
+// The number of days a binary is permitted to be old
+// without checking for an update.  This assumes that
+// app.update.checkInstallTime is true.
+pref("app.update.checkInstallTime.days", 14);
+
+// Give the user x seconds to reboot before showing a badge on the hamburger
+// button. default=immediately
+pref("app.update.badgeWaitTime", 0);
+
+// Number of usages of the web console or scratchpad.
+// If this is less than 5, then pasting code into the web console or scratchpad is disabled
+pref("devtools.selfxss.count", 100);
+
+// Disable Google Safebrowsing by default. Without an API key, this won't work.
+pref("browser.safebrowsing.phishing.enabled", false);
+pref("browser.safebrowsing.malware.enabled", false);
+pref("browser.safebrowsing.downloads.enabled", false);
+pref("browser.safebrowsing.downloads.remote.enabled", false);
+
+// Disable the UI controls for it as well for Basilisk-official.
+pref("browser.safebrowsing.UI.enabled", false);
+
diff --git a/browser/branding/shared/uaoverrides.inc b/browser/branding/shared/uaoverrides.inc
new file mode 100644
index 000000000..13a89ed7f
--- /dev/null
+++ b/browser/branding/shared/uaoverrides.inc
@@ -0,0 +1,38 @@
+#define GUAO_PREF general.useragent.override

+

+#define GRE_VERSION @MOZILLA_UAVERSION_U@

+#define GRE_VERSION_SLICE Goanna/@GRE_VERSION@

+#define GRE_DATE_SLICE Goanna/20170101

+#define APP_SLICE Basilisk/@MOZ_APP_VERSION@

+

+#define GK_VERSION 52.0

+#define GK_SLICE Gecko/20100101

+#define FX_SLICE Firefox/@GK_VERSION@

+

+#ifdef XP_UNIX

+#ifndef XP_MACOSX

+#define OS_SLICE X11; Linux x86_64;

+#else

+#define OS_SLICE Macintosh; Intel Mac OS X 10.11;

+#endif

+#else

+#define OS_SLICE Windows NT 6.1; WOW64;

+#endif

+

+// FxA override

+pref("@GUAO_PREF@.accounts.firefox.com", "Mozilla/5.0 (@OS_SLICE@ rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@");

+

+// Required for domains that have proven unresponsive to requests from users

+

+// The never-ending Facebook debacle...

+

+// UA-Sniffing domains below are pending responses from their operators - temp workaround

+

+// The following requires native mode. Or it blocks.. "too old firefox", breakage, etc.

+

+// UA-Sniffing domains below have indicated no interest in supporting Pale Moon (BOO!)

+

+// UA-sniffing domains that are "app/vendor-specific" and do not like Pale Moon

+

+// The following domains do not like the Goanna slice

+

diff --git a/browser/branding/unofficial/firefox.VisualElementsManifest.xml b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml
index 7654e0ab7..7654e0ab7 100644
--- a/browser/branding/unofficial/firefox.VisualElementsManifest.xml
+++ b/browser/branding/unofficial/basilisk.VisualElementsManifest.xml
diff --git a/browser/branding/unofficial/bgintro.bmp b/browser/branding/unofficial/bgintro.bmp
deleted file mode 100644
index 9f2a0a6e0..000000000
--- a/browser/branding/unofficial/bgintro.bmp
+++ /dev/null
diff --git a/browser/branding/unofficial/clock.bmp b/browser/branding/unofficial/clock.bmp
deleted file mode 100644
index c74398edb..000000000
--- a/browser/branding/unofficial/clock.bmp
+++ /dev/null
diff --git a/browser/branding/unofficial/moz.build b/browser/branding/unofficial/moz.build
index 9045cee11..0d829fa5e 100644
--- a/browser/branding/unofficial/moz.build
+++ b/browser/branding/unofficial/moz.build
@@ -9,5 +9,5 @@ DIRS += ['content', 'locales']
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
-include('../branding-common.mozbuild')
-FirefoxBranding()
+include('../shared/branding.mozbuild')
+ApplicationBranding()
diff --git a/browser/branding/unofficial/newtab.ico b/browser/branding/unofficial/newtab.ico
deleted file mode 100644
index a9b37c08c..000000000
--- a/browser/branding/unofficial/newtab.ico
+++ /dev/null
diff --git a/browser/branding/unofficial/newwindow.ico b/browser/branding/unofficial/newwindow.ico
deleted file mode 100644
index 553720771..000000000
--- a/browser/branding/unofficial/newwindow.ico
+++ /dev/null
diff --git a/browser/branding/unofficial/particles.bmp b/browser/branding/unofficial/particles.bmp
deleted file mode 100644
index ab74ce047..000000000
--- a/browser/branding/unofficial/particles.bmp
+++ /dev/null
diff --git a/browser/branding/unofficial/pbmode.ico b/browser/branding/unofficial/pbmode.ico
deleted file mode 100644
index 47677c13f..000000000
--- a/browser/branding/unofficial/pbmode.ico
+++ /dev/null
diff --git a/browser/branding/unofficial/pencil-rtl.bmp b/browser/branding/unofficial/pencil-rtl.bmp
deleted file mode 100644
index e50d92db7..000000000
--- a/browser/branding/unofficial/pencil-rtl.bmp
+++ /dev/null
diff --git a/browser/branding/unofficial/pencil.bmp b/browser/branding/unofficial/pencil.bmp
deleted file mode 100644
index 252c10f41..000000000
--- a/browser/branding/unofficial/pencil.bmp
+++ /dev/null
diff --git a/browser/branding/unofficial/pref/firefox-branding.js b/browser/branding/unofficial/pref/firefox-branding.js
index b20a3a309..a5b617a53 100644
--- a/browser/branding/unofficial/pref/firefox-branding.js
+++ b/browser/branding/unofficial/pref/firefox-branding.js
@@ -2,32 +2,39 @@
  * 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/. */
 
+#filter substitution
+#filter emptyLines
+
+// Set defines to construct URLs
+#define BRANDING_BASEURL basilisk-browser.org
+#define BRANDING_SITEURL www.@BRANDING_BASEURL@
+
+// Shared Branding Preferences
+// XXX: These should REALLY go back to application preferences
+#include ../../shared/preferences.inc
+
+// Branding Specific Preferences
 pref("startup.homepage_override_url", "");
 pref("startup.homepage_welcome_url", "");
 pref("startup.homepage_welcome_url.additional", "");
-// The time interval between checks for a new version (in seconds)
-pref("app.update.interval", 86400); // 24 hours
-// The time interval between the downloading of mar file chunks in the
-// background (in seconds)
-pref("app.update.download.backgroundInterval", 60);
-// Give the user x seconds to react before showing the big UI. default=24 hours
-pref("app.update.promptWaitTime", 86400);
+
+// Version release notes
+pref("app.releaseNotesURL", "about:blank");
+
+// Vendor home page
+pref("app.vendorURL", "about:");
+
+pref("app.update.url", "");
+
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
-pref("app.update.url.manual", "https://nightly.mozilla.org");
+pref("app.update.url.manual", "about:");
 // A default value for the "More information about this update" link
 // supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "https://nightly.mozilla.org");
-
-// The number of days a binary is permitted to be old
-// without checking for an update.  This assumes that
-// app.update.checkInstallTime is true.
-pref("app.update.checkInstallTime.days", 2);
+pref("app.update.url.details", "about:");
 
-// Give the user x seconds to reboot before showing a badge on the hamburger
-// button. default=immediately
-pref("app.update.badgeWaitTime", 0);
+// Switch Application Updates off for unofficial branding
+pref("app.update.enabled", false);
 
-// Number of usages of the web console or scratchpad.
-// If this is less than 5, then pasting code into the web console or scratchpad is disabled
-pref("devtools.selfxss.count", 0);
+// Shared User Agent Overrides
+#include ../../shared/uaoverrides.inc
diff --git a/old-configure.in b/old-configure.in
index 386f805bc..045257cd8 100644
--- a/old-configure.in
+++ b/old-configure.in
@@ -842,7 +842,10 @@ fi
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION")
 AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION)
 AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION,"$MOZILLA_UAVERSION")
+AC_DEFINE_UNQUOTED(MOZILLA_UAVERSION_U,$MOZILLA_UAVERSION)
 AC_SUBST(MOZILLA_SYMBOLVERSION)
+AC_SUBST(MOZILLA_UAVERSION)
+AC_SUBST(MOZILLA_UAVERSION_U)
 
 MOZ_DOING_LTO(lto_is_enabled)