Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 06:43:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 2 changesets (bug 1859597) for causing build bustages with "SendPing" CLOSED TREE

Browse Source 
Backed out changeset 507cc2503b8a (bug 1859597)
Backed out changeset 3f48b9e8e759 (bug 1859597)
This commit is contained in:
Cristian Tuns 2024-10-09 23:12:03 -04:00
parent ee54e9c960
commit 080df48f04
6 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/installer/windows/Makefile.in
View File

@ -61,7 +61,6 @@ $(CONFIG_DIR)/setup.exe::
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(call py_action,preprocessor defines.nsi,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-DTOPOBJDIR=$(topobjdir) \
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
$(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \

3
browser/installer/windows/nsis/defines.nsi.in
View File

@ -1,6 +1,4 @@
#filter substitution
#include @TOPOBJDIR@/buildid.h
# This Source Code Form is subject to the terms of the Mozilla Public
# 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/.
@ -27,7 +25,6 @@
!define AppVersion "@APP_VERSION@"
!define GREVersion @MOZILLA_VERSION@
!define AB_CD "@AB_CD@"
!define MOZ_BUILDID "@MOZ_BUILDID@"
!define FileMainEXE "@MOZ_APP_NAME@.exe"
!define PrivateBrowsingEXE "private_browsing.exe"

5
browser/installer/windows/nsis/installer.nsi
View File

@ -1031,11 +1031,6 @@ Function SendPing
nsJSON::Set /tree ping "Data" "distribution_version" /value '"$0"'
${EndIf}
ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "UBR"
${If} ${Errors}
StrCpy $0 "-1" ; Assign -1 if an error occured during registry read
nsJSON::Set /tree ping "Data" "windows_ubr" /value '"$0"'
${GetParameters} $0
${GetOptions} $0 "/LaunchedFromMSI" $0
${IfNot} ${Errors}

16
browser/installer/windows/nsis/stub.nsi
View File

@ -67,8 +67,6 @@ Var EndFinishPhaseTickCount
Var DistributionID
Var DistributionVersion
Var WindowsUBR
Var StubBuildID
Var InitialInstallRequirementsCode
Var ExistingProfile
@ -1056,14 +1054,6 @@ Function SendPing
StrCpy $DistributionVersion "0"
${EndIf}
; Capture the Windows UBR
ReadRegDWORD $WindowsUBR HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" "UBR"
${If} ${Errors}
StrCpy $WindowsUBR "-1" ; Assign -1 if an error occured during registry read
; Capture the stub installer build ID
StrCpy $StubBuildID ${MOZ_BUILDID}
; Whether installed into the default installation directory
${GetLongPath} "$INSTDIR" $R7
${GetLongPath} "$InitialInstallDir" $R8
@ -1174,16 +1164,14 @@ Function SendPing
$\nProfile cleanup prompt shown = $ProfileCleanupPromptType \
$\nDid profile cleanup = $CheckboxCleanupProfile \
$\nDistribution ID = $DistributionID \
$\nDistribution Version = $DistributionVersion \
$\nWindows UBR = $WindowsUBR \
$\nStub Installer Build ID = $StubBuildID"
$\nDistribution Version = $DistributionVersion"
; The following will exit the installer
SetAutoClose true
StrCpy $R9 "2"
Call RelativeGotoPage
!else
${StartTimer} ${DownloadIntervalMS} OnPing
InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$FirefoxLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData/$ProfileCleanupPromptType/$CheckboxCleanupProfile/$DistributionID/$DistributionVersion/$WindowsUBR/$StubBuildID" \
InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$FirefoxLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData/$ProfileCleanupPromptType/$CheckboxCleanupProfile/$DistributionID/$DistributionVersion" \
"$PLUGINSDIR\_temp" /END
!endif
${Else}

8
toolkit/components/telemetry/docs/data/install-ping.rst
View File

@ -48,7 +48,7 @@ update_channel (both)
Value of MOZ_UPDATE_CHANNEL for the installer build; should generally be the same as build_channel
version, build_id (both)
Version number and Build ID of the installed product, from ``application.ini``. This is **not** the version of the installer itself, see stub_build_id.
Version number and Build ID of the installed product, from ``application.ini``. This is **not** the version of the installer itself.
stub: 0 if the installation failed
@ -211,12 +211,6 @@ ping_version (stub)
silent (full)
True if the install was silent (see :ref:`Full Installer Configuration`)
stub_build_id (stub)
Build ID of the stub installer.
windows_ubr (both)
The Windows Update Build Revision of the installation device.
---------
Footnotes
---------

2
toolkit/mozapps/installer/windows/nsis/makensis.mk
View File

@ -102,7 +102,6 @@ $(CONFIG_DIR)/helper.exe: $(HELPER_DEPS)
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(call py_action,preprocessor defines.nsi,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-DTOPOBJDIR=$(topobjdir) \
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
$(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \
@ -122,7 +121,6 @@ maintenanceservice_installer::
$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
$(call py_action,preprocessor defines.nsi,-Fsubstitution $(DEFINES) $(ACDEFINES) \
-DTOPOBJDIR=$(topobjdir) \
$(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
$(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
--preprocess-locale $(topsrcdir) \