Verified Commit f325a6bc authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 4234: Use the Firefox Update Process for Base Browser. 

Bug 41668: Port some updater patches to Base Browser

Rename TOR_BROWSER_UPDATE to BASE_BROWSER_UPDATE.
Also, do not change app.update.auto in firefox.js, but add it to 001.
parent 27e74537

browser/app/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ tools repackage:: $(DIST)/bin/$(MOZ_APP_NAME) $(objdir)/macbuild/Contents/MacOS- 
	rsync -aL $(DIST)/bin/$(MOZ_APP_NAME) '$(dist_dest)/Contents/MacOS'

	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/firefox.icns '$(dist_dest)/Contents/Resources/firefox.icns'

	cp -RL $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/document.icns '$(dist_dest)/Contents/Resources/document.icns'

ifndef TOR_BROWSER_UPDATE

ifndef BASE_BROWSER_UPDATE

	$(MKDIR) -p '$(dist_dest)/Contents/Library/LaunchServices'

ifdef MOZ_UPDATER

	mv -f '$(dist_dest)/Contents/MacOS/updater.app/Contents/MacOS/org.mozilla.updater' '$(dist_dest)/Contents/Library/LaunchServices'

browser/app/profile/firefox.js

+8 −3
Original line number Diff line number Diff line
@@ -139,9 +139,14 @@ pref("app.update.elevation.promptMaxAttempts", 2); 
// an update is being downloaded.

pref("app.update.notifyDuringDownload", false);



// If set to true, the Update Service will automatically download updates if the

// user can apply updates.

// user can apply updates. This pref is no longer used on Windows, except as the

// default value to migrate to the new location that this data is now stored

// (which is in a file in the update directory). Because of this, this pref

// should no longer be used directly. Instead, getAppUpdateAutoEnabled and

// getAppUpdateAutoEnabled from UpdateUtils.jsm should be used.

#ifndef XP_WIN

  pref("app.update.auto", true);

#endif



// If set to true, the Update Service will apply updates in the background

// when it finishes downloading them.

browser/base/content/aboutDialog-appUpdater.js

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ appUpdater.prototype = { 
      if (aChildID == "downloadAndInstall") {

        let updateVersion = gAppUpdater.update.displayVersion;

        // Include the build ID if this is an "a#" (nightly or aurora) build

        if (!AppConstants.TOR_BROWSER_UPDATE && /a\d+$/.test(updateVersion)) {

        if (!AppConstants.BASE_BROWSER_UPDATE && /a\d+$/.test(updateVersion)) {

          let buildID = gAppUpdater.update.buildID;

          let year = buildID.slice(0, 4);

          let month = buildID.slice(4, 6);

browser/base/moz.build

+3 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ if CONFIG["OS_ARCH"] == "WINNT" and CONFIG["MOZ_DEFAULT_BROWSER_AGENT"]: 
    # Impacts `/toolkit/content/license.html`.

    DEFINES["MOZ_DEFAULT_BROWSER_AGENT"] = True



if CONFIG["BASE_BROWSER_UPDATE"]:

    DEFINES["BASE_BROWSER_UPDATE"] = True



JAR_MANIFESTS += ["jar.mn"]



GeneratedFile(

browser/components/preferences/main.js

+2 −2
Original line number Diff line number Diff line
@@ -570,8 +570,8 @@ var gMainPane = { 
    // Initialize the Firefox Updates section.

    let version = AppConstants.BASE_BROWSER_VERSION;



    // Tor Browser: do not include the build ID in our alphas, since they are

    // not actually related to the build date.

    // Base Browser and derivatives: do not include the build ID in our alphas,

    // since they are not actually related to the build date.



    // Append "(32-bit)" or "(64-bit)" build architecture to the version number:

    let bundle = Services.strings.createBundle(