From de2ad77970da1688a2f21ca0fc12390903a0216d Mon Sep 17 00:00:00 2001 From: Konstantina Chremmou Date: Tue, 18 Feb 2014 14:53:00 +0000 Subject: [PATCH] CA-95786: Show product microversion in XenCenter's About box (taken from XenServer unless manually overridden in XenCenter). Renamed field. Signed-off-by: Konstantina Chremmou --- XenAdmin/Branding.cs | 2 +- XenAdmin/Dialogs/AboutDialog.cs | 2 +- XenAdmin/MainWindow.cs | 2 +- mk/xenadmin-build.sh | 2 -- 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/XenAdmin/Branding.cs b/XenAdmin/Branding.cs index 41a44e2cb..7102c7157 100644 --- a/XenAdmin/Branding.cs +++ b/XenAdmin/Branding.cs @@ -39,7 +39,7 @@ namespace XenAdmin { static public class Branding { - public const string PRODUCT_VERSION_TEXT = "@PRODUCT_VERSION_TEXT@"; + public const string XENCENTER_VERSION = "@PRODUCT_VERSION@"; public const string COPYRIGHT_YEARS = "@COPYRIGHT_YEARS@"; public const string COMPANY_NAME_LEGAL = "@COMPANY_NAME_LEGAL@"; } diff --git a/XenAdmin/Dialogs/AboutDialog.cs b/XenAdmin/Dialogs/AboutDialog.cs index d0abb8965..594a807a1 100644 --- a/XenAdmin/Dialogs/AboutDialog.cs +++ b/XenAdmin/Dialogs/AboutDialog.cs @@ -51,7 +51,7 @@ namespace XenAdmin.Dialogs ? string.Format("{0}: {1}", Program.Version.Revision, Messages.COMMON_CRITERIA_TEXT) : Program.Version.Revision.ToString(); - VersionLabel.Text = string.Format(Messages.VERSION_NUMBER, Branding.PRODUCT_VERSION_TEXT, buildText, IntPtr.Size * 8); + VersionLabel.Text = string.Format(Messages.VERSION_NUMBER, Branding.XENCENTER_VERSION, buildText, IntPtr.Size * 8); label2.Text = string.Format(Messages.COPYRIGHT, Branding.COMPANY_NAME_LEGAL); } diff --git a/XenAdmin/MainWindow.cs b/XenAdmin/MainWindow.cs index cb74bd334..dadb665b1 100644 --- a/XenAdmin/MainWindow.cs +++ b/XenAdmin/MainWindow.cs @@ -787,7 +787,7 @@ namespace XenAdmin log.InfoFormat("Connected to {0} (version {1}, build {2}.{3}) with XenCenter {4} (build {5})", Helpers.GetName(master), Helpers.HostProductVersionText(master), Helpers.HostProductVersion(master), - Helpers.HostBuildNumber(master), Branding.PRODUCT_VERSION_TEXT, Program.Version.Revision); + Helpers.HostBuildNumber(master), Branding.XENCENTER_VERSION, Program.Version.Revision); // When releasing a new version of the server, we should set xencenter_min and xencenter_max on the server // as follows: diff --git a/mk/xenadmin-build.sh b/mk/xenadmin-build.sh index 9d24043e5..15433eaf4 100644 --- a/mk/xenadmin-build.sh +++ b/mk/xenadmin-build.sh @@ -59,7 +59,6 @@ COMPANY_NAME_LEGAL=$(cat ${SCRATCH_DIR}/globals | grep -w COMPANY_NAME_LEGAL | s COMPANY_NAME_SHORT=$(cat ${SCRATCH_DIR}/globals | grep -w COMPANY_NAME_SHORT | sed -e 's/COMPANY_NAME_SHORT=//g' -e 's/"//g') COPYRIGHT_YEARS=$(cat ${SCRATCH_DIR}/globals | grep -w COPYRIGHT_YEARS | sed -e 's/COPYRIGHT_YEARS=//g' -e 's/"//g') PRODUCT_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_VERSION | sed -e 's/PRODUCT_VERSION=//g' -e 's/"//g') -PRODUCT_VERSION_TEXT=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_VERSION_TEXT | sed -e 's/PRODUCT_VERSION_TEXT=//g' -e 's/"//g') PRODUCT_MAJOR_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_MAJOR_VERSION | sed -e 's/PRODUCT_MAJOR_VERSION=//g' -e 's/"//g') PRODUCT_MINOR_VERSION=$(cat ${SCRATCH_DIR}/globals | grep -w PRODUCT_MINOR_VERSION | sed -e 's/PRODUCT_MINOR_VERSION=//g' -e 's/"//g') @@ -143,7 +142,6 @@ subst_globals() -e "s/@COPYRIGHT_YEARS@/${COPYRIGHT_YEARS}/g" \ -e "s/@BRAND_CONSOLE@/${BRAND_CONSOLE}/g" \ -e "s/@PRODUCT_VERSION@/${XC_PRODUCT_VERSION}/g" \ - -e "s/@PRODUCT_VERSION_TEXT@/${PRODUCT_VERSION_TEXT}/g" \ $1 > $1.tmp mv -f $1.tmp $1 }