From 803b75a718833ccf236f00b425faff4eaf0f29cb Mon Sep 17 00:00:00 2001 From: callum_linden Date: Wed, 18 Oct 2017 18:36:10 -0700 Subject: First version that builds with a dummy BugSplay call in llapp.cpp --- autobuild.xml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index f8daa6a418..e12f7cbc1d 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -225,6 +225,48 @@ version 1.57 + bugsplat + + copyright + Copyright 2003-2017, BugSplat + description + Bugsplat crash reporting package + license + Proprietary + license_file + LICENSES/BUGSPLAT_LICENSE.txt + name + bugsplat + platforms + + windows + + archive + + hash + f01c3cbeeeedf9efaf111c7b51fc3e5b + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9929/48024/bugsplat-3.5.0.5-windows-509917.tar.bz2 + + name + windows + + windows64 + + archive + + hash + 6878c5ac26ee1a7b8126d1c9f052e059 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9928/48018/bugsplat-3.5.0.5-windows64-509917.tar.bz2 + + name + windows64 + + + version + 3.5.0.5 + chardet copyright -- cgit v1.3 From 6cbb00fe85df8cb01c3a979dbdf2c0354e7bfa4d Mon Sep 17 00:00:00 2001 From: callum_linden Date: Thu, 19 Oct 2017 18:35:00 -0700 Subject: Differentiate between 32/64 bit windows builds for build systewm (BugsSplat enforces specifc names that vary across bitness) --- autobuild.xml | 8 ++++---- indra/cmake/bugsplat.cmake | 2 +- indra/newview/viewer_manifest.py | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e12f7cbc1d..ee052de5e6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - f01c3cbeeeedf9efaf111c7b51fc3e5b + 2710e051eb1b12dba574f470834baa9e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9929/48024/bugsplat-3.5.0.5-windows-509917.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9992/49191/bugsplat-3.5.0.5-windows-509980.tar.bz2 name windows @@ -256,9 +256,9 @@ archive hash - 6878c5ac26ee1a7b8126d1c9f052e059 + f2bb37c69f35522e49aae547d3408fd8 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9928/48018/bugsplat-3.5.0.5-windows64-509917.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9991/49185/bugsplat-3.5.0.5-windows64-509980.tar.bz2 name windows64 diff --git a/indra/cmake/bugsplat.cmake b/indra/cmake/bugsplat.cmake index 6805465023..e993979902 100644 --- a/indra/cmake/bugsplat.cmake +++ b/indra/cmake/bugsplat.cmake @@ -9,7 +9,7 @@ else (USESYSTEMLIBS) use_prebuilt_binary(bugsplat) if (WINDOWS) set(BUGSPLAT_LIBRARIES - ${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat64.lib + ${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat.lib ) elseif (DARWIN) diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 7292f715b7..4e69597b61 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -449,9 +449,14 @@ class WindowsManifest(ViewerManifest): self.path("libhunspell.dll") # BugSplat - self.path("BsSndRpt64.exe") - self.path("BugSplat64.dll") - self.path("BugSplatRc64.dll") + if(self.address_size == 64): + self.path("BsSndRpt64.exe") + self.path("BugSplat64.dll") + self.path("BugSplatRc64.dll") + else: + self.path("BsSndRpt.exe") + self.path("BugSplat.dll") + self.path("BugSplatRc.dll") # For google-perftools tcmalloc allocator. try: @@ -580,11 +585,6 @@ class WindowsManifest(ViewerManifest): self.path("libvlccore.dll") self.path("plugins/") - with self.prefix(src=os.path.join(os.pardir, 'packages', 'lib', 'release'), dst=""): - self.path("BsSndRpt64.exe") - self.path("BugSplat64.dll") - self.path("BugSplatRc64.dll") - # pull in the crash logger and updater from other projects # tag:"crash-logger" here as a cue to the exporter self.path(src='../win_crash_logger/%s/windows-crash-logger.exe' % self.args['configuration'], -- cgit v1.3 From 2fb39cb45f9ef502e9ea23df096fa5b3f2f806fa Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Thu, 10 May 2018 15:05:55 -0400 Subject: SL-821: Update to bugsplat build 515327 --- autobuild.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 75b19709bc..25bc8d8af9 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -239,14 +239,26 @@ bugsplat platforms + darwin64 + + archive + + hash + 9a14b64569c998fb7ef6e3bb690eda29 + url + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/17916/122458/bugsplat-1.0.2.515327-darwin64-515327.tar.bz2 + + name + darwin64 + windows archive hash - 2710e051eb1b12dba574f470834baa9e + 90d85d1ac17f0049c8c48110e790a61f url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9992/49191/bugsplat-3.5.0.5-windows-509980.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/17918/122472/bugsplat-3.5.0.5.515327-windows-515327.tar.bz2 name windows @@ -256,16 +268,16 @@ archive hash - f2bb37c69f35522e49aae547d3408fd8 + 9af7c080ebf0b961d7a4ccac7a303508 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9991/49185/bugsplat-3.5.0.5-windows64-509980.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/17917/122466/bugsplat-3.5.0.5.515327-windows64-515327.tar.bz2 name windows64 version - 3.5.0.5 + 1.0.2.515327 chardet -- cgit v1.3 From 670943de5a3bf4e7053c3afea0fda722e958f136 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Mon, 21 May 2018 15:02:17 -0400 Subject: SL-804, SL-824: Update to bugsplat build 515598 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index 25bc8d8af9..fea35ac731 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - 9a14b64569c998fb7ef6e3bb690eda29 + 84ef190d0bc6cd3b535d8c625f324ba6 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/17916/122458/bugsplat-1.0.2.515327-darwin64-515327.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18354/126844/bugsplat-1.0.2.515598-darwin64-515598.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - 90d85d1ac17f0049c8c48110e790a61f + 12625f3b3da813f10ec5b8e7eb84fe2d url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/17918/122472/bugsplat-3.5.0.5.515327-windows-515327.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18356/126857/bugsplat-3.5.0.5.515598-windows-515598.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - 9af7c080ebf0b961d7a4ccac7a303508 + 0f88af634e5da368334ad6da7014b2ce url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/17917/122466/bugsplat-3.5.0.5.515327-windows64-515327.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18355/126855/bugsplat-3.5.0.5.515598-windows64-515598.tar.bz2 name windows64 version - 1.0.2.515327 + 1.0.2.515598 chardet -- cgit v1.3 From 96dfab228ebce44287f66255ceb041e7f9d929b1 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 23 May 2018 04:54:09 -0400 Subject: SL-824: Update to bugsplat build 515654 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index fea35ac731..a3f5a83856 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - 84ef190d0bc6cd3b535d8c625f324ba6 + a834c6f8bafd4cb8e4a744510211237a url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18354/126844/bugsplat-1.0.2.515598-darwin64-515598.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18458/127802/bugsplat-1.0.2.515654-darwin64-515654.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - 12625f3b3da813f10ec5b8e7eb84fe2d + b8e47c5a20394e1add436e92fee9e356 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18356/126857/bugsplat-3.5.0.5.515598-windows-515598.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18461/127812/bugsplat-3.5.0.5.515654-windows-515654.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - 0f88af634e5da368334ad6da7014b2ce + 2f026674ed4ff8db34674af3cbd2072a url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18355/126855/bugsplat-3.5.0.5.515598-windows64-515598.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18462/127815/bugsplat-3.5.0.5.515654-windows64-515654.tar.bz2 name windows64 version - 1.0.2.515598 + 1.0.2.515654 chardet -- cgit v1.3 From 78dbccf14a7b2a454c3def823087955e0f7ac767 Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 23 May 2018 06:42:23 -0400 Subject: SL-824: Update to bugsplat build 515657 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index a3f5a83856..e9ad39b921 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - a834c6f8bafd4cb8e4a744510211237a + c1f7431195bd5cb3cba724abdcc50104 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18458/127802/bugsplat-1.0.2.515654-darwin64-515654.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18470/127908/bugsplat-1.0.2.515657-darwin64-515657.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - b8e47c5a20394e1add436e92fee9e356 + 57832de6e3ba7eef7ac5f4e947277723 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18461/127812/bugsplat-3.5.0.5.515654-windows-515654.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18472/127922/bugsplat-3.5.0.5.515657-windows-515657.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - 2f026674ed4ff8db34674af3cbd2072a + 2ccc3aec7861e79e32e31e12807127b1 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18462/127815/bugsplat-3.5.0.5.515654-windows64-515654.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18471/127916/bugsplat-3.5.0.5.515657-windows64-515657.tar.bz2 name windows64 version - 1.0.2.515654 + 1.0.2.515657 chardet -- cgit v1.3 From 07ebe236a1d92fe87641d681ce7f656519498f3e Mon Sep 17 00:00:00 2001 From: Nat Goodspeed Date: Wed, 23 May 2018 11:31:13 -0400 Subject: SL-824: Update to bugsplat build 515662 --- autobuild.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'autobuild.xml') diff --git a/autobuild.xml b/autobuild.xml index e9ad39b921..5254530fa1 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -244,9 +244,9 @@ archive hash - c1f7431195bd5cb3cba724abdcc50104 + 2ef055fe7ec22c64394095ad8d7ab34e url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18470/127908/bugsplat-1.0.2.515657-darwin64-515657.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18481/127993/bugsplat-1.0.2.515662-darwin64-515662.tar.bz2 name darwin64 @@ -256,9 +256,9 @@ archive hash - 57832de6e3ba7eef7ac5f4e947277723 + 84b73bc8141b5d19a8dafabfe27eee93 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18472/127922/bugsplat-3.5.0.5.515657-windows-515657.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18483/128007/bugsplat-3.5.0.5.515662-windows-515662.tar.bz2 name windows @@ -268,16 +268,16 @@ archive hash - 2ccc3aec7861e79e32e31e12807127b1 + bd44b033c07b417b675c3511fee468e2 url - http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18471/127916/bugsplat-3.5.0.5.515657-windows64-515657.tar.bz2 + http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/18482/128001/bugsplat-3.5.0.5.515662-windows64-515662.tar.bz2 name windows64 version - 1.0.2.515657 + 1.0.2.515662 chardet -- cgit v1.3