From: John Wolfe <jwolfe@vmware.com>
Date: Wed, 19 Aug 2020 17:01:16 +0000 (-0700)
Subject: Prepare the branch for VMware Tools 11.1.5 update builds.
X-Git-Tag: stable-11.1.5~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f67deb5c749e3b32bd79620958b36a1bfebed173;p=thirdparty%2Fopen-vm-tools.git

Prepare the branch for VMware Tools 11.1.5 update builds.

Set the open-vm-tools version number to 11.1.5.
---

diff --git a/open-vm-tools/lib/include/vm_tools_version.h b/open-vm-tools/lib/include/vm_tools_version.h
index 830551e77..e973c0dbc 100644
--- a/open-vm-tools/lib/include/vm_tools_version.h
+++ b/open-vm-tools/lib/include/vm_tools_version.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2020 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -47,6 +47,7 @@
  *          reformating or changing macro names is being performed
  *          please run the perl script to ensure it succeeds.
  */
+/* clang-format off */
 
 
 /*
@@ -1589,15 +1590,29 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define   TOOLS_VERSION_SLEDGEHAMMER_UPDATE1_V_BASE 5
 
 #ifndef RC_INVOKED
-#define   TOOLS_VERSION_NEXT TOOLS_VERSION_TO_UINT(TOOLS_VERSION_NEXT_V)
+#define   TOOLS_VERSION_BALLPEENHAMMER_RELEASE TOOLS_VERSION_TO_UINT(TOOLS_VERSION_BALLPEENHAMMER_RELEASE_V)
 #endif /* RC_INVOKED */
-#define   TOOLS_VERSION_NEXT_V_MJR  11
-#define   TOOLS_VERSION_NEXT_V_MNR  1
-#define   TOOLS_VERSION_NEXT_V_BASE 0
+#define   TOOLS_VERSION_BALLPEENHAMMER_RELEASE_V_MJR  11
+#define   TOOLS_VERSION_BALLPEENHAMMER_RELEASE_V_MNR  1
+#define   TOOLS_VERSION_BALLPEENHAMMER_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_BALLPEENHAMMER_PATCH1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V_MJR  11
+#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V_MNR  1
+#define   TOOLS_VERSION_BALLPEENHAMMER_PATCH1_V_BASE 1
+
+#ifndef RC_INVOKED
+#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1 TOOLS_VERSION_TO_UINT(TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V)
+#endif /* RC_INVOKED */
+#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_MJR  11
+#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_MNR  1
+#define   TOOLS_VERSION_BALLPEENHAMMER_UPDATE1_V_BASE 5
+
+#define   TOOLS_VERSION_CURRENT        TOOLS_VERSION_BALLPEENHAMMER_UPDATE1
+#define   TOOLS_VERSION_CURRENT_STR    TOOLS_VERSION_TO_STR(TOOLS_VERSION_BALLPEENHAMMER_UPDATE1)
+#define   TOOLS_VERSION_CURRENT_CSV    TOOLS_VERSION_TO_CSV(TOOLS_VERSION_BALLPEENHAMMER_UPDATE1)
 
 /*
  * The extended Tools version is the current Tools version with the
@@ -1614,6 +1629,8 @@ TOOLS_VERSION_UINT_TO_COMPONENTS(const ToolsVersion toolsVersion,   // IN
 #define TOOLS_VERSION_EXT_CURRENT_STR \
    TOOLS_VERSION_CURRENT_STR "." PRODUCT_BUILD_NUMBER_NUMERIC_STRING
 
+/* clang-format on */
+
 #endif /* VM_TOOLS_VERSION_H */
 
 #endif /* defined(USE_GOBUILD_TOOLS_VERSION) && !defined(GOBUILD_TOOLS_VERSION_USED) */