Audit and remove VMX86_WGS

wgs/gsx/server (non-esx) code still lives within its older still active
siblings. I located as much as possible and removed its dependencies and
tried to make appropriate changes related to the code being removed.
This change had the potential to remove a lot of other old products and
tools, but I resisted that temptation (console, mui, ccagent to name a
few). For the most part it was a standard removal.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/checkvm/checkvm.c b/open-vm-tools/checkvm/checkvm.c
index d4aa4e790a7a1a1215f412027bfcbe8adf3b5630..d5d5984a685ee458c2a06f0697aff727db951feb 100644 (file)
--- a/open-vm-tools/checkvm/checkvm.c
+++ b/open-vm-tools/checkvm/checkvm.c
@@ -115,18 +115,10 @@ main(int argc,
          * obtained from getVersion().
          */
          switch (version[1]) {
-         case VMX_TYPE_EXPRESS:
-            printf("Express\n");
-            break;
-
          case VMX_TYPE_SCALABLE_SERVER:
             printf("ESX Server\n");
             break;
 
-         case VMX_TYPE_WGS:
-            printf("VMware Server\n");
-            break;
-
          case VMX_TYPE_WORKSTATION:
             printf("Workstation\n");
             break;

diff --git a/open-vm-tools/lib/include/vm_basic_defs.h b/open-vm-tools/lib/include/vm_basic_defs.h
index 23a4a4eb858d51ca2f45b1c70078b8f871ef0f2d..7cd502a50248e50f777d1ae700c41bc6261d7463 100644 (file)
--- a/open-vm-tools/lib/include/vm_basic_defs.h
+++ b/open-vm-tools/lib/include/vm_basic_defs.h
@@ -618,14 +618,6 @@ typedef int pid_t;
 #define HOSTED_ONLY(x) x
 #endif
 
-#ifdef VMX86_WGS
-#define vmx86_wgs 1
-#define WGS_ONLY(x) x
-#else
-#define vmx86_wgs 0
-#define WGS_ONLY(x) 
-#endif
-
 #ifdef VMKERNEL
 #define vmkernel 1
 #define VMKERNEL_ONLY(x) x

diff --git a/open-vm-tools/lib/include/vm_product.h b/open-vm-tools/lib/include/vm_product.h
index 8d145908044599a8c66458d539dafe75050ef6f1..b75525a7514bddddd6e7c415c45d68aec80dbf5e 100644 (file)
--- a/open-vm-tools/lib/include/vm_product.h
+++ b/open-vm-tools/lib/include/vm_product.h
@@ -59,8 +59,6 @@
  * Brief names are used when the VMware prefix is not wanted.
  */
 #define PRODUCT_SCALABLE_SERVER_BRIEF_NAME "ESX"
-#define PRODUCT_WGS_BRIEF_NAME "Server"
-#define PRODUCT_GSX_BRIEF_NAME "GSX Server"
 #define PRODUCT_WORKSTATION_BRIEF_NAME "Workstation"
 #define PRODUCT_WORKSTATION_ENTERPRISE_BRIEF_NAME \
          PRODUCT_WORKSTATION_BRIEF_NAME " " "ACE Edition"
@@ -83,9 +81,6 @@
 
 #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_WGS_NAME MAKE_NAME(PRODUCT_WGS_BRIEF_NAME)
-#define PRODUCT_GSX_NAME MAKE_NAME(PRODUCT_GSX_BRIEF_NAME)
-#define PRODUCT_GSX_SMP_NAME MAKE_NAME("Virtual SMP for GSX 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)
@@ -114,13 +109,6 @@
 #define PRODUCT_VCB_SHORT_NAME "VCB"
 #define PRODUCT_VCB_NAME MAKE_NAME("Consolidated Backup")
 
-#define PRODUCT_API_SCRIPTING_COM_SHORT_NAME "VmCOM"
-#define PRODUCT_API_SCRIPTING_PERL_SHORT_NAME "VmPerl"
-
-#define PRODUCT_API_SCRIPTING_COM_NAME MAKE_NAME(PRODUCT_API_SCRIPTING_COM_SHORT_NAME " Scripting API")
-
-#define PRODUCT_API_SCRIPTING_PERL_NAME MAKE_NAME(PRODUCT_API_SCRIPTING_PERL_SHORT_NAME " Scripting API")
-
 #define PRODUCT_VPX_NAME MAKE_NAME("VirtualCenter")
 
 #define PRODUCT_VPXA_NAME PRODUCT_VPX_NAME " Agent"
@@ -258,12 +246,10 @@
 
 
 #if !(   defined(VMX86_SERVER)   \
-      || defined(VMX86_WGS)      \
       || defined(VMX86_DESKTOP)  \
       || defined(VMX86_ENTERPRISE_DESKTOP) \
       || defined(VMX86_VIEW)     \
       || defined(VMX86_MUI)      \
-      || defined(VMX86_API)      \
       || defined(VMX86_VPX)      \
       || defined(VMX86_WBC)      \
       || defined(VMX86_SDK)      \
@@ -296,14 +282,8 @@
 # define PRODUCT_SHORT_NAME PRODUCT_VMVISOR_NAME
 #elif defined(VMX86_SERVER)
 # define PRODUCT_SHORT_NAME PRODUCT_SCALABLE_SERVER_NAME
-#elif defined(VMX86_WGS_MIGRATION)
-# define PRODUCT_SHORT_NAME PRODUCT_WGS_MIGRATION_NAME
-#elif defined(VMX86_WGS)
-#  if defined(VMX86_CONSOLE)
-#     define PRODUCT_SHORT_NAME PRODUCT_CONSOLE_NAME
-#  else
-#     define PRODUCT_SHORT_NAME PRODUCT_WGS_NAME
-#  endif
+#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_ENTERPRISE_DESKTOP)
@@ -316,12 +296,6 @@
 # endif
 #elif defined(VMX86_TOOLS)
 # define PRODUCT_SHORT_NAME VMWARE_TOOLS_SHORT_NAME
-#elif defined(VMX86_API)
-#  ifdef _WIN32
-#     define PRODUCT_SHORT_NAME PRODUCT_API_SCRIPTING_COM_NAME
-#  else
-#     define PRODUCT_SHORT_NAME PRODUCT_API_SCRIPTING_PERL_NAME
-#  endif
 #elif defined(VMX86_VPX)
 #  if defined(CSI_HA)
 #     define PRODUCT_SHORT_NAME PRODUCT_HA_NAME     
@@ -439,12 +413,6 @@
 #   elif defined(VMX86_VPX)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " Server"
 #      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
-#   elif defined(VMX86_WGS_MIGRATION)
-#      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " for " PRODUCT_OS
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
-#   elif defined(VMX86_WGS)
-#      define PRODUCT_NAME_FOR_LICENSE PRODUCT_GSX_NAME " for " PRODUCT_OS
-#      define PRODUCT_SMP_NAME_FOR_LICENSE PRODUCT_GSX_SMP_NAME " for " PRODUCT_OS
 #   elif defined(VMX86_SYSIMAGE)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME
 #      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
@@ -460,9 +428,8 @@
  * VMWARE_HOST_DIRECTORY is for host-specific configuration files.
  * DEFAULT_LIBDIRECTORY is the default for the 'libdir' config variable.
  *
- * The APIs are installed as separate products and must have their own
- * configuration and library directories.  The remote console checks at
- * run time, and the MUI is not really a separate product.
+ * The remote console checks at run time, and the MUI is not really a separate
+ * product.
  */
 #   if defined(__APPLE__)
 #      if defined VMX86_DESKTOP
@@ -474,14 +441,7 @@
 #      endif
 #   endif
 
-#   if defined(VMX86_API)
-#      if defined(__APPLE__)
-#         define VMWARE_HOST_DIRECTORY VMWARE_HOST_DIRECTORY_PREFIX " API"
-#      else
-#         define VMWARE_HOST_DIRECTORY "/etc/" PRODUCT_GENERIC_NAME_LOWER "-api"
-#         define DEFAULT_LIBDIRECTORY "/usr/lib/" PRODUCT_GENERIC_NAME_LOWER "-api"
-#      endif
-#   elif defined (VMX86_CONSOLE)
+#   if defined (VMX86_CONSOLE)
 #      if defined(__APPLE__)
 #         define VMWARE_HOST_DIRECTORY VMWARE_HOST_DIRECTORY_PREFIX " Console"
 #      else
@@ -562,12 +522,6 @@
 #   elif defined(VMX86_VPX)
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " Server"
 #      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
-#   elif defined(VMX86_WGS_MIGRATION)
-#      define PRODUCT_NAME_FOR_LICENSE PRODUCT_NAME " for Win32"
-#      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None
-#   elif defined(VMX86_WGS)
-#      define PRODUCT_NAME_FOR_LICENSE PRODUCT_GSX_NAME " for Win32"
-#      define PRODUCT_SMP_NAME_FOR_LICENSE PRODUCT_GSX_SMP_NAME " for Win32"
 #   else
 #      define PRODUCT_NAME_FOR_LICENSE PRODUCT_REG_NAME
 #      define PRODUCT_SMP_NAME_FOR_LICENSE "" // None

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index e4fd2528f95a6b81b557d09d80ea9ca8e6c3992d..c89c5fba479789e7b74095ba714c3fb348479a82 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -147,21 +147,6 @@
  *
  */
 
-/*
- * This is the Scripting API (VmCOM, VmPerl, VmXXX) version number.
- * It is independent of the main VMX product version number.
- * The first released Scripting API from branch server02 has
- * version 2.0.0 to distinguish it from the legacy Perl API.
- *
- * Rules for updating the version:
- * - New features bump either major or minor version, depending on
- *   the magnitude of the change.
- * - A change that deprecates or obsoletes any existing interfaces
- *   requires a major version bump.
- */
-#define API_SCRIPTING_VERSION "4.1.0"
-#define API_VMDB_VERSION "4.1.0"
-
 /*
  * When updating the ESX_VERSION* and ESX_RELEASE* macros, you will also
  * need to update:
@@ -199,7 +184,6 @@
 #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 GSX_VERSION "e.x.p"
 #define VMSERVER_VERSION "e.x.p"
 #define WORKSTATION_VERSION_NUMBER "8.0.0" /* this version number should always match real WS version number */
 #define WORKSTATION_VERSION "e.x.p"
@@ -315,17 +299,10 @@
 
 #define VIM_EESX_PRODUCT_LINE_ID "embeddedEsx"
 #define VIM_ESX_PRODUCT_LINE_ID "esx"
-#define VIM_GSX_PRODUCT_LINE_ID "gsx"
 #define VIM_WS_PRODUCT_LINE_ID "ws"
 
-#define PRODUCT_API_SCRIPTING_VERSION API_SCRIPTING_VERSION " " BUILD_NUMBER
-
 #if defined(VMX86_SERVER)
 #  define PRODUCT_VERSION_NUMBER ESX_VERSION
-#elif defined(VMX86_WGS_MIGRATION)
-#  define PRODUCT_VERSION_NUMBER GSX_MIGRATION_VERSION
-#elif defined(VMX86_WGS)
-#  define PRODUCT_VERSION_NUMBER VMSERVER_VERSION
 #elif defined(VMX86_MUI)
 #  define PRODUCT_VERSION_NUMBER MUI_VERSION
 #elif defined(VMX86_ENTERPRISE_DESKTOP)
@@ -336,8 +313,6 @@
 #  else
 #    define PRODUCT_VERSION_NUMBER WORKSTATION_VERSION
 #  endif
-#elif defined(VMX86_API)
-#  define PRODUCT_VERSION_NUMBER API_SCRIPTING_VERSION
 #elif defined(VMX86_VPX)
 #  if defined(XVP)
 #     define PRODUCT_VERSION_NUMBER XVP_VERSION
@@ -494,10 +469,9 @@
 #define PRODUCT_VERSION_SCALABLE_SERVER_31 PRODUCT_SCALABLE_SERVER_BRIEF_NAME " 3.5"
 #define PRODUCT_VERSION_SCALABLE_SERVER_40 PRODUCT_SCALABLE_SERVER_BRIEF_NAME " 4.x"
 #define PRODUCT_VERSION_SCALABLE_SERVER_50 PRODUCT_SCALABLE_SERVER_BRIEF_NAME " 5.0"
-#define PRODUCT_VERSION_WGS_1 PRODUCT_WGS_BRIEF_NAME " 1.x"
-#define PRODUCT_VERSION_WGS_2 PRODUCT_WGS_BRIEF_NAME " 2.x"
-#define PRODUCT_VERSION_GSX_2 PRODUCT_GSX_BRIEF_NAME " 2.x"
-#define PRODUCT_VERSION_GSX_3 PRODUCT_GSX_BRIEF_NAME " 3.x"
+#define PRODUCT_VERSION_WGS_1 "Server 1.x"
+#define PRODUCT_VERSION_WGS_2 "Server 2.x"
+#define PRODUCT_VERSION_GSX_3 "GSX Server 3.x"
 #define PRODUCT_VERSION_WORKSTATION_4 PRODUCT_WORKSTATION_BRIEF_NAME " 4.x"
 #define PRODUCT_VERSION_WORKSTATION_5 PRODUCT_WORKSTATION_BRIEF_NAME " 5.x"
 #define PRODUCT_VERSION_WORKSTATION_6 PRODUCT_WORKSTATION_BRIEF_NAME " 6.0"
@@ -527,7 +501,7 @@ typedef enum {
    VMX_TYPE_UNSET,
    VMX_TYPE_EXPRESS, /* This deprecated type was used for VMware Express */
    VMX_TYPE_SCALABLE_SERVER,
-   VMX_TYPE_WGS,
+   VMX_TYPE_WGS, /* This deprecated type was used for VMware Server */
    VMX_TYPE_WORKSTATION,
    VMX_TYPE_WORKSTATION_ENTERPRISE /* This deprecated type was used for ACE 1.x */
 } VMX_Type;