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

diff --git a/open-vm-tools/lib/include/product.h b/open-vm-tools/lib/include/product.h
index 87dc021f794326b08309c95d7e3d48b61088a5a7..6ad781e1f3acc4c6950cc7c794f017d1bb5f9f3f 100644 (file)
--- a/open-vm-tools/lib/include/product.h
+++ b/open-vm-tools/lib/include/product.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 2017 VMware, Inc. All rights reserved.
+ * Copyright (C) 2017-2018 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
@@ -48,9 +48,8 @@ typedef enum {
    PRODUCT_FUSION       = 1 << 6,
    PRODUCT_VIEW         = 1 << 7,
    PRODUCT_VMRC         = 1 << 8,
-   PRODUCT_GANTRY       = 1 << 9,
-   PRODUCT_VMACORETESTS = 1 << 10,
-   PRODUCT_SRM          = 1 << 11,
+   PRODUCT_VMACORETESTS = 1 << 9,
+   PRODUCT_SRM          = 1 << 10,
    /* etc */
 } Product;
 

diff --git a/open-vm-tools/lib/include/productState.h b/open-vm-tools/lib/include/productState.h
index 3d8602473359ff50ce47013091e6d34ba1736b9b..03bccb6129c3dda72c27c1b4a3981b99fe0e9997 100644 (file)
--- a/open-vm-tools/lib/include/productState.h
+++ b/open-vm-tools/lib/include/productState.h
@@ -38,8 +38,7 @@ typedef uint64 ProductMask;
                             PRODUCT_PLAYER      |\
                             PRODUCT_CVP         |\
                             PRODUCT_FUSION      |\
-                            PRODUCT_VMRC        |\
-                            PRODUCT_GANTRY)
+                            PRODUCT_VMRC)
 
 typedef uint64 ProductCaps;
 /*

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 1f4c559cc61e94e699a02328b770cb272f74ad8d..06ca031ee0ba209bbcfd75d79108de267e61482c 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -66,7 +66,6 @@
 #define PRODUCT_PLAYER_BRIEF_NAME "Player"
 #define PRODUCT_MAC_DESKTOP_BRIEF_NAME "Fusion"
 #define PRODUCT_VMRC_BRIEF_NAME "Remote Console"
-#define PRODUCT_GANTRY_BRIEF_NAME "AppCatalyst"
 
 
 /*
@@ -90,8 +89,6 @@
 #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
-#define PRODUCT_GANTRY_NAME MAKE_NAME(PRODUCT_GANTRY_BRIEF_NAME)
-#define PRODUCT_GANTRY_NAME_FOR_LICENSE PRODUCT_GANTRY_NAME
 
 #define PRODUCT_VLICENSE_SHORT_NAME "VLICENSE"
 #define PRODUCT_VLICENSE_NAME MAKE_NAME("License Infrastructure")
@@ -199,7 +196,6 @@
       || defined(VMX86_NETDUMP) \
       || defined(VMX86_HBR_SERVER) \
       || defined(VMX86_VMCF) \
-      || defined(VMX86_GANTRY) \
       || defined(VMX86_VMRC))
 #   if defined(_WIN32) || defined(__APPLE__) || defined(__linux__)
       /*
@@ -217,8 +213,6 @@
 # define PRODUCT_SHORT_NAME PRODUCT_ESXI_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_TOOLS)
 # define PRODUCT_SHORT_NAME VMWARE_TOOLS_SHORT_NAME
 #elif defined(VMX86_VPX)
@@ -323,8 +317,6 @@
 #      define PRODUCT_NAME_FOR_LICENSE "VMware ESX Server"
 #   elif defined(VMX86_VMRC) /* check VMX86_VMRC before VMX86_DESKTOP */
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_VMRC_NAME_FOR_LICENSE
-#   elif defined(VMX86_GANTRY)
-#      define PRODUCT_NAME_FOR_LICENSE PRODUCT_GANTRY_NAME_FOR_LICENSE
 #   elif defined(VMX86_VPX)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " Server"
 #   elif defined(VMX86_SYSIMAGE)
@@ -347,10 +339,7 @@
  * DEFAULT_LIBDIRECTORY is the default for the 'libdir' config variable.
  */
 #   if defined(__APPLE__)
-#      if defined VMX86_GANTRY
-#         define VMWARE_HOST_DIRECTORY_PREFIX \
-             "/Library/Preferences/" PRODUCT_SHORT_NAME
-#      elif defined VMX86_DESKTOP
+#      if defined VMX86_DESKTOP
 #         define VMWARE_HOST_DIRECTORY_PREFIX \
              "/Library/Preferences/" PRODUCT_SHORT_NAME
 #      else

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index 22e0893c29e12d9b149b14c1d1e9965114272269..36736074768951c93013f51dddaf369d8a049bc2 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -165,8 +165,6 @@
 #define FLEX_CLIENT_VERSION_NUMBER "8.0.0"
 #define FLEX_CLIENT_VERSION "e.x.p"
 
-#define GANTRY_VERSION "1.0.0"
-
 #define THINPRINT_VERSION "1.0.0"
 
 /*
@@ -320,8 +318,6 @@
 #  define PRODUCT_VERSION_NUMBER VMRC_VERSION
 #elif defined(VMX86_FLEX) /* check VMX86_FLEX before VMX86_DESKTOP */
 #  define PRODUCT_VERSION_NUMBER FLEX_VERSION
-#elif defined(VMX86_GANTRY)
-#  define PRODUCT_VERSION_NUMBER GANTRY_VERSION
 #elif defined(VMX86_SERVER)
 #  define PRODUCT_VERSION_NUMBER ESX_VERSION
 #elif defined(VMX86_VPX)
@@ -405,8 +401,6 @@
 #    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_GANTRY)
-#    define PRODUCT_LICENSE_VERSION "1.0"
 #  elif defined(VMX86_WGS_MIGRATION)
 #    define PRODUCT_LICENSE_VERSION "1.0"
 #  elif defined(VMX86_WGS)