workaround NSIS issue; more precise artifact names

humbletim · Oct 24, 2024 · c59e456 · c59e456
1 parent 419c06c
commit c59e456
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 0 deletions.
diff --git a/blueprints/fs-7.1.11-avx2/000.bash b/blueprints/fs-7.1.11-avx2/000.bash
@@ -4,6 +4,28 @@ maybe-clone p373r github.com ${GITHUB_REPOSITORY} P373R_6.6.8
 
     pushd repo/viewer
 patch -p1 < <(cat <<'EOF'
+diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
+index 29ae1e54f05..53d6ff09826 100644
+--- a/indra/newview/installers/windows/installer_template.nsi
++++ b/indra/newview/installers/windows/installer_template.nsi
+@@ -244,7 +244,7 @@ Function CheckCPUFlagsAVX2
+     ; Replace %DLURL% in the language string with the URL
+     ${WordReplace} "$(MissingAVX2)" "%DLURL%" "$2" "+*" $3
+     MessageBox MB_OK "$3"    
+-    ${OpenURL} '$2'
++    ${OpenURL} "${DL_URL}-legacy-cpus#version-${VERSION_LONG}"
+     Quit
+ 
+   OK_AVX2:
+@@ -267,7 +267,7 @@ Function CheckCPUFlagsAVX2_Prompt
+ 
+     MessageBox MB_YESNO $3 IDYES DownloadAVX2 IDNO ContinueInstall
+     DownloadAVX2:
+-      ${OpenURL} '$3'
++      ${OpenURL} "${DL_URL}#version-${VERSION_LONG}"
+       Quit
+     ContinueInstall:
+       Pop $3
 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
 index 9fa11fd534c..0dcc76d3ab3 100755
 --- a/indra/newview/viewer_manifest.py

diff --git a/blueprints/fs-7.1.11/000.bash b/blueprints/fs-7.1.11/000.bash
@@ -4,6 +4,28 @@ maybe-clone p373r github.com ${GITHUB_REPOSITORY} P373R_6.6.8
 
     pushd repo/viewer
 patch -p1 < <(cat <<'EOF'
+diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
+index 29ae1e54f05..53d6ff09826 100644
+--- a/indra/newview/installers/windows/installer_template.nsi
++++ b/indra/newview/installers/windows/installer_template.nsi
+@@ -244,7 +244,7 @@ Function CheckCPUFlagsAVX2
+     ; Replace %DLURL% in the language string with the URL
+     ${WordReplace} "$(MissingAVX2)" "%DLURL%" "$2" "+*" $3
+     MessageBox MB_OK "$3"    
+-    ${OpenURL} '$2'
++    ${OpenURL} "${DL_URL}-legacy-cpus#version-${VERSION_LONG}"
+     Quit
+ 
+   OK_AVX2:
+@@ -267,7 +267,7 @@ Function CheckCPUFlagsAVX2_Prompt
+ 
+     MessageBox MB_YESNO $3 IDYES DownloadAVX2 IDNO ContinueInstall
+     DownloadAVX2:
+-      ${OpenURL} '$3'
++      ${OpenURL} "${DL_URL}#version-${VERSION_LONG}"
+       Quit
+     ContinueInstall:
+       Pop $3
 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
 index 9fa11fd534c..0dcc76d3ab3 100755
 --- a/indra/newview/viewer_manifest.py

diff --git a/blueprints/sgeo-7.1.11-avx2/000.bash b/blueprints/sgeo-7.1.11-avx2/000.bash
@@ -35,6 +35,28 @@ index fd2aa7880..89804262b 100644
 EOF
 )
 patch -p1 < <(cat <<'EOF'
+diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
+index 29ae1e54f05..53d6ff09826 100644
+--- a/indra/newview/installers/windows/installer_template.nsi
++++ b/indra/newview/installers/windows/installer_template.nsi
+@@ -244,7 +244,7 @@ Function CheckCPUFlagsAVX2
+     ; Replace %DLURL% in the language string with the URL
+     ${WordReplace} "$(MissingAVX2)" "%DLURL%" "$2" "+*" $3
+     MessageBox MB_OK "$3"    
+-    ${OpenURL} '$2'
++    ${OpenURL} "${DL_URL}-legacy-cpus#version-${VERSION_LONG}"
+     Quit
+ 
+   OK_AVX2:
+@@ -267,7 +267,7 @@ Function CheckCPUFlagsAVX2_Prompt
+ 
+     MessageBox MB_YESNO $3 IDYES DownloadAVX2 IDNO ContinueInstall
+     DownloadAVX2:
+-      ${OpenURL} '$3'
++      ${OpenURL} "${DL_URL}#version-${VERSION_LONG}"
+       Quit
+     ContinueInstall:
+       Pop $3
 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
 index 9fa11fd534c..0dcc76d3ab3 100755
 --- a/indra/newview/viewer_manifest.py

diff --git a/blueprints/sgeo-7.1.11/000.bash b/blueprints/sgeo-7.1.11/000.bash
@@ -35,6 +35,28 @@ index fd2aa7880..89804262b 100644
 EOF
 )
 patch -p1 < <(cat <<'EOF'
+diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
+index 29ae1e54f05..53d6ff09826 100644
+--- a/indra/newview/installers/windows/installer_template.nsi
++++ b/indra/newview/installers/windows/installer_template.nsi
+@@ -244,7 +244,7 @@ Function CheckCPUFlagsAVX2
+     ; Replace %DLURL% in the language string with the URL
+     ${WordReplace} "$(MissingAVX2)" "%DLURL%" "$2" "+*" $3
+     MessageBox MB_OK "$3"    
+-    ${OpenURL} '$2'
++    ${OpenURL} "${DL_URL}-legacy-cpus#version-${VERSION_LONG}"
+     Quit
+ 
+   OK_AVX2:
+@@ -267,7 +267,7 @@ Function CheckCPUFlagsAVX2_Prompt
+ 
+     MessageBox MB_YESNO $3 IDYES DownloadAVX2 IDNO ContinueInstall
+     DownloadAVX2:
+-      ${OpenURL} '$3'
++      ${OpenURL} "${DL_URL}#version-${VERSION_LONG}"
+       Quit
+     ContinueInstall:
+       Pop $3
 diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
 index 9fa11fd534c..0dcc76d3ab3 100755
 --- a/indra/newview/viewer_manifest.py

diff --git a/util/build.sh b/util/build.sh
@@ -265,6 +265,8 @@ function 0a1_ninja_postbuild() {( $_dbgopts;
 
 function make_installer() {
   local nsi=$build_dir/newview/${viewer_bin}_setup_tmp.nsi
+  # correct FirestormOSSgeo-VR-GHA => FirestormOS-Sgeo-VR-GHA
+  perl -i.bak2 -pe "s@(${viewer_name}OS)(${viewer_channel})@\$1-\$2@g" $nsi
   #s@^SetCompressor .*$@SetCompressor zlib@g;
 
   export XZ_DEFAULTS=-T0
@@ -275,6 +277,10 @@ function make_installer() {
 
   local InstallerName=$(basename $build_dir/newview/*Setup*.exe)
   local InstallerExe=${InstallerName/.exe/-$version_shas.exe}
+  local VARCH="_LEGACY"
+  if [[ $base == *avx2* ]] ; then VARCH="_AVX2" ; fi
+  #eg: FirestormOS-VR-GHA_AVX2.7.1.11.76496-7dc08a7-419c06c_Setup.exe
+  local InstallerExe=${viewer_name}OS-${viewer_channel/${viewer_name}-/}_${VARCH}.${version_xyzw}-${version_shas}_Setup.exe
   mv -v $build_dir/newview/*Setup*.exe $build_dir/$InstallerExe
   # echo windows_installer=$build_dir/$InstallerExe | tee -a $GITHUB_OUTPUT
 }