[tbb-commits] [builders/tor-browser-build] 07/08: Bug 40409: Upgrade NSIS to 3.08

[gitolite role]

This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch main
in repository builders/tor-browser-build.

commit ca0d30c3166256feeff5f4f9a4fd81b3c843e6dc
Author: Pier Angelo Vendrame <pierov at torproject.org>
AuthorDate: Wed Aug 17 19:36:03 2022 +0200

    Bug 40409: Upgrade NSIS to 3.08
---
 projects/nsis/build  | 6 +++++-
 projects/nsis/config | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/projects/nsis/build b/projects/nsis/build
index 41f7c1a..197af2c 100755
--- a/projects/nsis/build
+++ b/projects/nsis/build
@@ -17,7 +17,7 @@ patch -p1 < $rootdir/no-insert-timestamp.patch
 [% IF c("var/windows-x86_64") %]
   # Seems like setting TARGET_ARCH is not enough so we need to patch build.cpp
   # manually; this is confirmed by a comment in the same file.
-  sed -i 's/m_target_type=TARGET_X86ANSI/m_target_type=TARGET_AMD64/' Source/build.cpp
+  sed -i 's/m_target_type=TARGET_X86UNICODE/m_target_type=TARGET_AMD64/' Source/build.cpp
   [% SET target = "amd64" %]
 [% ELSE %]
   [% SET target = "x86" %]
@@ -29,6 +29,10 @@ patch -p1 < $rootdir/no-insert-timestamp.patch
         _ " TARGET_ARCH=" _ target
         _ " ZLIB_W32=/var/tmp/build/zlib/"
         _ ' PREFIX=/var/tmp/dist/nsis' -%]
+# Parallel compilation might result in errors, but they seems to be recoverable,
+# so we first run scons in parallel, and suppress any error, then we try again,
+# but the second time they make the build fail.
+scons [% scons_args %] -j[% c("num_procs") %] || true
 scons [% scons_args %]
 scons [% scons_args %] install
 cd /var/tmp/dist
diff --git a/projects/nsis/config b/projects/nsis/config
index d6640c0..b1492f2 100644
--- a/projects/nsis/config
+++ b/projects/nsis/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 3.06.1
+version: 3.08
 filename: 'nsis-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 container:
   use_container: 1
@@ -22,7 +22,7 @@ input_files:
   - project: container-image
   - filename: 'nsis-[% c("version") %].tar.bz2'
     URL: 'https://downloads.sourceforge.net/nsis/nsis-[% c("version") %]-src.tar.bz2'
-    sha256sum: 9b5d68bf1874a7b393432410c7e8c376f174d2602179883845d2508152153ff0
+    sha256sum: a85270ad5386182abecb2470e3d7e9bec9fe4efd95210b13551cb386830d1e87
   - filename: no-insert-timestamp.patch
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.