From: Oliver Kurth Date: Tue, 5 Jun 2018 22:47:40 +0000 (-0700) Subject: Changes to common header files not applicable to open-vm-tools. X-Git-Tag: stable-11.0.0~544 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3aa98a239fb53ce7e5ffab2953dd414c38858790;p=thirdparty%2Fopen-vm-tools.git 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 d9ef05ec1..2bfff2a8d 100644 --- a/open-vm-tools/lib/include/vm_product.h +++ b/open-vm-tools/lib/include/vm_product.h @@ -158,6 +158,10 @@ #define PRODUCT_NETDUMP_NAME PRODUCT_VMVISOR_NAME " dump collector" #endif +#define PRODUCT_INTEGRITY_SHORT_NAME "VUM" +#define PRODUCT_INTEGRITY_NAME MAKE_NAME("Update Manager") +#define PRODUCT_INTEGRITY_DISPLAY_NAME MAKE_NAME("vSphere Update Manager") + /* * VMware USB Arbitration Service version definitions */ @@ -265,6 +269,8 @@ # define PRODUCT_SHORT_NAME PRODUCT_VIEW_NAME #elif defined(VMX86_VMCF) # define PRODUCT_SHORT_NAME PRODUCT_VMCF_NAME +#elif defined(VMX86_INTEGRITY) +# define PRODUCT_SHORT_NAME PRODUCT_INTEGRITY_NAME // VMX86_DESKTOP must be last because it is the default and is always defined. #elif defined(VMX86_DESKTOP) # if defined(__APPLE__) diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h index 28bdc125c..e5fb41fe7 100644 --- a/open-vm-tools/lib/include/vm_product_versions.h +++ b/open-vm-tools/lib/include/vm_product_versions.h @@ -48,7 +48,7 @@ #define PRODUCT_VERSION 1,1,5,PRODUCT_BUILD_NUMBER_NUMERIC #elif defined(VMX86_VPX) /* this should be kept in sync with the corresponding vpx branch. */ - #define PRODUCT_VERSION 6,8,1,PRODUCT_BUILD_NUMBER_NUMERIC + #define PRODUCT_VERSION 6,8,2,PRODUCT_BUILD_NUMBER_NUMERIC #elif defined(VMX86_HORIZON_VIEW) #define PRODUCT_VERSION 0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC // VMX86_DESKTOP must be last because it is the default and is always defined. @@ -132,7 +132,7 @@ */ #define ESX_VERSION_MAJOR "6" #define ESX_VERSION_MINOR "8" -#define ESX_VERSION_MAINT "1" +#define ESX_VERSION_MAINT "2" #define ESX_VERSION ESX_VERSION_MAJOR "." ESX_VERSION_MINOR "." \ ESX_VERSION_MAINT #define ESX_VERSION_THIRD_PARTY ESX_VERSION_MAJOR ESX_VERSION_MINOR \ @@ -183,7 +183,7 @@ #define SYSIMAGE_VERSION_EXT_STR \ SYSIMAGE_VERSION "." PRODUCT_BUILD_NUMBER_NUMERIC_STRING -#define VIM_VERSION "6.8.1" +#define VIM_VERSION "6.8.2" /* *For smooth version bump up for quaterly releases, we need to have a fallback *mechanism to previous version in all those components which perform version @@ -213,26 +213,26 @@ 6.0.0,\ 6.5.0" // Put VPX_VERSION first, because vpx/make/defs.mk doesn't check for suffix. -#define VPX_VERSION "6.8.1" +#define VPX_VERSION "6.8.2" #define VPX_VERSION_MAJOR "6" #define VPX_VERSION_MINOR "8" -#define VPX_VERSION_MAINT "1" +#define VPX_VERSION_MAINT "2" #define VPX_VERSION_THIRD_PARTY VPX_VERSION_MAJOR VPX_VERSION_MINOR \ VPX_VERSION_MAINT -#define VPX_VERSION_NUMERIC 6,8,1,PRODUCT_BUILD_NUMBER_NUMERIC +#define VPX_VERSION_NUMERIC 6,8,2,PRODUCT_BUILD_NUMBER_NUMERIC // Last supported ESX version by VC. #define VPX_MIN_HOST_VERSION "6.0.0" #define MAX_SUPPORTED_VI_VERSION "6.6" //from ovfTool/src/supportedVersions.h -#define VCDB_CURRENT_SCHEMA_VERSION 681 // from PitCADatabase.h +#define VCDB_CURRENT_SCHEMA_VERSION 682 // from PitCADatabase.h #define VPX_RELEASE_UPDATE "0" /* 0 = Pre-release/GA, 1 = Update 1 */ #define VPX_RELEASE_PATCH "0" /* 0 = experimental */ #define VPX_RELEASE VPX_RELEASE_UPDATE "." VPX_RELEASE_PATCH /* expected database version for current release */ -#define VPXD_VDB_DB_VERSION_ID 681 +#define VPXD_VDB_DB_VERSION_ID 682 #define VPXD_VDB_DB_VERSION_VALUE "VirtualCenter Database 6.8" // Virtual Appliance Patch Version Number @@ -242,6 +242,7 @@ // Changing the version is required when CPD releases an update. #define VA_PATCH_VERSION "5100" +#define INTEGRITY_VERSION "6.8.2" /* Should use VPX_VERSION? */ #define SVA_VERSION "1.0.0" #define SSO_VERSION "1.0.0" #define WBC_VERSION "5.1.0" @@ -256,8 +257,8 @@ #define VDM_VERSION "e.x.p" #define NETDUMP_VERSION "5.1.0" #define NETDUMP_FILE_VERSION 5,1,0,PRODUCT_BUILD_NUMBER_NUMERIC -#define VDDK_VERSION "6.8.1" -#define VDDK_FILE_VERSION 6,8,1,PRODUCT_BUILD_NUMBER_NUMERIC +#define VDDK_VERSION "6.8.2" +#define VDDK_FILE_VERSION 6,8,2,PRODUCT_BUILD_NUMBER_NUMERIC #define OVFTOOL_VERSION "4.3.0" #define VCSA_INSTALLER_VERSION "1.0.0" #define OVFTOOL_FILE_VERSION 4,3,0,PRODUCT_BUILD_NUMBER_NUMERIC @@ -274,6 +275,7 @@ #define VIEW_CLIENT_VERSION_NUMBER VIEW_CLIENT_VERSION #define VHSESDK_VERSION "1.0.0" #define VIEWVC_VERSION "14.0.0" +#define WCP_VERSION "0.0.1" /* * All of these components should follow the current version of View, except @@ -357,6 +359,8 @@ # define PRODUCT_VERSION_NUMBER ESX_VERSION #elif defined(VMX86_HORIZON_VIEW) # define PRODUCT_VERSION_NUMBER VIEW_VERSION +#elif defined(VMX86_INTEGRITY) +# define PRODUCT_VERSION_NUMBER INTEGRITY_VERSION // VMX86_DESKTOP must be last because it is the default and is always defined. #elif defined(VMX86_DESKTOP) # if defined(__APPLE__)