Remove obsolete product version definitions

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 1cd5567b4f2b1dea0002b614f3c70d7c018bdaf3..c60d967ff05cb042028424a9e9b9cdd6672cf9f1 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -61,13 +61,9 @@
 #define PRODUCT_SCALABLE_SERVER_BRIEF_NAME "ESX"
 #define PRODUCT_ESXI_BRIEF_NAME "ESXi"
 #define PRODUCT_WORKSTATION_BRIEF_NAME "Workstation"
-#define PRODUCT_WORKSTATION_ENTERPRISE_BRIEF_NAME \
-         PRODUCT_WORKSTATION_BRIEF_NAME " " "ACE Edition"
 #define PRODUCT_WORKSTATION_SERVER_BRIEF_NAME "Workstation Server"
 #define PRODUCT_PLAYER_BRIEF_NAME "Player"
-#define PRODUCT_ACE_PLAYER_BRIEF_NAME "ACE " PRODUCT_PLAYER_BRIEF_NAME
 #define PRODUCT_MAC_DESKTOP_BRIEF_NAME "Fusion"
-#define PRODUCT_ACE_MANAGEMENT_SERVER_BRIEF_NAME "ACE Management Server"
 #define PRODUCT_VMRC_BRIEF_NAME "Remote Console"
 #define PRODUCT_GANTRY_BRIEF_NAME "AppCatalyst"
 
@@ -83,16 +79,11 @@
 #define VMWARE_TOOLS_SHORT_NAME MAKE_NAME("Tools")
 
 #define PRODUCT_SCALABLE_SERVER_NAME MAKE_NAME(PRODUCT_SCALABLE_SERVER_BRIEF_NAME)
-#define PRODUCT_ESX_SMP_NAME MAKE_NAME("Virtual SMP for ESX Server")
 #define PRODUCT_WORKSTATION_NAME MAKE_NAME(PRODUCT_WORKSTATION_BRIEF_NAME)
-#define PRODUCT_WORKSTATION_ENTERPRISE_NAME MAKE_NAME(PRODUCT_WORKSTATION_ENTERPRISE_BRIEF_NAME)
 #define PRODUCT_WORKSTATION_SERVER_NAME MAKE_NAME(PRODUCT_WORKSTATION_SERVER_BRIEF_NAME)
-#define PRODUCT_MUI_NAME MAKE_NAME("Management Interface")
 #define PRODUCT_CONSOLE_NAME MAKE_NAME("Server Console")
 #define PRODUCT_PLAYER_NAME MAKE_NAME(PRODUCT_PLAYER_BRIEF_NAME)
 #define PRODUCT_PLAYER_NAME_FOR_LICENSE PRODUCT_PLAYER_NAME
-#define PRODUCT_ACE_PLAYER_NAME MAKE_NAME(PRODUCT_ACE_PLAYER_BRIEF_NAME)
-#define PRODUCT_ACE_MANAGEMENT_SERVER_NAME MAKE_NAME(PRODUCT_ACE_MANAGEMENT_SERVER_BRIEF_NAME)
 #define PRODUCT_MAC_DESKTOP_NAME_FOR_LICENSE "VMware Fusion for Mac OS"
 #define PRODUCT_VMRC_NAME MAKE_NAME(PRODUCT_VMRC_BRIEF_NAME)
 #define PRODUCT_VMRC_NAME_FOR_LICENSE PRODUCT_VMRC_NAME
@@ -114,9 +105,6 @@
 #define PRODUCT_SYSIMAGE_SHORT_NAME "SysImage"
 #define PRODUCT_SYSIMAGE_NAME MAKE_NAME("System Image Framework")
 
-#define PRODUCT_VCB_SHORT_NAME "VCB"
-#define PRODUCT_VCB_NAME MAKE_NAME("Consolidated Backup")
-
 #define PRODUCT_VPX_NAME MAKE_NAME("VirtualCenter")
 
 #define PRODUCT_VPXA_NAME PRODUCT_VPX_NAME " Agent"
@@ -137,10 +125,6 @@
 
 #define PRODUCT_SSOREGMM_NAME MAKE_NAME("vCenter Registration Tool")
 
-// XXX I think these are dead and can be removed -clayton
-// #define PRODUCT_VDM_SHORT_NAME "VDM"
-// #define PRODUCT_VDM_NAME MAKE_NAME("Virtual Desktop Manager")
-
 #define PRODUCT_VDDK_SHORT_NAME "VDDK"
 #define PRODUCT_VDDK_NAME MAKE_NAME("Virtual Disk Development Kit")
 
