File 5323-Rename-macros.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 5323-Rename-macros.patch of Package erlang (Revision dcd1e7a9f13fcca568b5570b1faadc72)

Currently displaying revision dcd1e7a9f13fcca568b5570b1faadc72 , Show latest

From d6c3b02943bc1caf2d6db5411b6a078d20e0c6f0 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Mon, 30 Jan 2023 15:51:59 +0100
Subject: [PATCH 3/5] Rename macros

So they are named as they should be.
---
 erts/etc/win32/nsis/Makefile     |  4 ++--
 erts/etc/win32/nsis/erlang20.nsi | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/erts/etc/win32/nsis/Makefile b/erts/etc/win32/nsis/Makefile
index 2c60bedfa9..1b01ab7b06 100644
--- a/erts/etc/win32/nsis/Makefile
+++ b/erts/etc/win32/nsis/Makefile
@@ -74,8 +74,8 @@ release_spec:
 	v2.* | v3.0 | v3.01) \
 	  echo "Unsupported NSIS version: $$NSIS_VER";;\
 	v3.*) \
-	  echo '!define OTP_VERSION "$(SYSTEM_VSN)"' > $(VERSION_HEADER);\
-	  echo '!define OTP_RELEASE_VERSION "$(OTP_VERSION)"' >> $(VERSION_HEADER);\
+	  echo '!define OTP_RELEASE "$(SYSTEM_VSN)"' > $(VERSION_HEADER);\
+	  echo '!define OTP_VERSION "$(OTP_VERSION)"' >> $(VERSION_HEADER);\
 	  echo '!define ERTS_VERSION "$(VSN)"' >> $(VERSION_HEADER);\
 	  echo '!define TESTROOT "$(WTESTROOT)"' >> $(VERSION_HEADER);\
 	  echo '!define OUTFILEDIR "$(WTARGET_DIR)"' >> $(VERSION_HEADER);\
diff --git a/erts/etc/win32/nsis/erlang20.nsi b/erts/etc/win32/nsis/erlang20.nsi
index 56928dd810..9a63842ac0 100644
--- a/erts/etc/win32/nsis/erlang20.nsi
+++ b/erts/etc/win32/nsis/erlang20.nsi
@@ -32,7 +32,7 @@
 
 	!include "erlang.nsh" ; All release specific parameters come from this
 
-	Name "${OTP_PRODUCT} ${OTP_VERSION}"
+	Name "${OTP_PRODUCT} ${OTP_RELEASE}"
 
 	!include "MUI.nsh"
 	!include "WordFunc.nsh"
@@ -52,7 +52,7 @@ Var STARTMENU_FOLDER
 !define MY_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
 
 ;General
-	OutFile "${OUTFILEDIR}\otp_${WINTYPE}_${OTP_RELEASE_VERSION}.exe"
+	OutFile "${OUTFILEDIR}\otp_${WINTYPE}_${OTP_VERSION}.exe"
 
 ;Folder selection page
 !if ${WINTYPE} == "win64"
@@ -66,9 +66,9 @@ Var STARTMENU_FOLDER
 ; Set the default start menu folder
 
 !if ${WINTYPE} == "win64"
-	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION} (x64)"
+	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_RELEASE} (x64)"
 !else
-	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_VERSION} (i386)"
+	!define MUI_STARTMENUPAGE_DEFAULTFOLDER "${OTP_PRODUCT} ${OTP_RELEASE} (i386)"
 !endif  
 
 ;--------------------------------
@@ -102,13 +102,13 @@ Var STARTMENU_FOLDER
 ;--------------------------------
 ; Installer file properties
 
-VIProductVersion "${OTP_VERSION}"
+VIProductVersion "${OTP_RELEASE}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Ericsson AB"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Erlang"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${ERTS_VERSION}"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright Ericsson AB 2010-2023. All Rights Reserved."
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Erlang/OTP"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${OTP_VERSION}"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductVersion" "${OTP_RELEASE}"
 
 ;--------------------------------
 ;Language Strings
@@ -224,10 +224,10 @@ done_startmenu:
 
   	WriteRegStr HKLM \
 		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP" \
-		"DisplayName" "Erlang OTP ${OTP_RELEASE_VERSION} (${ERTS_VERSION})"
+		"DisplayName" "Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})"
 	WriteRegStr HKLM \
 		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP" \
-		"DisplayVersion" "${OTP_RELEASE_VERSION}"
+		"DisplayVersion" "${OTP_VERSION}"
 	WriteRegStr HKLM \
 		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP" \
 		"Publisher" "Ericsson AB"
@@ -254,10 +254,10 @@ done_startmenu:
 
   	WriteRegStr HKCU \
 		"Software\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP" \
-		"DisplayName" "Erlang OTP ${OTP_RELEASE_VERSION} (${ERTS_VERSION})"
+		"DisplayName" "Erlang OTP ${OTP_VERSION} (${ERTS_VERSION})"
 	WriteRegStr HKCU \
 		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP" \
-		"DisplayVersion" "${OTP_RELEASE_VERSION}"
+		"DisplayVersion" "${OTP_VERSION}"
 	WriteRegStr HKCU \
 		"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Erlang OTP" \
 		"Publisher" "Ericsson AB"
-- 
2.35.3

Places

File 5323-Rename-macros.patch of Package erlang (Revision dcd1e7a9f13fcca568b5570b1faadc72)

Places