CP-1914: Record some extra build-time information in Host.software_version ("product_...

Signed-off-by: David Scott <dave.scott@eu.citrix.com>

diff --git a/Makefile b/Makefile
index 749d870f29f3cc8f82421fcdd249bdf6045c3104..d4cbefdf7c87fa57b89623065c1b4d77d8a8edc2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -89,6 +89,8 @@ version:
        echo "let hostname = \"$(shell hostname)\"" >> ocaml/util/version.ml
        echo "let date = \"$(shell date -u +%Y-%m-%d)\"" >> ocaml/util/version.ml
        echo "let product_version = \"$(PRODUCT_VERSION)\"" >> ocaml/util/version.ml
+       echo "let product_version_text = \"$(PRODUCT_VERSION_TEXT)\"" >> ocaml/util/version.ml
+       echo "let product_version_text_short = \"$(PRODUCT_VERSION_TEXT_SHORT)\"" >> ocaml/util/version.ml
        echo "let product_brand = \"$(PRODUCT_BRAND)\"" >> ocaml/util/version.ml
        echo "let build_number = Util_inventory.lookup \"BUILD_NUMBER\" (* \"$(BUILD_NUMBER)\" *)" >> ocaml/util/version.ml
  

diff --git a/ocaml/util/version.mli b/ocaml/util/version.mli
index 3a5ef6e4e0d7c98cb3bc0b61fa0c6a36d0cd0c2a..ea7db2c6be737e2e652a8ef4485e50b5476faa46 100644 (file)
--- a/ocaml/util/version.mli
+++ b/ocaml/util/version.mli
@@ -2,5 +2,7 @@ val hg_id : string
 val hostname : string
 val date : string
 val product_version : string
+val product_version_text : string
+val product_version_text_short : string
 val product_brand : string
 val build_number : string

diff --git a/ocaml/xapi/xapi_globs.ml b/ocaml/xapi/xapi_globs.ml
index ced6243515adaf60c9277a0b1c6badd3a67a2a12..593fdad887c7af9657085b4eedfcf4dc70dae469 100644 (file)
--- a/ocaml/xapi/xapi_globs.ml
+++ b/ocaml/xapi/xapi_globs.ml
@@ -114,6 +114,8 @@ let hg_changeset = ref "unknown"
 let _hostname = "hostname"
 let _date = "date"
 let _product_version = "product_version"
+let _product_version_text = "product_version_text"
+let _product_version_text_short = "product_version_text_short"
 let _product_brand = "product_brand"
 let _build_number = "build_number"
 let _hg_id = "hg_id"
@@ -133,6 +135,8 @@ let _dbv = "dbv"
 let export_vsn = 2
 
 let software_version = [ _product_version, Version.product_version;
+                       _product_version_text,       Version.product_version_text;
+                       _product_version_text_short, Version.product_version_text_short;
                         _product_brand,   Version.product_brand;
                         _build_number,    Version.build_number;
                         _hg_id,           Version.hg_id;