From 049a89b2ce3c1035a7a73c85654230ac1ee11e70 Mon Sep 17 00:00:00 2001
From: Gerald Combs <gerald@wireshark.org>
Date: Tue, 6 Jun 2023 17:54:57 -0700
Subject: CMake+Windows: Use "x64" instead of "win64"

Use "x64" to refer to "Windows running on 64-bit Intel processors". Get
rid of WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE in favor of
WIRESHARK_TARGET_PLATFORM because the latter is shorter.
---
 packaging/nsis/CMakeLists.txt          | 8 ++++----
 packaging/nsis/logray-common.nsh       | 4 ++--
 packaging/nsis/logray-config.nsh.in    | 2 +-
 packaging/nsis/logray.nsi              | 4 ++--
 packaging/nsis/wireshark-common.nsh    | 4 ++--
 packaging/nsis/wireshark-config.nsh.in | 2 +-
 packaging/nsis/wireshark.nsi           | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'packaging/nsis')

diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index 4afd58b131..e30eb5d875 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -119,8 +119,8 @@ endif()
 
 find_program(_vcredist
 	NAMES
-		"vc_redist.${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe" # Visual Studio 2022 and later
-		"vcredist_${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe" # Visual Studio 2019 and earlier
+		"vc_redist.${WIRESHARK_TARGET_PLATFORM}.exe" # Visual Studio 2022 and later
+		"vcredist_${WIRESHARK_TARGET_PLATFORM}.exe" # Visual Studio 2019 and earlier
 	PATHS "${_PROJECT_LIB_DIR}" $ENV{VCToolsRedistDir} "${VCINSTALLDIR}"
 	PATH_SUFFIXES ${_ws_vcredist_subdir} ${_ms_vcredist_subdir}
 	NO_DEFAULT_PATH
@@ -396,12 +396,12 @@ set(CLEAN_FILES
 	#NEWS.txt
 	#user-guide.chm
 	${DATAFILE_DIR}/uninstall-wireshark.exe
-	wireshark-${VERSION}-${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe
+	wireshark-${VERSION}-${WIRESHARK_TARGET_PLATFORM}.exe
 	wireshark-config.nsh
 	wireshark-manifest.nsh
 	wireshark-qt-manifest.nsh
 	${DATAFILE_DIR}/uninstall-logray.exe
-	logray-${VERSION}-${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe
+	logray-${VERSION}-${WIRESHARK_TARGET_PLATFORM}.exe
 	logray-config.nsh
 	logray-manifest.nsh
 	logray-qt-manifest.nsh
diff --git a/packaging/nsis/logray-common.nsh b/packaging/nsis/logray-common.nsh
index 6f1c81c076..4eaacd5cae 100644
--- a/packaging/nsis/logray-common.nsh
+++ b/packaging/nsis/logray-common.nsh
@@ -20,7 +20,7 @@ ManifestDPIAware true
 
 !include "logray-config.nsh"
 
-!define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}"
+!define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} ${WIRESHARK_TARGET_PLATFORM}"
 Name "${DISPLAY_NAME}"
 
 !define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Log Analyzer"
@@ -34,7 +34,7 @@ VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
 ; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol.
 VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others"
 VIAddVersionKey "LegalTrademarks" "Logray and the 'ray' logo are registered trademarks"
-VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for Windows on ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}"
+VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for Windows on ${WIRESHARK_TARGET_PLATFORM}"
 VIAddVersionKey "Language" "English"
 VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
diff --git a/packaging/nsis/logray-config.nsh.in b/packaging/nsis/logray-config.nsh.in
index 7d1710f00a..b08327221f 100644
--- a/packaging/nsis/logray-config.nsh.in
+++ b/packaging/nsis/logray-config.nsh.in
@@ -7,7 +7,7 @@
 # MUST match "<Product ... Name=" in wix/Wireshark.wxs.
 #define PROGRAM_NAME "@LOG_PROGRAM_NAME@"
 #define TOP_SRC_DIR "@TOP_SRC_DIR@"
-#define WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE @WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@
+#define WIRESHARK_TARGET_PLATFORM @WIRESHARK_TARGET_PLATFORM@
 #define EXTRA_INSTALLER_DIR "@EXTRA_INSTALLER_DIR@"
 #define VERSION @LOG_PROJECT_VERSION@
 #define PRODUCT_VERSION @LOG_PRODUCT_VERSION@
diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi
index d8888e1b4c..b3b024d71f 100644
--- a/packaging/nsis/logray.nsi
+++ b/packaging/nsis/logray.nsi
@@ -36,7 +36,7 @@ SetCompressorDictSize 64 ; MB
 ; ============================================================================
 
 ; The file to write
-OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${VERSION}-${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe"
+OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${VERSION}-${WIRESHARK_TARGET_PLATFORM}.exe"
 ; Installer icon
 Icon "${TOP_SRC_DIR}\resources\icons\lograyinst.ico"
 
@@ -258,7 +258,7 @@ Var WIX_UNINSTALLSTRING
 !include WinMessages.nsh
 
 Function .onInit
-  !if ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE} == "x64"
+  !if ${WIRESHARK_TARGET_PLATFORM} == "x64"
     ; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873
     ${IfNot} ${RunningX64}
       MessageBox MB_OK "Logray only runs on 64-bit machines." /SD IDOK
diff --git a/packaging/nsis/wireshark-common.nsh b/packaging/nsis/wireshark-common.nsh
index e22a1cf3ff..53f62be2c7 100644
--- a/packaging/nsis/wireshark-common.nsh
+++ b/packaging/nsis/wireshark-common.nsh
@@ -20,7 +20,7 @@ ManifestDPIAware true
 
 !include "wireshark-config.nsh"
 
-!define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}"
+!define DISPLAY_NAME "${PROGRAM_NAME} ${VERSION} ${WIRESHARK_TARGET_PLATFORM}"
 Name "${DISPLAY_NAME}"
 
 !define PROGRAM_FULL_NAME "The ${PROGRAM_NAME} Network Protocol Analyzer"
