From: John Wolfe <jwolfe@vmware.com>
Date: Thu, 20 Jan 2022 19:40:15 +0000 (-0800)
Subject: Set tools builds on the "devel" branch to version 12.1.0.
X-Git-Tag: stable-12.1.0~164
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f084152e3e03d22dcaa5d80118f244dba3f1455;p=thirdparty%2Fopen-vm-tools.git

Set tools builds on the "devel" branch to version 12.1.0.

Also, add back the definitions of TOOLS_VERSION_NEXT* inadvertently
removed in the previous change to vm_tools_version.h.
---

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index 7a01c9794..3895f2146 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1694,9 +1694,16 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_SABRE_SAW_RELEASE_V_MNR  0
 #define   TOOLS_VERSION_SABRE_SAW_RELEASE_V_BASE 0
 
-#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_SABRE_SAW_RELEASE
-#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_SABRE_SAW_RELEASE)
-#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_SABRE_SAW_RELEASE)
+#ifndef RC_INVOKED
+#define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_NEXT_V_MJR  12
+#define   TOOLS_VERSION_NEXT_V_MNR  1
+#define   TOOLS_VERSION_NEXT_V_BASE 0
+
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_NEXT
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_NEXT)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_NEXT)
 
 /*
  * The extended Tools version is the current Tools version with the