From: John Wolfe <jwolfe@vmware.com>
Date: Fri, 11 Dec 2020 05:05:48 +0000 (-0800)
Subject: Prepare the vmtools-prod-cpd branch for the VMware Tools 11.2.5 build.
X-Git-Tag: stable-11.2.5~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35a57d5cb66113095142fdfb07d39f756d5a81af;p=thirdparty%2Fopen-vm-tools.git

Prepare the vmtools-prod-cpd branch for the VMware Tools 11.2.5 build.

- Set the tools version to 11.2.5.
---

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index bfb0e9fc7..aeed97946 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1639,15 +1639,22 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_BALLPEENHAMMER_PATCH2_V_BASE 6
 
 #ifndef RC_INVOKED
-#define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+#define   TOOLS_VERSION_CRESCENT_WRENCH_RELEASE TOOLS_VERSION_TO_UINT(TOOLS_VERSION_CRESCENT_WRENCH_RELEASE_V)
 #endif /* RC_INVOKED */
-#define   TOOLS_VERSION_NEXT_V_MJR  11
-#define   TOOLS_VERSION_NEXT_V_MNR  2
-#define   TOOLS_VERSION_NEXT_V_BASE 0
+#define   TOOLS_VERSION_CRESCENT_WRENCH_RELEASE_V_MJR  11
+#define   TOOLS_VERSION_CRESCENT_WRENCH_RELEASE_V_MNR  2
+#define   TOOLS_VERSION_CRESCENT_WRENCH_RELEASE_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)
+#ifndef RC_INVOKED
+#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V_MJR  11
+#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V_MNR  2
+#define   TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1_V_BASE 5
+
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_CRESCENT_WRENCH_UPDATE1)
 
 /*
  * The extended Tools version is the current Tools version with the