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

Fix for breakpad symbol files failing to be generated on linux.

master
brad kittenbrink 2010-11-08 17:12:43 -08:00
parent f459524d81
commit 8cce8827e0
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/CMakeLists.txt
View File

@ -1837,13 +1837,13 @@ if (PACKAGE)
set(VIEWER_COPY_MANIFEST copy_l_viewer_manifest)
endif (LINUX)
if(CMAKE_CONFIGURATION_TYPES)
if(CMAKE_CFG_INTDIR STREQUAL ".")
set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE})
else(CMAKE_CFG_INTDIR STREQUAL ".")
# set LLBUILD_CONFIG to be a shell variable evaluated at build time
# reflecting the configuration we are currently building.
set(LLBUILD_CONFIG ${CMAKE_CFG_INTDIR})
else(CMAKE_CONFIGURATION_TYPES)
set(LLBUILD_CONFIG ${CMAKE_BUILD_TYPE})
endif(CMAKE_CONFIGURATION_TYPES)
endif(CMAKE_CFG_INTDIR STREQUAL ".")
add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"
COMMAND "${PYTHON_EXECUTABLE}"
ARGS

3
indra/newview/generate_breakpad_symbols.py
View File

@ -31,6 +31,7 @@ import fnmatch
import itertools
import operator
import os
import re
import sys
import shlex
import subprocess
@ -48,7 +49,7 @@ class MissingModuleError(Exception):
def main(configuration, viewer_dir, viewer_exes, libs_suffix, dump_syms_tool, viewer_symbol_file):
print "generate_breakpad_symbols run with args: %s" % str((configuration, viewer_dir, viewer_exes, libs_suffix, dump_syms_tool, viewer_symbol_file))
if configuration != "Release":
if not re.match("release", configuration, re.IGNORECASE):
print "skipping breakpad symbol generation for non-release build."
return 0