Changes to common header files not applicable to open-vm-tools.

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index d8464d705cc5e33aff1374319ea9b57f25430c69..c27a35ecac783f2a5cdc0eafdc4769a83a7eec03 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2006-2019 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-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
@@ -120,8 +120,6 @@
 
 #define PRODUCT_HA_NAME MAKE_NAME("High Availability Extension")
 
-#define PRODUCT_WBC_NAME MAKE_NAME("WebCenter")
-
 #define PRODUCT_SDK_NAME MAKE_NAME("SDK")
 
 #define PRODUCT_DDK_NAME MAKE_NAME("ESX DDK")
@@ -194,7 +192,6 @@
       || defined(VMX86_DESKTOP)  \
       || defined(VMX86_HORIZON_VIEW)     \
       || defined(VMX86_VPX)      \
-      || defined(VMX86_WBC)      \
       || defined(VMX86_SDK)      \
       || defined(VMX86_TOOLS)    \
       || defined(VMX86_V2V)      \
@@ -245,8 +242,6 @@
 #  else
 #     define PRODUCT_SHORT_NAME PRODUCT_VPX_NAME
 #  endif
-#elif defined(VMX86_WBC)
-# define PRODUCT_SHORT_NAME PRODUCT_WBC_NAME
 #elif defined(VMX86_SDK)
 # define PRODUCT_SHORT_NAME PRODUCT_SDK_NAME
 #elif defined(VMX86_P2V)

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 5a22260c206bc33aa2e9df866b8d7dc42c55cc6a..fc85f7affd0a18905a9971b57f91b8ea2b45a0c1 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -151,8 +151,6 @@
 #define ESX_RELEASE ESX_RELEASE_QUARTERLY "." ESX_RELEASE_PATCH
 
 #define WORKSTATION_RELEASE_DESCRIPTION ""
-#define WSX_SERVER_VERSION_NUMBER "1.0.0"
-#define WSX_SERVER_VERSION "e.x.p"
 #define P2V_VERSION "e.x.p"
 #define P2V_FILE_VERSION 3,0,0,0
 
@@ -248,7 +246,6 @@
 #define INTEGRITY_VERSION "7.0.1" /* Should use VPX_VERSION? */
 #define SVA_VERSION "1.0.0"
 #define SSO_VERSION "1.0.0"
-#define WBC_VERSION "5.1.0"
 #define SDK_VERSION "4.1.0"
 #define FOUNDRY_VERSION "1.17.0"
 #define FOUNDRY_FILE_VERSION 1,17,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -339,8 +336,6 @@
 #  else
 #     define PRODUCT_VERSION_NUMBER VPX_VERSION
 #  endif
-#elif defined(VMX86_WBC)
-#  define PRODUCT_VERSION_NUMBER WBC_VERSION
 #elif defined(VMX86_SDK)
 #  define PRODUCT_VERSION_NUMBER SDK_VERSION
 #elif defined(VMX86_P2V)
@@ -420,15 +415,9 @@
 #    define PRODUCT_LICENSE_VERSION PRODUCT_VMRC_VERSION_STRING_FOR_LICENSE
 #  elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
 #    define PRODUCT_LICENSE_VERSION PRODUCT_FLEX_VERSION_STRING_FOR_LICENSE
-#  elif defined(VMX86_WGS_MIGRATION)
-#    define PRODUCT_LICENSE_VERSION "1.0"
-#  elif defined(VMX86_WGS)
-#    define PRODUCT_LICENSE_VERSION "3.0"
 #  elif defined(VMX86_VPX)
 #    define PRODUCT_LICENSE_VERSION "7.0"
 #    define PRODUCT_LICENSE_FILE_VERSION "7.0.2.0"
-#  elif defined(VMX86_WBC)
-#    define PRODUCT_LICENSE_VERSION "1.0"
 #  elif defined(VMX86_SDK)
 #    define PRODUCT_LICENSE_VERSION "1.0"
 #  elif defined(VMX86_P2V)