From ddb174280bf97b8d92a46184619764b9cecd4d16 Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Sun, 27 Jun 2021 17:08:54 -0400 Subject: [PATCH 1/4] Add FileDesciption and LegalCopyright --- share/setup.nsi.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/setup.nsi.in b/share/setup.nsi.in index 6648d248ae..b190a9c3c1 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -66,8 +66,8 @@ VIAddVersionKey ProductVersion "${VERSION}" VIAddVersionKey CompanyName "${COMPANY}" VIAddVersionKey CompanyWebsite "${URL}" VIAddVersionKey FileVersion "${VERSION}" -VIAddVersionKey FileDescription "" -VIAddVersionKey LegalCopyright "" +VIAddVersionKey FileDescription "Installer for @PACKAGE_NAME@" +VIAddVersionKey LegalCopyright "Copyright (C) 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@" InstallDirRegKey HKCU "${REGKEY}" Path ShowUninstDetails show From b4c2479269423a531d47140a98f9ad50b771b47e Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Sun, 27 Jun 2021 17:11:04 -0400 Subject: [PATCH 2/4] Enable Unicode support in Windows installer --- share/setup.nsi.in | 1 + 1 file changed, 1 insertion(+) diff --git a/share/setup.nsi.in b/share/setup.nsi.in index b190a9c3c1..befefd843c 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -2,6 +2,7 @@ Name "@PACKAGE_NAME@ (@WINDOWS_BITS@-bit)" RequestExecutionLevel highest SetCompressor /SOLID lzma +Unicode true # General Symbol Definitions !define REGKEY "SOFTWARE\$(^Name)" From 005276d898e992a8fc485224df212895b051d6d8 Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Sun, 27 Jun 2021 17:17:03 -0400 Subject: [PATCH 3/4] don't pass -w when building for Windows Reference https://github.com/bitcoin/bitcoin/pull/18928 --- configure.ac | 3 --- 1 file changed, 3 deletions(-) diff --git a/configure.ac b/configure.ac index 42f84f7cdf..96c96c0da8 100755 --- a/configure.ac +++ b/configure.ac @@ -415,9 +415,6 @@ case $host in CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -D_WIN32_WINNT=0x0601" LEVELDB_TARGET_FLAGS="-DOS_WINDOWS" - if test "x$CXXFLAGS_overridden" = "xno"; then - CXXFLAGS="$CXXFLAGS -w" - fi case $host in i?86-*) WINDOWS_BITS=32 ;; x86_64-*) WINDOWS_BITS=64 ;; From 8c0763984eea5b5f73b6a109e22758959b87a8e7 Mon Sep 17 00:00:00 2001 From: "James C. Owens" Date: Tue, 29 Jun 2021 08:52:52 -0400 Subject: [PATCH 4/4] Change copyright beginning year. Co-authored-by: div72 <60045611+div72@users.noreply.github.com> --- share/setup.nsi.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/setup.nsi.in b/share/setup.nsi.in index befefd843c..d23b2c6e9d 100644 --- a/share/setup.nsi.in +++ b/share/setup.nsi.in @@ -68,7 +68,7 @@ VIAddVersionKey CompanyName "${COMPANY}" VIAddVersionKey CompanyWebsite "${URL}" VIAddVersionKey FileVersion "${VERSION}" VIAddVersionKey FileDescription "Installer for @PACKAGE_NAME@" -VIAddVersionKey LegalCopyright "Copyright (C) 2009-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@" +VIAddVersionKey LegalCopyright "Copyright (C) 2014-@COPYRIGHT_YEAR@ @COPYRIGHT_HOLDERS_FINAL@" InstallDirRegKey HKCU "${REGKEY}" Path ShowUninstDetails show