Bump up the SYSIMAGE_VERSION to be the same with VMTools version.

diff --git a/open-vm-tools/lib/include/vm_product_versions.h b/open-vm-tools/lib/include/vm_product_versions.h
index de0fddc70b812a6dcd933fab0bec1bcca6f23916..5ad947e160bc2c95891fdd714e056c342b238cc5 100644 (file)
--- a/open-vm-tools/lib/include/vm_product_versions.h
+++ b/open-vm-tools/lib/include/vm_product_versions.h
@@ -55,8 +55,9 @@
    // WORKSTATION_VERSION_NUMBER below has to match this
    #define PRODUCT_VERSION    15,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
 #elif defined(VMX86_SYSIMAGE)
-   // SYSIMAGE_VERSION below has to match this
-   #define PRODUCT_VERSION    8,5,0,PRODUCT_BUILD_NUMBER_NUMERIC
+   #define PRODUCT_VERSION    TOOLS_VERSION_EXT_CURRENT_CSV
+   #define SYSIMAGE_VERSION TOOLS_VERSION_CURRENT_STR
+   #define SYSIMAGE_VERSION_EXT_STR TOOLS_VERSION_EXT_CURRENT_STR
 #else
    /* Generic catch-all. */
    #define PRODUCT_VERSION    0,0,0,PRODUCT_BUILD_NUMBER_NUMERIC
@@ -175,11 +176,6 @@
  */
 #define FUSION_VERSION "e.x.p"
 
-// These must match PRODUCT_VERSION for VMX86_SYSIMAGE above
-#define SYSIMAGE_VERSION "8.5.0"
-#define SYSIMAGE_VERSION_EXT_STR \
-   SYSIMAGE_VERSION "." PRODUCT_BUILD_NUMBER_NUMERIC_STRING
-
 #define VIM_VERSION "6.8.4"
 /*
  *For smooth version bump up for quaterly releases, we need to have a fallback

diff --git a/open-vm-tools/lib/include/vm_version.h b/open-vm-tools/lib/include/vm_version.h
index 72dd3aef99bad326a451283122005f1d5cf02d78..34b47b026bd79fcf97d8606f581655fa271da98e 100644 (file)
--- a/open-vm-tools/lib/include/vm_version.h
+++ b/open-vm-tools/lib/include/vm_version.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2016,2018 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-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
@@ -33,7 +33,7 @@
 #define INCLUDE_ALLOW_VMCORE
 #include "includeCheck.h"
 #include "vm_product.h"
-#if defined(VMX86_TOOLS)
+#if defined(VMX86_TOOLS) || defined(VMX86_SYSIMAGE)
 #include "vm_tools_version.h"
 #endif
 #include "vm_vmx_type.h"