[Openvpn-devel,1/3] msvc: fix product version display

Message ID 20211013230227.199-1-lstipakov@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,1/3] msvc: fix product version display
Related show

Commit Message

Lev Stipakov Oct. 13, 2021, 11:02 p.m.
From: Lev Stipakov <lev@openvpn.net>

PRODUCT_VERSION_PATCH, defined in version.m4, already includes dot (like ".4"),
so no need to include it here.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 config-msvc-version.h.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Gert Doering Oct. 14, 2021, 2:31 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

"makes sense"

Your patch has been applied to the master and release/2.5 branch.

(As a side note, why do we have PACKAGE_VERSION and PRODUCT_VERSION there
that seem to be totally identical, but each one defined individually?)

commit 23143667ff3368694191a57fea29b41d25c4b135 (master)
commit d6a9bf5d77451571b8d4ba83f5a80f5e16f9174b (release/2.5)
Author: Lev Stipakov
Date:   Thu Oct 14 02:02:27 2021 +0300

     msvc: fix product version display

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20211013230227.199-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22931.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/config-msvc-version.h.in b/config-msvc-version.h.in
index 7977cb84..59ca654a 100644
--- a/config-msvc-version.h.in
+++ b/config-msvc-version.h.in
@@ -5,8 +5,8 @@ 
 #define PRODUCT_VERSION_MAJOR "@PRODUCT_VERSION_MAJOR@"
 #define PRODUCT_VERSION_MINOR "@PRODUCT_VERSION_MINOR@"
 #define PRODUCT_VERSION_PATCH "@PRODUCT_VERSION_PATCH@"
-#define PACKAGE_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@.@PRODUCT_VERSION_PATCH@"
-#define PRODUCT_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@.@PRODUCT_VERSION_PATCH@"
+#define PACKAGE_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@@PRODUCT_VERSION_PATCH@"
+#define PRODUCT_VERSION "@PRODUCT_VERSION_MAJOR@.@PRODUCT_VERSION_MINOR@@PRODUCT_VERSION_PATCH@"
 #define PRODUCT_BUGREPORT "@PRODUCT_BUGREPORT@"
 #define OPENVPN_VERSION_RESOURCE @PRODUCT_VERSION_RESOURCE@
 #define TAP_WIN_COMPONENT_ID "@PRODUCT_TAP_WIN_COMPONENT_ID@"