From fb17b94f0fb035deffd8dc9999a04cb764e295c3 Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Date: Thu, 19 Nov 2020 19:30:36 +0200
Subject: [PATCH] SL-14012 Crashes from Win10 are sent with uninformative
callstacks #2
---
autobuild.xml | 14 +++++++-------
indra/newview/viewer_manifest.py | 7 -------
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/autobuild.xml b/autobuild.xml
index 1430ccac1b6..94e09550ca3 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -244,9 +244,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>ee1e3e1a18e7b123e69516e9725d5bbc</string>
+ <string>ae90d19cdcddf539f6d0b41cab12f918</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69791/674226/bugsplat-1.0.7.550056-darwin64-550056.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72773/702861/bugsplat-1.0.7.552580-darwin64-552580.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@@ -256,9 +256,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>4682feb72e972e0790615de7046877ee</string>
+ <string>f5936eceb6a33ff0f1cc31996a40f29c</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69789/674221/bugsplat-3.6.0.4.550056-windows-550056.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72774/702905/bugsplat-3.6.0.8.552580-windows-552580.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@@ -268,16 +268,16 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>e8be5b56ebee7e3f9ce5c212f90dc70c</string>
+ <string>9cd940754e53e0670030b3da5ba8f373</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69790/674223/bugsplat-3.6.0.4.550056-windows64-550056.tar.bz2</string>
+ <string>https://automated-builds-secondlife-com.s3.amazonaws.com/ct2/72775/702906/bugsplat-3.6.0.8.552580-windows64-552580.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
- <string>3.6.0.4.550056</string>
+ <string>3.6.0.8.552580</string>
</map>
<key>colladadom</key>
<map>
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index c6f149b5fe8..6d231040f77 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -424,9 +424,6 @@ class WindowsManifest(ViewerManifest):
def final_exe(self):
return self.exec_name()+".exe"
- def final_pdb(self):
- return self.exec_name()+".pdb"
-
def finish_build_data_dict(self, build_data_dict):
build_data_dict['Executable'] = self.final_exe()
build_data_dict['AppName'] = self.app_name()
@@ -492,10 +489,6 @@ def construct(self):
if self.is_packaging_viewer():
# Find secondlife-bin.exe in the 'configuration' dir, then rename it to the result of final_exe.
self.path(src='%s/secondlife-bin.exe' % self.args['configuration'], dst=self.final_exe())
- # Bugsplat for some reason requires a match between user's exe and supplied pdb on Windows 10
- # this feels wrong and doesn't make any sense, since often we are supposed to match a whole
- # folder of symbol files to a random exe. But Bugsplat says 'it's expected' so just rename files.
- self.ccopyfile(src='%s/secondlife-bin.pdb' % self.args['configuration'], dst='%s/%s' % (self.args['configuration'], self.final_pdb()))
with self.prefix(src=os.path.join(pkgdir, "VMP")):
# include the compiled launcher scripts so that it gets included in the file_list
--
GitLab