speedo: Change install directory for Windows

--

Given that we will build only 64 bit versions, we need to switch where
stuff is installed on Windows.

2 files changed, 15 insertions, 7 deletions

diff --git a/build-aux/speedo.mk b/build-aux/speedo.mk
index aaf7065db..68c4af1fd 100644
--- a/build-aux/speedo.mk
+++ b/build-aux/speedo.mk
@@ -186,7 +186,7 @@ MAKE_J=6
 # Name to use for the w32 installer and sources
 
 
-INST_NAME=gnupg-$(W32VERSION)
+INST_NAME=gnupg-w32
 
 # Use this to override the installaion directory for native builds.
 INSTALL_PREFIX=none
@@ -384,6 +384,9 @@ ifeq ($(W32VERSION),w64)
   $(info Windows version : 64 bit)
 else
   $(info Windows version : 32 bit)
+ifneq ($(W32VERSION),w32)
+  $(error W32VERSION is not set to a proper value: Use only w32 or w64)
+endif
 endif
 endif
 
diff --git a/build-aux/speedo/w32/inst.nsi b/build-aux/speedo/w32/inst.nsi
index 6c4b84969..acd32ad27 100644
--- a/build-aux/speedo/w32/inst.nsi
+++ b/build-aux/speedo/w32/inst.nsi
@@ -46,7 +46,7 @@ Unicode true
 !define PRETTY_PACKAGE "GNU Privacy Guard"
 !define PRETTY_PACKAGE_SHORT "GnuPG"
 !define COMPANY "The GnuPG Project"
-!define COPYRIGHT "Copyright (C) 2021 g10 Code GmbH"
+!define COPYRIGHT "Copyright (C) 2024 g10 Code GmbH"
 !define DESCRIPTION "GnuPG: The GNU Privacy Guard for Windows"
 
 !define INSTALL_DIR "GnuPG"
@@ -63,13 +63,13 @@ Unicode true
   GnuPG includes an advanced key management facility and is compliant \
   with the OpenPGP Internet standard as described in RFC-4880. \
   \r\n\r\n$_CLICK \
-  \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION}.\r\n\
+  \r\n\r\n\r\n\r\n\r\nThis is GnuPG version ${VERSION} (64 bit).\r\n\
   File version: ${PROD_VERSION}\r\n\
   Release date: ${BUILD_ISODATE}"
 !define ABOUT_GERMAN \
  "GnuPG is die häufigst verwendete Software zur Mail- und Datenverschlüsselung.\
    \r\n\r\n$_CLICK \
-   \r\n\r\n\r\n\r\n\r\nDies ist GnuPG Version ${VERSION}.\r\n\
+   \r\n\r\n\r\n\r\n\r\nDies ist GnuPG Version ${VERSION} (64 bit).\r\n\
    Dateiversion: ${PROD_VERSION}\r\n\
    Releasedatum: ${BUILD_ISODATE}"
 
@@ -119,7 +119,7 @@ OutFile "${NAME}-${VERSION}_${BUILD_DATESTR}.exe"
 !ifndef INSTALL_DIR
 !define INSTALL_DIR "GnuPG"
 !endif
-InstallDir "$PROGRAMFILES\${INSTALL_DIR}"
+InstallDir "$PROGRAMFILES64\${INSTALL_DIR}"
 
 # Add version information to the file properties.
 VIProductVersion "${PROD_VERSION}"
@@ -1465,7 +1465,12 @@ Function .onInit
 
   Call G4wRunOnce
 
-  SetOutPath $TEMP
+   ${IfNot} ${RunningX64}
+       MessageBox MB_OK "Sorry this version runs only on x64 machines"
+       Abort
+   ${EndIf}
+
+   SetOutPath $TEMP
 #!ifdef SOURCES
 #  File /oname=gpgspltmp.bmp "${TOP_SRCDIR}/doc/logo/gnupg-logo-400px.bmp"
 #  # We play the tune only for the soruce installer
@@ -1486,7 +1491,7 @@ Function .onInit
 
   Var /GLOBAL changed_dir
   # Check if the install directory was modified on the command line
-  StrCmp "$INSTDIR" "$PROGRAMFILES\${INSTALL_DIR}" unmodified 0
+  StrCmp "$INSTDIR" "$PROGRAMFILES64\${INSTALL_DIR}" unmodified 0
   # It is modified. Save that value.
   StrCpy $changed_dir "$INSTDIR"