Update branding

browser/branding/official/branding.nsi

@@ -8,24 +8,24 @@
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
-!define BrandFullNameInternal "Mozilla Firefox"
+!define BrandFullNameInternal "Basilisk"
-!define CompanyName           "Mozilla Corporation"
+!define CompanyName           "Moonchild Productions"
-!define URLInfoAbout          "https://www.mozilla.org"
+!define URLInfoAbout          "https://www.basilisk-browser.org"
-!define URLUpdateInfo         "https://www.mozilla.org/firefox/${AppVersion}/releasenotes"
+!define URLUpdateInfo         "https://www.basilisk-browser.org/releasenotes.shtml"
-!define HelpLink              "https://support.mozilla.org"
+!define HelpLink              "https://www.basilisk-browser.org"
 
 ; The OFFICIAL define is a workaround to support different urls for Release and
 ; Beta since they share the same branding when building with other branches that
 ; set the update channel to beta.
 !define OFFICIAL
-!define URLStubDownload "http://download.mozilla.org/?os=win&lang=${AB_CD}&product=firefox-latest"
+!define URLStubDownload ""
-!define URLManualDownload "https://www.mozilla.org/${AB_CD}/firefox/installer-help/?channel=release&installer_lang=${AB_CD}"
+!define URLManualDownload ""
-!define URLSystemRequirements "https://www.mozilla.org/firefox/system-requirements/"
+!define URLSystemRequirements ""
 !define Channel "release"
 
 # The installer's certificate name and issuer expected by the stub installer
-!define CertNameDownload   "Mozilla Corporation"
+!define CertNameDownload   ""
-!define CertIssuerDownload "DigiCert SHA2 Assured ID Code Signing CA"
+!define CertIssuerDownload ""
 
 # Dialog units are used so the UI displays correctly with the system's DPI
 # settings.

browser/branding/official/configure.sh

@@ -2,4 +2,4 @@
 # 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/.
 
-MOZ_APP_DISPLAYNAME=Firefox
+MOZ_APP_DISPLAYNAME=Basilisk

browser/branding/official/content/aboutDialog.css

@@ -28,8 +28,14 @@
 #rightBox {
   margin-left: 30px;
   margin-right: 30px;
+  background-image: url("chrome://branding/content/about-wordmark.png");
+  background-repeat: no-repeat;
+  /* padding-top creates room for the wordmark */
+  padding-top: 38px;
+  margin-top:20px;
 }
 
+
 #updateDeck > hbox > label:not([class="text-link"]) {
   color: #909090;
 }

browser/branding/official/locales/en-US/brand.dtd

@@ -2,8 +2,8 @@
    - 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/. -->
 
-<!ENTITY  brandShorterName      "Firefox">
+<!ENTITY  brandShorterName      "Basilisk">
-<!ENTITY  brandShortName        "Firefox">
+<!ENTITY  brandShortName        "Basilisk">
-<!ENTITY  brandFullName         "Mozilla Firefox">
+<!ENTITY  brandFullName         "Basilisk">
-<!ENTITY  vendorShortName       "Mozilla">
+<!ENTITY  vendorShortName       "Moonchild">
-<!ENTITY  trademarkInfo.part1   "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+<!ENTITY  trademarkInfo.part1   "Basilisk, Basilisk Browser and the Basilisk logos are trademarks of Moonchild Productions.">

browser/branding/official/locales/en-US/brand.properties

@@ -2,12 +2,12 @@
 # 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/.
 
-brandShorterName=Firefox
+brandShorterName=Basilisk
-brandShortName=Firefox
+brandShortName=Basilisk
-brandFullName=Mozilla Firefox
+brandFullName=Basilisk
-vendorShortName=Mozilla
+vendorShortName=Moonchild
 
-homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+homePageSingleStartMain=Internal home page with search.
 homePageImport=Import your home page from %S
 
 homePageMigrationPageTitle=Home Page Selection

browser/branding/official/moz.build

@@ -9,5 +9,53 @@ DIRS += ['content', 'locales']
 DIST_SUBDIR = 'browser'
 export('DIST_SUBDIR')
 
-include('../branding-common.mozbuild')
+JS_PREFERENCE_FILES += [
-FirefoxBranding()
+    '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',
+        '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',
+        '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',
+    ]

browser/branding/official/pref/firefox-branding.js

@@ -2,11 +2,13 @@
  * 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", "");
+pref("startup.homepage_override_url", "https://www.basilisk-browser.org/releasenotes.shtml");
-pref("startup.homepage_welcome_url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/firstrun/");
+pref("startup.homepage_welcome_url", "http://www.basilisk-browser.org/firstrun/");
 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", 43200); // 12 hours
+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"
@@ -15,15 +17,23 @@ pref("app.update.download.backgroundInterval", 0);
 pref("app.update.promptWaitTime", 691200);
 // URL user can browse to manually if for some reason all update installation
 // attempts fail.
