diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16a10b28235227ac6f870ac118639eace451ecd0..9a96827cc60adef32218cc1c1411b83740f26583 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -141,7 +141,7 @@ variables:
- autobuild configure -c Release -- -DUSE_LTO=ON -DDISABLE_FATAL_WARNINGS=ON -DREVISION_FROM_VCS=FALSE
- autobuild build -c Release --no-configure
- autobuild graph -c Release --graph-file alchemy-linuxs${AUTOBUILD_ADDRSIZE}-dependencies.svg build-linux-${AUTOBUILD_ADDRSIZE}/autobuild-package.xml
- - if [ "$USE_SENTRY" = "TRUE" ]; then sentry-cli difutil bundle-sources build-linux-*/newview/alchemy-bin.debug; fi
+ - if [ "$USE_SENTRY" = "TRUE" ]; then sentry-cli difutil bundle-sources build-linux-*/newview/alchemy-bin; fi
artifacts:
name: "$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA"
expire_in: 1 week
@@ -156,7 +156,6 @@ variables:
- build-linux-*/packages/lib/release/libSDL2*.so*
- build-linux-*/newview/Alchemy_*.tar.*
- build-linux-*/newview/alchemy-bin
- - build-linux-*/newview/alchemy-bin.debug
- build-linux-*/newview/alchemy-bin.src.zip
- alchemy-*-dependencies.svg
@@ -382,7 +381,7 @@ build:release:windows64:
- $LnxUploadResult = Invoke-WebRequest -HttpVersion 2.0 @UploadParams -InFile ./$LnxFileName -Uri "${LnxPackageUrl}${DestStatus}" | ConvertFrom-Json
- If ($LnxFileHash -ne $LnxUploadResult.file_sha256) { Write-Output "Upload hash mismatch. expected $Hash actual $($LnxUploadResult.file_sha256)" && Exit 1 }
- Pop-Location
- - If ($env:USE_SENTRY -eq 'TRUE') { sentry-cli upload-dif newview/alchemy-bin newview/alchemy-bin.debug newview/alchemy-bin.src.zip packages/ }
+ - If ($env:USE_SENTRY -eq 'TRUE') { sentry-cli upload-dif newview/alchemy-bin newview/alchemy-bin.src.zip packages/ }
- Pop-Location
- Push-Location ./build-darwin-64/
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 642fef757f0462cc61a29ac5114564a823e129d0..ac9e5ce7fada4e7d017b6f6c5356891df664732d 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -221,7 +221,7 @@ if (LINUX)
set(CMAKE_SKIP_BUILD_RPATH TRUE)
set(ALCHEMY_GLOBAL_DEFS "-DLL_LINUX=1 -DAPPID=secondlife -DLL_IGNORE_SIGCHLD -D_REENTRANT -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES")
- set(ALCHEMY_GLOBAL_CFLAGS "-fvisibility=hidden -fexceptions -fno-math-errno -fno-strict-aliasing -fsigned-char -g -pthread")
+ set(ALCHEMY_GLOBAL_CFLAGS "-fvisibility=hidden -fexceptions -fno-math-errno -fno-strict-aliasing -fsigned-char -g -gz -pthread")
set(ALCHEMY_GLOBAL_CFLAGS "${ALCHEMY_GLOBAL_CFLAGS} -mfpmath=sse -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 -mcx16 -mpopcnt -mpclmul -maes -mxsave -mxsaveopt")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ALCHEMY_GLOBAL_DEFS} ${ALCHEMY_GLOBAL_CFLAGS}")
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index cbfd7d5527cab919e2e06b7a1911f89beef02e1d..0a0c2aec81243e80fa1bc5cb6a11c5abd3b74010 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2216,56 +2216,6 @@ if (LINUX)
media_plugin_libvlc
)
- find_program (OBJCOPY NAMES "objcopy" REQUIRED)
-
- add_custom_command (TARGET ${VIEWER_BINARY_NAME} POST_BUILD
- COMMAND ${OBJCOPY}
- ARGS
- --only-keep-debug --compress-debug-sections=zlib
- ${VIEWER_BINARY_NAME} "${VIEWER_BINARY_NAME}.debug"
- BYPRODUCTS "${VIEWER_BINARY_NAME}.debug"
- COMMENT "Extracting and compressing debug information")
-
- add_custom_command (TARGET ${VIEWER_BINARY_NAME} POST_BUILD
- COMMAND ${OBJCOPY}
- ARGS
- --strip-all ${VIEWER_BINARY_NAME}
- COMMENT "Extracting and compressing debug information")
-
- add_custom_command (TARGET ${VIEWER_BINARY_NAME} POST_BUILD
- COMMAND ${OBJCOPY}
- ARGS
- --add-gnu-debuglink="${VIEWER_BINARY_NAME}.debug" ${VIEWER_BINARY_NAME}
- COMMENT "Extracting and compressing debug information")
-
- if (PACKAGE)
- add_custom_command(
- OUTPUT ${product}.tar.xz
- COMMAND ${Python3_EXECUTABLE}
- ARGS
- ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
- --arch=${ARCH}
- --artwork=${ARTWORK_DIR}
- "--discord=${USE_DISCORD}"
- "--sentry=${USE_SENTRY}"
- "--fmodstudio=${USE_FMODSTUDIO}"
- "--openal=${USE_OPENAL}"
- "--kdu=${USE_KDU}"
- --build=${CMAKE_CURRENT_BINARY_DIR}
- --buildtype=${CMAKE_BUILD_TYPE}
- "--channel=${VIEWER_CHANNEL}"
- --configuration=${CMAKE_CFG_INTDIR}
- --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
- --grid=${GRID}
- --source=${CMAKE_CURRENT_SOURCE_DIR}
- --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
- --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
- ${COPY_INPUT_DEPENDENCIES}
- )
- endif (PACKAGE)
-
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched
COMMAND ${Python3_EXECUTABLE}
@@ -2296,6 +2246,32 @@ if (LINUX)
add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched)
if (PACKAGE)
+ add_custom_command(
+ OUTPUT ${product}.tar.xz
+ COMMAND ${Python3_EXECUTABLE}
+ ARGS
+ ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+ --arch=${ARCH}
+ --artwork=${ARTWORK_DIR}
+ "--discord=${USE_DISCORD}"
+ "--sentry=${USE_SENTRY}"
+ "--fmodstudio=${USE_FMODSTUDIO}"
+ "--openal=${USE_OPENAL}"
+ "--kdu=${USE_KDU}"
+ --build=${CMAKE_CURRENT_BINARY_DIR}
+ --buildtype=${CMAKE_BUILD_TYPE}
+ "--channel=${VIEWER_CHANNEL}"
+ --configuration=${CMAKE_CFG_INTDIR}
+ --dest=${CMAKE_CURRENT_BINARY_DIR}/packaged
+ --grid=${GRID}
+ --source=${CMAKE_CURRENT_SOURCE_DIR}
+ --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
+ --versionfile=${CMAKE_CURRENT_BINARY_DIR}/viewer_version.txt
+ DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+ ${COPY_INPUT_DEPENDENCIES}
+ )
+
add_custom_target(llpackage ALL DEPENDS ${product}.tar.xz)
# Make sure we don't run two instances of viewer_manifest.py at the same time.
add_dependencies(llpackage copy_l_viewer_manifest)
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 0fbcef304e04784e5ccbd357c02a7a89eb5fe8fe..fca77bc8a3911f8d236da894e5b901ed0396b273 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1328,8 +1328,6 @@ def construct(self):
self.path("libvivoxplatform.so")
self.path("libvivoxsdk.so")
- self.strip_binaries()
-
class Linux_x86_64_Manifest(LinuxManifest):
address_size = 64
@@ -1375,8 +1373,6 @@ def construct(self):
self.path("libvivoxplatform.so")
self.path("libvivoxsdk.so")
- self.strip_binaries()
-
################################################################
if __name__ == "__main__":