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

Missed file

master
Roxie Linden 2024-08-05 21:34:52 -07:00
parent e96416bdd2
commit 946b165b99
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build.sh
View File

@ -526,7 +526,6 @@ then
# nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file. # nat 2016-12-22: without RELEASE_CRASH_REPORTING, we have no symbol file.
if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ] if [ "${RELEASE_CRASH_REPORTING:-}" != "OFF" ]
then then
# BugSplat wants to see xcarchive.zip
# e.g. build-darwin-x86_64/newview/Release/Second Life Test.sym.tar.gz # e.g. build-darwin-x86_64/newview/Release/Second Life Test.sym.tar.gz
symbol_file="${build_dir}/newview/${variant}/${viewer_channel}.sym.tar.gz" symbol_file="${build_dir}/newview/${variant}/${viewer_channel}.sym.tar.gz"
if [[ ! -f "$symbol_file" ]] if [[ ! -f "$symbol_file" ]]

40
indra/newview/CMakeLists.txt
View File

@ -2086,7 +2086,7 @@ if (DARWIN)
set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/${product}.app") set(VIEWER_APP_BUNDLE "${CMAKE_CURRENT_BINARY_DIR}/$<IF:$<BOOL:${LL_GENERATOR_IS_MULTI_CONFIG}>,$<CONFIG>,>/${product}.app")
set(VIEWER_APP_EXE "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}") set(VIEWER_APP_EXE "${VIEWER_APP_BUNDLE}/Contents/MacOS/${product}")
set(VIEWER_APP_DSYM "${VIEWER_APP_EXE}.dSYM") set(VIEWER_APP_DSYM "${VIEWER_APP_EXE}.dSYM")
set(VIEWER_APP_XCARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.xcarchive.zip") set(VIEWER_APP_SYMBOLS_ARCHIVE "${VIEWER_APP_BUNDLE}/../${product}.sym.tar.gz")
configure_file( configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist" "${CMAKE_CURRENT_SOURCE_DIR}/Info-SecondLife.plist"
@ -2191,41 +2191,33 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
add_dependencies(generate_symbols ${VIEWER_BINARY_NAME}) add_dependencies(generate_symbols ${VIEWER_BINARY_NAME})
endif (WINDOWS) endif (WINDOWS)
if (DARWIN) if (DARWIN)
# Have to run dsymutil first, then pack up the resulting .dSYM directory set_target_properties(${VIEWER_BINARY_NAME}
add_custom_command(OUTPUT "${VIEWER_APP_DSYM}" PROPERTIES
COMMAND "dsymutil" XCODE_ATTRIBUTE_DEBUG_INFORMATION_FORMAT "dwarf-with-dsym"
XCODE_ATTRIBUTE_DWARF_DSYM_FOLDER_PATH "${SYMBOLS_STAGING_DIR}")
add_custom_command(OUTPUT "${VIEWER_APP_SYMBOLS_ARCHIVE}"
COMMAND "tar"
ARGS ARGS
${VIEWER_APP_EXE} "-cJf"
COMMENT "Generating ${VIEWER_APP_DSYM}" "${VIEWER_APP_SYMBOLS_ARCHIVE}"
) "-C"
add_custom_target(dsym_generate DEPENDS "${VIEWER_APP_DSYM}") "${SYMBOLS_STAGING_DIR}"
add_dependencies(dsym_generate ${VIEWER_BINARY_NAME})
add_custom_command(OUTPUT "${VIEWER_APP_XCARCHIVE}"
COMMAND "zip"
ARGS
"-r"
"${VIEWER_APP_XCARCHIVE}"
"." "."
WORKING_DIRECTORY "${VIEWER_APP_DSYM}/.." DEPENDS "${VIEWER_BINARY_NAME}"
DEPENDS "${VIEWER_APP_DSYM}" COMMENT "Generating symbols archive for upload to BugSplat"
COMMENT "Generating xcarchive.zip for upload to BugSplat"
) )
add_custom_target(dsym_xcarchive DEPENDS "${VIEWER_APP_XCARCHIVE}")
add_dependencies(dsym_xcarchive dsym_generate)
# Have to create a stamp file, and depend on it, to force CMake to run # Have to create a stamp file, and depend on it, to force CMake to run
# the cleanup step. # the cleanup step.
add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp" add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp"
COMMAND rm -rf "${VIEWER_APP_DSYM}" COMMAND rm -rf "${VIEWER_APP_DSYM}"
COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp" COMMAND touch "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp"
DEPENDS "${VIEWER_APP_XCARCHIVE}" DEPENDS "${VIEWER_APP_SYMBOLS_ARCHIVE}"
COMMENT "Cleaning up dSYM" COMMENT "Cleaning up symbols archive"
) )
add_custom_target(generate_symbols DEPENDS add_custom_target(generate_symbols DEPENDS
"${VIEWER_APP_DSYM}" "${VIEWER_APP_SYMBOLS_ARCHIVE}"
"${VIEWER_APP_XCARCHIVE}"
"${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp" "${CMAKE_CURRENT_BINARY_DIR}/dsym.stamp"
) )
add_dependencies(generate_symbols dsym_xcarchive)
endif (DARWIN) endif (DARWIN)
if (LINUX) if (LINUX)
# TBD # TBD