-pref("app.update.url.manual", "https://www.mozilla.org/firefox/");
+pref("app.update.url.manual", "https://www.basilisk-browser.org/");
 // 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.mozilla.org/%LOCALE%/firefox/notes");
+pref("app.update.url.details", "https://www.basilisk-browser.org/releasenotes.shtml");
+
+// 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", 63);
+pref("app.update.checkInstallTime.days", 14);
 
 // Give the user x seconds to reboot before showing a badge on the hamburger
 // button. default=immediately
@@ -31,6 +41,16 @@ 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", 0);
+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");
 
-pref("app.update.enabled", false);

browser/config/version.txt

@@ -1 +1 @@
-52.6.0
+55.0.0

browser/config/version_display.txt

@@ -1 +1 @@
-52.6.0
+55.0.0

browser/confvars.sh

@@ -3,8 +3,8 @@
 # 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/.
 
-MOZ_APP_BASENAME=Firefox
+MOZ_APP_BASENAME=Basilisk
-MOZ_APP_VENDOR=Mozilla
+MOZ_APP_VENDOR=Moonchild
 MOZ_PHOENIX=1
 MC_BASILISK=1
 MOZ_UPDATER=1
@@ -15,42 +15,38 @@ if test "$OS_ARCH" = "WINNT" -o \
 fi
 
 if test "$OS_ARCH" = "WINNT"; then
-  MOZ_MAINTENANCE_SERVICE=1
+  MOZ_MAINTENANCE_SERVICE=
-  if ! test "$HAVE_64BIT_BUILD"; then
-    if test "$MOZ_UPDATE_CHANNEL" = "nightly" -o \
-            "$MOZ_UPDATE_CHANNEL" = "aurora" -o \
-            "$MOZ_UPDATE_CHANNEL" = "beta" -o \
-            "$MOZ_UPDATE_CHANNEL" = "beta-dev" -o \
-            "$MOZ_UPDATE_CHANNEL" = "release" -o \
-            "$MOZ_UPDATE_CHANNEL" = "release-dev"; then
-      if ! test "$MOZ_DEBUG"; then
-        MOZ_STUB_INSTALLER=1
-      fi
-    fi
-  fi
 fi
 
-# Enable building ./signmar and running libmar signature tests
+# For Basilisk we want to use 55.0.YYYY.MM.DD as MOZ_APP_VERSION in release
-MOZ_ENABLE_SIGNMAR=1
+# builds so add-on developers have something to target while maintaining
+# Firefox compatiblity.
+# To enable add "export BASILISK_VERSION=1" to the .mozconfig file.
+# However, this will cause a full rebuild at 00:00 UTC every day so
+# don't export the variable if you are in development or don't care.
+# When not exported we fall back the value in the version*.txt file.
+if test -n "$BASILISK_VERSION" ; then
+    MOZ_APP_VERSION=55.0.`date --utc '+%Y.%m.%d'`
+    MOZ_APP_VERSION_DISPLAY=`date --utc '+%Y.%m.%d'`
+else
+    MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
+    MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
+fi
 
-MOZ_APP_VERSION=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version.txt`
-MOZ_APP_VERSION_DISPLAY=`cat ${_topsrcdir}/$MOZ_BUILD_APP/config/version_display.txt`
 MOZ_EXTENSIONS_DEFAULT=" gio"
+
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # MOZ_BRANDING_DIRECTORY is the default branding directory used when none is
 # specified. It should never point to the "official" branding directory.
-# For mozilla-beta, mozilla-release, or mozilla-central repositories, use
+MOZ_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/unofficial
-# "unofficial" branding.
+MOZ_OFFICIAL_BRANDING_DIRECTORY=$MOZ_BUILD_APP/branding/official
-# For the mozilla-aurora repository, use "aurora".
-MOZ_BRANDING_DIRECTORY=browser/branding/unofficial
-MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official
 MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384}
 # This should usually be the same as the value MAR_CHANNEL_ID.
 # If more than one ID is needed, then you should use a comma separated list
 # of values.
-ACCEPTED_MAR_CHANNEL_IDS=firefox-mozilla-esr
+ACCEPTED_MAR_CHANNEL_IDS=basilisk-release
 # The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "
-MAR_CHANNEL_ID=firefox-mozilla-esr
+MAR_CHANNEL_ID=basilisk-release
 MOZ_PROFILE_MIGRATOR=1
 MOZ_APP_STATIC_INI=1
 MOZ_WEBGL_CONFORMANT=1
@@ -58,8 +54,9 @@ MOZ_JSDOWNLOADS=1
 MOZ_RUST_MP4PARSE=1
 MOZ_RUST_URLPARSE=1
 
-# Enable checking that add-ons are signed by the trusted root
+# Disable checking that add-ons are signed by the trusted root
-MOZ_ADDON_SIGNING=1
+MOZ_ADDON_SIGNING=0
+MOZ_REQUIRE_SIGNING=0
 
 # Include the DevTools client, not just the server (which is the default)
 MOZ_DEVTOOLS=all