@@ -203,16 +187,13 @@
 
 #if !(   defined(VMX86_SERVER)   \
       || defined(VMX86_DESKTOP)  \
-      || defined(VMX86_ENTERPRISE_DESKTOP) \
       || defined(VMX86_HORIZON_VIEW)     \
-      || defined(VMX86_MUI)      \
       || defined(VMX86_VPX)      \
       || defined(VMX86_WBC)      \
       || defined(VMX86_SDK)      \
       || defined(VMX86_TOOLS)    \
       || defined(VMX86_V2V)      \
       || defined(VMX86_SYSIMAGE) \
-      || defined(VMX86_VCB)      \
       || defined(VMX86_VMLS)     \
       || defined(VMX86_VLICENSE) \
       || defined(VMX86_P2V)      \
@@ -239,16 +220,10 @@
 # define PRODUCT_SHORT_NAME PRODUCT_VMVISOR_NAME
 #elif defined(VMX86_SERVER)
 # define PRODUCT_SHORT_NAME PRODUCT_SCALABLE_SERVER_NAME
-#elif defined(VMX86_CONSOLE)
-# define PRODUCT_SHORT_NAME PRODUCT_CONSOLE_NAME
-#elif defined(VMX86_MUI)
-# define PRODUCT_SHORT_NAME PRODUCT_MUI_NAME
 #elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 # define PRODUCT_SHORT_NAME PRODUCT_VMRC_NAME
 #elif defined(VMX86_GANTRY)
 # define PRODUCT_SHORT_NAME PRODUCT_GANTRY_NAME
-#elif defined(VMX86_ENTERPRISE_DESKTOP)
-# define PRODUCT_SHORT_NAME PRODUCT_WORKSTATION_ENTERPRISE_NAME
 #elif defined(VMX86_TOOLS)
 # define PRODUCT_SHORT_NAME VMWARE_TOOLS_SHORT_NAME
 #elif defined(VMX86_VPX)
@@ -279,8 +254,6 @@
 # define PRODUCT_SHORT_NAME PRODUCT_V2V_NAME
 #elif defined(VMX86_SYSIMAGE)
 # define PRODUCT_SHORT_NAME PRODUCT_SYSIMAGE_NAME
-#elif defined(VMX86_VCB)
-# define PRODUCT_SHORT_NAME PRODUCT_VCB_NAME
 #elif defined(VMX86_VMLS)
 # define PRODUCT_SHORT_NAME PRODUCT_VMLS_NAME
 #elif defined(VMX86_VLICENSE)
@@ -311,18 +284,9 @@
  * Names of programs
  */
 
-#if defined(VMX86_CONSOLE)
-   #if defined(__linux__) || defined(__FreeBSD__)
-   #define VMWARE_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER "-console"
-   #else
-   #define VMWARE_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER "Console.exe"
-   #endif
-#else
 #define VMWARE_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER
-#endif
 
 #define VMWARE_VMX_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER "-vmx"
-#define CCAGENT_DISPLAY_NAME   PRODUCT_VPX_NAME " Agent"
 #if defined(__linux__) || defined(__FreeBSD__)
 #   define VMAUTHD_EXECUTABLE PRODUCT_GENERIC_NAME_LOWER "-authd"
 #else
@@ -362,22 +326,16 @@
  */
 #   if defined(VMX86_SERVER)
 #      define PRODUCT_NAME_FOR_LICENSE "VMware ESX Server"
-#      define PRODUCT_SMP_NAME_FOR_LICENSE PRODUCT_ESX_SMP_NAME
 #   elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_VMRC_NAME_FOR_LICENSE
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   elif defined(VMX86_GANTRY)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_GANTRY_NAME_FOR_LICENSE
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   elif defined(VMX86_VPX)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " Server"
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   elif defined(VMX86_SYSIMAGE)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   elif defined(VMX86_NETDUMP)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NETDUMP_NAME
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" //None
 // VMX86_DESKTOP must be last because it is the default and is always defined.
 #   elif defined(VMX86_DESKTOP)
 #      if defined(__APPLE__)
@@ -385,18 +343,13 @@
 #      else
 #         define PRODUCT_NAME_FOR_LICENSE "VMware Workstation"
 #      endif
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   else   /* It is a product that doesn't use a license */
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   endif
 
 /*
  * VMWARE_HOST_DIRECTORY is for host-specific configuration files.
  * DEFAULT_LIBDIRECTORY is the default for the 'libdir' config variable.
- *
- * The remote console checks at run time, and the MUI is not really a separate
- * product.
  */
 #   if defined(__APPLE__)
 #      if defined VMX86_GANTRY