@@ -34,7 +34,7 @@ VIAddVersionKey "CompanyName" "${PROGRAM_NAME} development team"
 ; NSIS handles U+00a9 but not a UTF-8 encoded copyright symbol.
 VIAddVersionKey "LegalCopyright" "${U+00a9} Gerald Combs and many others"
 VIAddVersionKey "LegalTrademarks" "Wireshark and the 'fin' logo are registered trademarks of the Wireshark Foundation"
-VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for Windows on ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}"
+VIAddVersionKey "FileDescription" "${PROGRAM_NAME} installer for Windows on ${WIRESHARK_TARGET_PLATFORM}"
 VIAddVersionKey "Language" "English"
 VIAddVersionKey "ProductVersion" "${PRODUCT_VERSION}"
 VIAddVersionKey "FileVersion" "${PRODUCT_VERSION}"
diff --git a/packaging/nsis/wireshark-config.nsh.in b/packaging/nsis/wireshark-config.nsh.in
index 713649b10e..769f9e7cf7 100644
--- a/packaging/nsis/wireshark-config.nsh.in
+++ b/packaging/nsis/wireshark-config.nsh.in
@@ -7,7 +7,7 @@
 # MUST match "<Product ... Name=" in wix/Wireshark.wxs.
 #define PROGRAM_NAME "@PROGRAM_NAME@"
 #define TOP_SRC_DIR "@TOP_SRC_DIR@"
-#define WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE @WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE@
+#define WIRESHARK_TARGET_PLATFORM @WIRESHARK_TARGET_PLATFORM@
 #define EXTRA_INSTALLER_DIR "@EXTRA_INSTALLER_DIR@"
 #define NPCAP_PACKAGE_VERSION @NPCAP_VERSION@
 #define USBPCAP_PACKAGE_VERSION @USBPCAP_VERSION@
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 9bd677713b..fd07cb4140 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -39,7 +39,7 @@ ${UnStrRep}
 ; ============================================================================
 
 ; The file to write
-OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${VERSION}-${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe"
+OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${VERSION}-${WIRESHARK_TARGET_PLATFORM}.exe"
 ; Installer icon
 Icon "${TOP_SRC_DIR}\resources\icons\wiresharkinst.ico"
 ; Uninstaller icon
@@ -296,13 +296,13 @@ Function .onInit
     Abort
   ${EndIf}
 
-  !if ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE} == "x64"
+  !if ${WIRESHARK_TARGET_PLATFORM} == "x64"
     ${If} ${IsNativeARM64}
       MessageBox MB_OK "You're installing the x64 version of Wireshark on an Arm64 system.$\nThe native Arm64 installer might work better." /SD IDOK
     ${EndIf}
   !endif
 
-  !if ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE} == "arm64"
+  !if ${WIRESHARK_TARGET_PLATFORM} == "arm64"
     ${IfNot} ${IsNativeARM64}
       MessageBox MB_OK "You're trying to install the Arm64 version of Wireshark on an x64 system.$\nTry the native x64 installer instead." /SD IDOK
       Abort
-- 
cgit v1.2.3