From f08421e6512da49c633823a65c459de32aae61de Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 6 Oct 2020 01:46:00 +0300 Subject: SL-14012 Crashes from Win10 are sent with uninformative callstacks Simplify name generation according to slack discussion, also helps bugsplat with matching files --- autobuild.xml | 14 +++++++------- indra/newview/viewer_manifest.py | 13 +++++++++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 183999bdc1..5e02db7406 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - d127d78db697bca2066358c63c9c6f32 + ee1e3e1a18e7b123e69516e9725d5bbc url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69727/673273/bugsplat-1.0.7.550012-darwin64-550012.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69791/674226/bugsplat-1.0.7.550056-darwin64-550056.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - 5b5124ef7f3705fe267e6ca0c405870b + 4682feb72e972e0790615de7046877ee url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69728/673286/bugsplat-3.6.0.4.550012-windows-550012.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69789/674221/bugsplat-3.6.0.4.550056-windows-550056.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - db59bda4b152f0f65be18c122bc95bfc + e8be5b56ebee7e3f9ce5c212f90dc70c url - http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69726/673272/bugsplat-3.6.0.4.550012-windows64-550012.tar.bz2 + http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/69790/674223/bugsplat-3.6.0.4.550056-windows64-550056.tar.bz2 name windows64 version - 3.6.0.4.550012 + 3.6.0.4.550056 colladadom diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 90a2af98f7..c6f149b5fe 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -260,6 +260,9 @@ class ViewerManifest(LLManifest): app_suffix=self.channel_variant() return CHANNEL_VENDOR_BASE + ' ' + app_suffix + def exec_name(self): + return "SecondLifeViewer" + def app_name_oneword(self): return ''.join(self.app_name().split()) @@ -419,10 +422,12 @@ class WindowsManifest(ViewerManifest): build_data_json_platform = 'win' def final_exe(self): - return self.app_name_oneword()+".exe" + return self.exec_name()+".exe" + + def final_pdb(self): + return self.exec_name()+".pdb" def finish_build_data_dict(self, build_data_dict): - #MAINT-7294: Windows exe names depend on channel name, so write that in also build_data_dict['Executable'] = self.final_exe() build_data_dict['AppName'] = self.app_name() return build_data_dict @@ -487,6 +492,10 @@ class WindowsManifest(ViewerManifest): 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 -- cgit v1.2.3