@@ -409,25 +362,7 @@
 #         define VMWARE_HOST_DIRECTORY_PREFIX \
              "/Library/Application Support/" PRODUCT_SHORT_NAME
 #      endif
-#   endif
-
-#   if defined (VMX86_CONSOLE)
-#      if defined(__APPLE__)
-#         define VMWARE_HOST_DIRECTORY VMWARE_HOST_DIRECTORY_PREFIX " Console"
-#      else
-#         define VMWARE_HOST_DIRECTORY "/etc/" PRODUCT_GENERIC_NAME_LOWER "-console"
-#         define DEFAULT_LIBDIRECTORY "/usr/lib/" PRODUCT_GENERIC_NAME_LOWER "-console"
-#      endif
-#   else
-#      if defined(__APPLE__)
-#         define VMWARE_HOST_DIRECTORY VMWARE_HOST_DIRECTORY_PREFIX
-#      else
-#         define VMWARE_HOST_DIRECTORY "/etc/" PRODUCT_GENERIC_NAME_LOWER
-#         define DEFAULT_LIBDIRECTORY "/usr/lib/" PRODUCT_GENERIC_NAME_LOWER
-#      endif
-#   endif
-
-#   if defined(__APPLE__)
+#      define VMWARE_HOST_DIRECTORY VMWARE_HOST_DIRECTORY_PREFIX
 #      if defined VMX86_DESKTOP
 /* On Mac OS, use Location_Get() instead of DEFAULT_LIBDIRECTORY. */
 #         define DEFAULT_LIBDIRECTORY \
@@ -435,6 +370,9 @@
 #      else
 #         define DEFAULT_LIBDIRECTORY VMWARE_HOST_DIRECTORY
 #      endif
+#   else
+#      define VMWARE_HOST_DIRECTORY "/etc/" PRODUCT_GENERIC_NAME_LOWER
+#      define DEFAULT_LIBDIRECTORY "/usr/lib/" PRODUCT_GENERIC_NAME_LOWER
 #   endif
 
 /* For user-specific files. */
@@ -465,13 +403,10 @@
  */
 #   if defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_VMRC_NAME
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_FLEX_NAME
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   elif defined(VMX86_VPX)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " Server"
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 // VMX86_DESKTOP must be last because it is the default and is always defined.
 #   elif defined(VMX86_DESKTOP)
 #      if defined(__APPLE__)
@@ -479,10 +414,8 @@
 #      else
 #         define PRODUCT_NAME_FOR_LICENSE "VMware Workstation"
 #      endif
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   else
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_REG_NAME
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
 #   endif
 
 #define PRIVATE_REG_KEY "Private"
@@ -523,19 +456,6 @@
 #endif
 
 
-/*
- * This is for ACE Management Server
- * Since there is no separate product defined for Ace Mgmt Server
- * (i.e. PRODUCT=xxx when running makefile), we can not used the
- * generic PRODUCT_NAME_STRING_FOR_LICENSE definition.
- * As a result, the specific ACE_MGMT_SERVER_PRODUCT_NAME_FOR_LICENSE
- * is used instead.
- * A similar reason is used also for the PRODUCT_VERSION_STRING_FOR_LICENSE
- * definition in the vm_version.h
- */
-
-#define ACE_MGMT_SERVER_PRODUCT_NAME_FOR_LICENSE      "VMware ACE Management Server"
-
 /*
  * For Host Agent (hostd)
  */

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index d3455664cf92f5308c54941d264ba336bb99baf9..7718d5339ea57785d0306c179b122188c0f2bc61 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -44,8 +44,6 @@
    #define PRODUCT_VERSION    8,0,0,PRODUCT_BUILD_NUMBER_NUMERIC   /* FLEX_VERSION_NUMBER below has to match this */
 #elif defined(VMX86_TOOLS)
    #define PRODUCT_VERSION    TOOLS_VERSION_EXT_CURRENT_CSV
-#elif defined(VMX86_VCB)
-   #define PRODUCT_VERSION    1,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_VLICENSE)
    #define PRODUCT_VERSION    1,1,5,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_VPX)
@@ -139,14 +137,9 @@
 #define ESX_RELEASE_UPDATE "0" /* 0 = Pre-release/GA, 1 = Update 1 */
 #define ESX_RELEASE_PATCH "0"  /* 0 = experimental */
 #define ESX_RELEASE ESX_RELEASE_UPDATE "." ESX_RELEASE_PATCH
