livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First version that builds with a dummy BugSplay call in llapp.cpp

master
callum_linden 2017-10-18 18:36:10 -07:00
parent 9c5becd67d
commit 803b75a718
6 changed files with 94 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
autobuild.xml
View File

@ -225,6 +225,48 @@
<key>version</key>
<string>1.57</string>
</map>
<key>bugsplat</key>
<map>
<key>copyright</key>
<string>Copyright 2003-2017, BugSplat</string>
<key>description</key>
<string>Bugsplat crash reporting package</string>
<key>license</key>
<string>Proprietary</string>
<key>license_file</key>
<string>LICENSES/BUGSPLAT_LICENSE.txt</string>
<key>name</key>
<string>bugsplat</string>
<key>platforms</key>
<map>
<key>windows</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>f01c3cbeeeedf9efaf111c7b51fc3e5b</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9929/48024/bugsplat-3.5.0.5-windows-509917.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
</map>
<key>windows64</key>
<map>
<key>archive</key>
<map>
<key>hash</key>
<string>6878c5ac26ee1a7b8126d1c9f052e059</string>
<key>url</key>
<string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/ct2/9928/48018/bugsplat-3.5.0.5-windows64-509917.tar.bz2</string>
</map>
<key>name</key>
<string>windows64</string>
</map>
</map>
<key>version</key>
<string>3.5.0.5</string>
</map>
<key>chardet</key>
<map>
<key>copyright</key>

3
indra/cmake/Copy3rdPartyLibs.cmake
View File

@ -39,6 +39,9 @@ if(WINDOWS)
libeay32.dll
glod.dll
libhunspell.dll
BugSplat64.dll
BugSplatRc64.dll
BsSndRpt64.exe
)
if (FMODEX)

20
indra/cmake/bugsplat.cmake Normal file
View File

@ -0,0 +1,20 @@
include(Prebuilt)
set(BUGSPLAT_FIND_QUIETLY ON)
set(BUGSPLAT_FIND_REQUIRED ON)
if (USESYSTEMLIBS)
include(FindBUGSPLAT)
else (USESYSTEMLIBS)
use_prebuilt_binary(bugsplat)
if (WINDOWS)
set(BUGSPLAT_LIBRARIES
${ARCH_PREBUILT_DIRS_RELEASE}/bugsplat64.lib
)
elseif (DARWIN)
else (WINDOWS)
endif (WINDOWS)
set(BUGSPLAT_INCLUDE_DIR ${LIBS_PREBUILT_DIR}/include/bugsplat)
endif (USESYSTEMLIBS)

3
indra/llcommon/CMakeLists.txt
View File

@ -13,6 +13,7 @@ include(GoogleBreakpad)
include(Copy3rdPartyLibs)
include(ZLIB)
include(URIPARSER)
include(BUGSPLAT)
include_directories(
${EXPAT_INCLUDE_DIRS}
@ -21,6 +22,7 @@ include_directories(
${ZLIB_INCLUDE_DIRS}
${BREAKPAD_INCLUDE_DIRECTORIES}
${URIPARSER_INCLUDE_DIRS}
${BUGSPLAT_INCLUDE_DIR}
)
# add_executable(lltreeiterators lltreeiterators.cpp)
@ -291,6 +293,7 @@ target_link_libraries(
${BOOST_SYSTEM_LIBRARY}
${GOOGLE_PERFTOOLS_LIBRARIES}
${URIPARSER_LIBRARIES}
${BUGSPLAT_LIBRARIES}
)
if (DARWIN)

12
indra/llcommon/llapp.cpp
View File

@ -50,6 +50,10 @@
#include "stringize.h"
#include "llcleanup.h"
#include "BugSplat.h"
MiniDmpSender *mpSender;
//
// Signal handling
//
@ -151,6 +155,14 @@ void LLApp::commonCtor()
// (this is used to avoid allocating memory in the crash handler)
memset(mMinidumpPath, 0, MAX_MINDUMP_PATH_LENGTH);
mCrashReportPipeStr = L"\\\\.\\pipe\\LLCrashReporterPipe";
static const wchar_t *bugdb_name = L"second_life_callum_test";
static const wchar_t *app_name = L"SecondLifeViewer";
static const wchar_t *app_version = L"1.0.0";
mpSender = new MiniDmpSender((const __wchar_t *)bugdb_name, (const __wchar_t *)app_name, (const __wchar_t *)app_version, NULL);
}
LLApp::LLApp(LLErrorThread *error_thread) :

19
indra/newview/viewer_manifest.py
View File

@ -448,6 +448,11 @@ class WindowsManifest(ViewerManifest):
# Hunspell
self.path("libhunspell.dll")
# BugSplat
self.path("BsSndRpt64.exe")
self.path("BugSplat64.dll")
self.path("BugSplatRc64.dll")
# For google-perftools tcmalloc allocator.
try:
if self.args['configuration'].lower() == 'debug':
@ -457,7 +462,6 @@ class WindowsManifest(ViewerManifest):
except:
print "Skipping libtcmalloc_minimal.dll"
self.path(src="licenses-win32.txt", dst="licenses.txt")
self.path("featuretable.txt")
self.path("ca-bundle.crt")
@ -571,10 +575,15 @@ class WindowsManifest(ViewerManifest):
self.path("zh-CN.pak")
self.path("zh-TW.pak")
with self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'release'), dst="llplugin"):
self.path("libvlc.dll")
self.path("libvlccore.dll")
self.path("plugins/")
with self.prefix(src=os.path.join(os.pardir, 'packages', 'bin', 'release'), dst="llplugin"):
self.path("libvlc.dll")
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