Commit acc51b14 authored by Kirk Steuber's avatar Kirk Steuber
Browse files

Bug 1568994 - Add Update URL template to application.ini, XREAppData, and... 

Bug 1568994 - Add Update URL template to application.ini, XREAppData, and Services.appinfo r=glandium

This is being added to facilitate moving generation of the update URL to Rust (Bug 1567286). Once that has been completed, we should be able to remove the update URL from its current location in firefox.js so that it is not being duplicated in application.ini.

Differential Revision: https://phabricator.services.mozilla.com/D43300

--HG--
extra : moz-landing-system : lando
parent 1909c4ba

build/appini_header.py

+3 −2
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ def main(output, file): 
    appdata['App:profile'] = ('"%s"' % appdata['App:profile']

                              if 'App:profile' in appdata else 'NULL')

    expected = ('App:vendor', 'App:name', 'App:remotingname', 'App:version', 'App:buildid',

                'App:id', 'Gecko:minversion', 'Gecko:maxversion')

                'App:id', 'Gecko:minversion', 'Gecko:maxversion', 'AppUpdate:url')

    missing = [var for var in expected if var not in appdata]

    if missing:

        print >>sys.stderr, \
@@ -59,7 +59,8 @@ def main(output, file): 
                 "%(Crash Reporter:serverurl)s",

                 %(App:profile)s,

                 NULL, // UAName

                 %(App:sourceurl)s

                 %(App:sourceurl)s,

                 "%(AppUpdate:url)s"

             };''' % appdata)

build/application.ini.in

+5 −0
Original line number Diff line number Diff line
@@ -49,3 +49,8 @@ EnableProfileMigrator=1 
Enabled=1

ServerURL=https://crash-reports.mozilla.com/submit?id=@MOZ_APP_ID@&version=@MOZ_APP_VERSION@&buildid=@MOZ_BUILDID@

#endif



#if MOZ_UPDATER

[AppUpdate]

URL=https://aus5.mozilla.org/update/6/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/%OS_VERSION%/%SYSTEM_CAPABILITIES%/%DISTRIBUTION%/%DISTRIBUTION_VERSION%/update.xml

#endif

build/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ if CONFIG['MOZ_APP_BASENAME']: 
    if CONFIG['MOZ_APP_PROFILE']:

        appini_defines['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']



    for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR'):

    for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR', 'MOZ_UPDATER'):

        if CONFIG[var]:

            appini_defines[var] = True

dom/ipc/ContentChild.cpp

+2 −1
Original line number Diff line number Diff line
@@ -2605,7 +2605,7 @@ mozilla::ipc::IPCResult ContentChild::RecvUnlinkGhosts() { 
mozilla::ipc::IPCResult ContentChild::RecvAppInfo(

    const nsCString& version, const nsCString& buildID, const nsCString& name,

    const nsCString& UAName, const nsCString& ID, const nsCString& vendor,

    const nsCString& sourceURL) {

    const nsCString& sourceURL, const nsCString& updateURL) {

  mAppInfo.version.Assign(version);

  mAppInfo.buildID.Assign(buildID);

  mAppInfo.name.Assign(name);
@@ -2613,6 +2613,7 @@ mozilla::ipc::IPCResult ContentChild::RecvAppInfo( 
  mAppInfo.ID.Assign(ID);

  mAppInfo.vendor.Assign(vendor);

  mAppInfo.sourceURL.Assign(sourceURL);

  mAppInfo.updateURL.Assign(updateURL);



  return IPC_OK();

}

dom/ipc/ContentChild.h

+2 −1
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class ContentChild final 
    nsCString ID;

    nsCString vendor;

    nsCString sourceURL;

    nsCString updateURL;

  };



  nsresult ProvideWindowCommon(BrowserChild* aTabOpener,
@@ -394,7 +395,7 @@ class ContentChild final 
  mozilla::ipc::IPCResult RecvAppInfo(

      const nsCString& version, const nsCString& buildID, const nsCString& name,

      const nsCString& UAName, const nsCString& ID, const nsCString& vendor,

      const nsCString& sourceURL);

      const nsCString& sourceURL, const nsCString& updateURL);



  mozilla::ipc::IPCResult RecvRemoteType(const nsString& aRemoteType);