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 00586cc60e386232fbddbe5d14e0b72a8d6b4df7..c1ae8f3524a65aff4654dd64a7d73ff68954039d 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-2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 2006-2019 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
@@ -69,7 +69,7 @@
  */
 #define PRODUCT_SCALABLE_SERVER_BRIEF_NAME "ESX"
 #define PRODUCT_ESXI_BRIEF_NAME "ESXi"
-#define PRODUCT_VMVISOR_BRIEF_NAME PRODUCT_ESXI_BRIEF_NAME 
+#define PRODUCT_VMVISOR_BRIEF_NAME PRODUCT_ESXI_BRIEF_NAME
 #define PRODUCT_WORKSTATION_BRIEF_NAME "Workstation"
 #define PRODUCT_WORKSTATION_SERVER_BRIEF_NAME "Workstation Server"
 #define PRODUCT_PLAYER_BRIEF_NAME "Player"
@@ -266,7 +266,11 @@
 #elif defined(VMX86_HBR_SERVER)
 # define PRODUCT_SHORT_NAME PRODUCT_HBR_SERVER_NAME
 #elif defined(VMX86_HORIZON_VIEW)
-# define PRODUCT_SHORT_NAME PRODUCT_VIEW_NAME
+# if defined(VDM_CLIENT)
+#  define PRODUCT_SHORT_NAME PRODUCT_VDM_CLIENT_NAME
+# else
+#  define PRODUCT_SHORT_NAME PRODUCT_VIEW_NAME
+# endif
 #elif defined(VMX86_VMCF)
 # define PRODUCT_SHORT_NAME PRODUCT_VMCF_NAME
 #elif defined(VMX86_INTEGRITY)

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index c0b319dc61c56c903c3d3ede7f067e192d94ba46..5067828c8b70a99102b6491b2fd20592cf83deb7 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -32,13 +32,8 @@
  * When building the Tools, we make an effort to follow the "internal" Tools
  * version. Otherwise we use a hard-coded value for Workstation and a different
  * hard-coded value for every other product.
- *
- * Note: VMX86_VIEWCLIENT must be before VMX86_DESKTOP so that crtbora
- * versioning is correct.
  */
-#if defined(VMX86_VIEWCLIENT)
-   #define PRODUCT_VERSION    4,7,0,PRODUCT_BUILD_NUMBER_NUMERIC
-#elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
+#if defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
    #define PRODUCT_VERSION    11,0,0,PRODUCT_BUILD_NUMBER_NUMERIC   /* VMRC_VERSION_NUMBER below has to match this */
 #elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
    #define PRODUCT_VERSION    8,0,0,PRODUCT_BUILD_NUMBER_NUMERIC   /* FLEX_VERSION_NUMBER below has to match this */
@@ -50,7 +45,11 @@
    /* this should be kept in sync with the corresponding vpx branch. */
    #define PRODUCT_VERSION    6,8,4,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_HORIZON_VIEW)
-   #define PRODUCT_VERSION    0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
+   #if defined(VDM_CLIENT)
+      #define PRODUCT_VERSION    5,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
+   #else
+      #define PRODUCT_VERSION    7,8,0,PRODUCT_BUILD_NUMBER_NUMERIC
+   #endif
 // VMX86_DESKTOP must be last because it is the default and is always defined.
 #elif defined(VMX86_DESKTOP)
    // WORKSTATION_VERSION_NUMBER below has to match this
@@ -263,7 +262,6 @@
 #define OVFTOOL_VERSION "4.3.0"
 #define VCSA_INSTALLER_VERSION "1.0.0"
 #define OVFTOOL_FILE_VERSION 4,3,0,PRODUCT_BUILD_NUMBER_NUMERIC
-#define VDM_CLIENT_VERSION "5.0.0"
 #define VGAUTH_VERSION "1.0.0"
 #define COMMON_AGENT_VERSION "e.x.p"
 #define VIEWY_VERSION "e.x.p"
@@ -318,9 +316,7 @@
 #define VIM_ESX_PRODUCT_LINE_ID "esx"
 #define VIM_WS_PRODUCT_LINE_ID "ws"
 
-#if defined(VMX86_VIEWCLIENT)
-#  define PRODUCT_VERSION_NUMBER VDM_CLIENT_VERSION
-#elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
+#if defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #  define PRODUCT_VERSION_NUMBER VMRC_VERSION
 #elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
 #  define PRODUCT_VERSION_NUMBER FLEX_VERSION
@@ -357,7 +353,11 @@
 #elif defined(VMX86_HBR_SERVER)
 #  define PRODUCT_VERSION_NUMBER ESX_VERSION
 #elif defined(VMX86_HORIZON_VIEW)
-#  define PRODUCT_VERSION_NUMBER VIEW_VERSION
+#  if defined(VDM_CLIENT)
+#    define PRODUCT_VERSION_NUMBER VIEW_CLIENT_VERSION
+#  else
+#    define PRODUCT_VERSION_NUMBER VIEW_VERSION
+#  endif
 #elif defined(VMX86_INTEGRITY)
 #  define PRODUCT_VERSION_NUMBER INTEGRITY_VERSION
 #elif defined(VMX86_VGAUTH)