-#define VMSERVER_VERSION "e.x.p"
 #define WORKSTATION_RELEASE_DESCRIPTION ""
-#define WORKSTATION_ENTERPRISE_VERSION "e.x.p"
 #define WSX_SERVER_VERSION_NUMBER "1.0.0"
 #define WSX_SERVER_VERSION "e.x.p"
-#define ACE_MANAGEMENT_SERVER_VERSION "e.x.p"
-#define MUI_VERSION "4.1.0"
-#define CONSOLE_VERSION "4.1.0"
 #define P2V_VERSION "e.x.p"
 #define P2V_FILE_VERSION 3,0,0,0
 
@@ -184,8 +177,6 @@
 #define SYSIMAGE_VERSION "6.5.0"
 #define SYSIMAGE_FILE_VERSION VIE_FILEVERSION
 
-#define VCB_VERSION "4.0.0"
-#define VCB_FILE_VERSION 4,0,0,0
 #define VIM_VERSION "6.6.1"
 /*
  *For smooth version bump up for quaterly releases, we need to have a fallback
@@ -316,10 +307,6 @@
 #  define PRODUCT_VERSION_NUMBER GANTRY_VERSION
 #elif defined(VMX86_SERVER)
 #  define PRODUCT_VERSION_NUMBER ESX_VERSION
-#elif defined(VMX86_MUI)
-#  define PRODUCT_VERSION_NUMBER MUI_VERSION
-#elif defined(VMX86_ENTERPRISE_DESKTOP)
-#  define PRODUCT_VERSION_NUMBER WORKSTATION_ENTERPRISE_VERSION
 #elif defined(VMX86_VPX)
 #  if defined(XVP)
 #     define PRODUCT_VERSION_NUMBER XVP_VERSION
@@ -407,8 +394,6 @@
 #    define PRODUCT_LICENSE_VERSION "1.0"
 #  elif defined(VMX86_WGS)
 #    define PRODUCT_LICENSE_VERSION "3.0"
-#  elif defined(VMX86_ENTERPRISE_DESKTOP)
-#    define PRODUCT_LICENSE_VERSION "1.0"
 #  elif defined(VMX86_VPX)
 #    define PRODUCT_LICENSE_VERSION "6.0"
 #    define PRODUCT_LICENSE_FILE_VERSION "6.6.0.0"
@@ -433,20 +418,6 @@
 #define PRODUCT_ESX_LICENSE_VERSION "6.0"
 #define PRODUCT_ESX_LICENSE_FILE_VERSION "6.6.0.1"
 
-/*
- * This is for ACE Management Server
- * Since there is no separate product defined for Ace Mgmt Server
- * (i.e. PRODUCT=xxx when running makefile), we can not used the
- * generic PRODUCT_LICENSE_VERSION and PRODUCT_VERSION_STRING_FOR_LICENSE
- * definition.
- * As a result, the specific ACE_MGMT_SERVER_VERSION_STRING_FOR_LICENSE
- * is used instead.
- * A similar reason is used also for the PRODUCT_NAME_FOR_LICENSE definition
- * in the vm_product.h
- */
-
-#define ACE_MGMT_SERVER_VERSION_STRING_FOR_LICENSE "2.0"
-
 /*
  * The configuration file version string should be changed
  * whenever we make incompatible changes to the config file
@@ -514,9 +485,6 @@
 #define PRODUCT_VERSION_WORKSTATION_120 PRODUCT_WORKSTATION_BRIEF_NAME " 12.x"
 // Workstation 13.x is skipped.
 #define PRODUCT_VERSION_WORKSTATION_140 PRODUCT_WORKSTATION_BRIEF_NAME " Tech Preview 2017"
-#define PRODUCT_VERSION_WORKSTATION_ENTERPRISE_1 "ACE 1.x"
-#define PRODUCT_VERSION_WORKSTATION_ENTERPRISE_2 "ACE 2.0"
-#define PRODUCT_VERSION_WORKSTATION_ENTERPRISE_25 "ACE 2.5"
 #define PRODUCT_VERSION_PLAYER_1 PRODUCT_PLAYER_BRIEF_NAME " 1.x"
 #define PRODUCT_VERSION_MAC_DESKTOP_1 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 1.1"
 #define PRODUCT_VERSION_MAC_DESKTOP_2 PRODUCT_MAC_DESKTOP_BRIEF_NAME " 2.x"