Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
humbletim committed Apr 21, 2024
1 parent fe623e4 commit 95b9502
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions util/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ function 0a0_ninja_build() {( $_dbgopts;
)}

function 0a1_ninja_postbuild() {( $_dbgopts;
local nsi=$build_dir/newview/${viewer_id}_setup_tmp.nsi
local nsi=$build_dir/newview/${viewer_exe}_setup_tmp.nsi
(
test -f "$nsi" || \
test -f $(dirname "$nsi")/secondlife_setup_tmp.nsi && \
Expand Down Expand Up @@ -322,7 +322,7 @@ function 0a1_ninja_postbuild() {( $_dbgopts;


function make_installer() {
local nsi=$build_dir/newview/${viewer_id}_setup_tmp.nsi
local nsi=$build_dir/newview/${viewer_exe}_setup_tmp.nsi
#s@^SetCompressor .*$@SetCompressor zlib@g;

export XZ_DEFAULTS=-T0
Expand All @@ -338,7 +338,7 @@ function make_installer() {
}

function make_7z() {( set -Euo pipefail;
local nsi=$build_dir/newview/${viewer_id}_setup_tmp.nsi
local nsi=$build_dir/newview/${viewer_exe}_setup_tmp.nsi
bash -c 'echo $PATH ; which 7z ; cd $build_dir && 7z -bt -t7z a "$build_dir/$viewer_channel-$version_full.7z" "@$build_dir/installer.txt"'
# echo portable_archive=$build_dir/$viewer_channel-$version_full.7z | tee -a $GITHUB_OUTPUT
)}
Expand Down

0 comments on commit 95b9502

Please sign in to comment.