Remove stub installer - Part 2: Basilisk

browser/branding/official/moz.build

@@ -23,17 +23,12 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
     ]
     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',

browser/installer/windows/Makefile.in

@@ -11,9 +11,7 @@ INSTALLER_FILES = \
 	app.tag \
 	nsis/installer.nsi \
 	nsis/uninstaller.nsi \
-	nsis/stub.nsi \
 	nsis/shared.nsh \
-	stub.tag \
 	$(NULL)
 
 ifdef MOZ_MAINTENANCE_SERVICE
@@ -25,11 +23,6 @@ endif
 BRANDING_FILES = \
 	branding.nsi \
 	appname.bmp \
-	bgintro.bmp \
-	clock.bmp \
-	particles.bmp \
-	pencil.bmp \
-	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \

browser/installer/windows/app.tag

@@ -1,4 +1,4 @@
 ;!@Install@!UTF-8!
-Title="Mozilla Firefox"
+Title="Basilisk"
 RunProgram="setup.exe"
 ;!@InstallEnd@!

browser/installer/windows/nsis/defines.nsi.in

@@ -55,14 +55,6 @@
 !define UpdateChannel "@MOZ_UPDATE_CHANNEL@"
 !endif
 
-# Due to official and beta using the same branding this is needed to
-# differentiante between the url used by the stub for downloading.
-!if "@MOZ_UPDATE_CHANNEL@" == "beta"
-!define BETA_UPDATE_CHANNEL
-!endif
-
-!define BaseURLStubPing "http://download-stats.mozilla.org/stub"
-
 # ARCH is used when it is necessary to differentiate the x64 registry keys from
 # the x86 registry keys (e.g. the uninstall registry key).
 #ifdef HAVE_64BIT_BUILD
@@ -93,12 +85,6 @@ VIAddVersionKey "ProductVersion"  "${AppVersion}"
 # Comments is not used but left below commented out for future reference
 # VIAddVersionKey "Comments"        "Comments"
 
-# It isn't possible to get the size of the installation prior to downloading
-# so the stub installer uses an estimate. The size is derived from the size of
-# the complete installer, the size of the extracted complete installer, and at
-# least 15 MB additional for working room.
-!define APPROXIMATE_REQUIRED_SPACE_MB "145"
-
 # Control positions in Dialog Units so they are placed correctly with
 # non-default DPI settings
 !define OPTIONS_ITEM_EDGE_DU 90u

browser/installer/windows/stub.tag

@@ -1,4 +0,0 @@
-;!@Install@!UTF-8!
-Title="Mozilla Firefox"
-RunProgram="setup-stub.exe"
-;!@InstallEnd@!