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

Bring over .xz compression from main, instead of .bz2. 

The main branch, and the current rev of viewer-build-util, consistently uses
.xz for tarballs.
master
Nat Goodspeed 2024-05-22 09:26:05 -04:00
parent aa75a65e88
commit f8ccb39b8d
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.sh
View File

@ -85,7 +85,7 @@ installer_Linux()
{ {
local package_name="$1" local package_name="$1"
local package_dir="$(build_dir_Linux)/newview/" local package_dir="$(build_dir_Linux)/newview/"
local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.bz2\$" local pattern=".*$(viewer_channel_suffix ${package_name})_[0-9]+_[0-9]+_[0-9]+_[0-9]+_i686\\.tar\\.xz\$"
# since the additional packages are built after the base package, # since the additional packages are built after the base package,
# sorting oldest first ensures that the unqualified package is returned # sorting oldest first ensures that the unqualified package is returned
# even if someone makes a qualified name that duplicates the last word of the base name # even if someone makes a qualified name that duplicates the last word of the base name
@ -173,7 +173,7 @@ pre_build()
# This name is consumed by indra/newview/CMakeLists.txt. Make it # This name is consumed by indra/newview/CMakeLists.txt. Make it
# absolute because we've had troubles with relative pathnames. # absolute because we've had troubles with relative pathnames.
abs_build_dir="$(cd "$build_dir"; pwd)" abs_build_dir="$(cd "$build_dir"; pwd)"
VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.bz2")" VIEWER_SYMBOL_FILE="$(native_path "$abs_build_dir/newview/$variant/secondlife-symbols-$symplat-${AUTOBUILD_ADDRSIZE}.tar.xz")"
fi fi
# honor autobuild_configure_parameters same as sling-buildscripts # honor autobuild_configure_parameters same as sling-buildscripts
@ -417,10 +417,10 @@ do
fi fi
if [ -d "$build_dir/doxygen/html" ] if [ -d "$build_dir/doxygen/html" ]
then then
tar -c -f "$build_dir/viewer-doxygen.tar.bz2" --strip-components 3 "$build_dir/doxygen/html" tar -cJf "$build_dir/viewer-doxygen.tar.xz" --strip-components 3 "$build_dir/doxygen/html"
python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.bz2" \ python_cmd "$helpers/codeticket.py" addoutput "Doxygen Tarball" "$build_dir/viewer-doxygen.tar.xz" \
|| fatal "Upload of doxygen tarball failed" || fatal "Upload of doxygen tarball failed"
metadata+=("$build_dir/viewer-doxygen.tar.bz2") metadata+=("$build_dir/viewer-doxygen.tar.xz")
fi fi
;; ;;
*) *)

12
indra/newview/CMakeLists.txt
View File

@ -1800,7 +1800,7 @@ if (WINDOWS)
if (PACKAGE) if (PACKAGE)
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2 OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz
COMMAND ${PYTHON_EXECUTABLE} COMMAND ${PYTHON_EXECUTABLE}
ARGS ARGS
${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/event_host_manifest.py
@ -1843,7 +1843,7 @@ if (WINDOWS)
) )
# temporarily disable packaging of event_host until hg subrepos get # temporarily disable packaging of event_host until hg subrepos get
# sorted out on the parabuild cluster... # sorted out on the parabuild cluster...
#${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.bz2) #${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/event_host.tar.xz)
endif (PACKAGE) endif (PACKAGE)
elseif (DARWIN) elseif (DARWIN)
@ -1963,7 +1963,7 @@ if (LINUX)
#endif (NOT USE_BUGSPLAT) #endif (NOT USE_BUGSPLAT)
add_custom_command( add_custom_command(
OUTPUT ${product}.tar.bz2 OUTPUT ${product}.tar.xz
COMMAND ${PYTHON_EXECUTABLE} COMMAND ${PYTHON_EXECUTABLE}
ARGS ARGS
${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
@ -2015,7 +2015,7 @@ if (LINUX)
add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched) add_custom_target(copy_l_viewer_manifest ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.copy_touched)
if (PACKAGE) if (PACKAGE)
add_custom_target(llpackage ALL DEPENDS ${product}.tar.bz2) 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. # Make sure we don't run two instances of viewer_manifest.py at the same time.
add_dependencies(llpackage copy_l_viewer_manifest) add_dependencies(llpackage copy_l_viewer_manifest)
check_message_template(llpackage) check_message_template(llpackage)
@ -2144,12 +2144,12 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN OUTPUT_VARIABLE PARENT_DIRECTORY_CYGWIN
OUTPUT_STRIP_TRAILING_WHITESPACE) OUTPUT_STRIP_TRAILING_WHITESPACE)
add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}" add_custom_command(OUTPUT "${VIEWER_SYMBOL_FILE}"
# Use of 'tar ...j' here assumes VIEWER_SYMBOL_FILE endswith .tar.bz2; # Use of 'tar ...J' here assumes VIEWER_SYMBOL_FILE endswith .tar.xz;
# testing a string suffix is painful enough in CMake language that # testing a string suffix is painful enough in CMake language that
# we'll continue assuming it until forced to generalize. # we'll continue assuming it until forced to generalize.
COMMAND "tar" COMMAND "tar"
ARGS ARGS
"cjf" "cJf"
"${VIEWER_SYMBOL_FILE_CYGWIN}" "${VIEWER_SYMBOL_FILE_CYGWIN}"
"-C" "-C"
"${PARENT_DIRECTORY_CYGWIN}" "${PARENT_DIRECTORY_CYGWIN}"