Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-12-04 17:11:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

CA-95786: Show product microversion in XenCenter's About box (taken from XenServer

Browse Source 
unless manually overridden in XenCenter). Renamed field.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
This commit is contained in:
Konstantina Chremmou 2014-02-18 14:53:00 +00:00
parent 0d2b9a3df3
commit de2ad77970
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
XenAdmin/Branding.cs
View File

@ -39,7 +39,7 @@ namespace XenAdmin
{ {
static public class Branding 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 COPYRIGHT_YEARS = "@COPYRIGHT_YEARS@";
public const string COMPANY_NAME_LEGAL = "@COMPANY_NAME_LEGAL@"; public const string COMPANY_NAME_LEGAL = "@COMPANY_NAME_LEGAL@";
} }

2
XenAdmin/Dialogs/AboutDialog.cs
View File

@ -51,7 +51,7 @@ namespace XenAdmin.Dialogs
? string.Format("{0}: {1}", Program.Version.Revision, Messages.COMMON_CRITERIA_TEXT) ? string.Format("{0}: {1}", Program.Version.Revision, Messages.COMMON_CRITERIA_TEXT)
: Program.Version.Revision.ToString(); : 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); label2.Text = string.Format(Messages.COPYRIGHT, Branding.COMPANY_NAME_LEGAL);
} }

2
XenAdmin/MainWindow.cs
View File

@ -787,7 +787,7 @@ namespace XenAdmin
log.InfoFormat("Connected to {0} (version {1}, build {2}.{3}) with XenCenter {4} (build {5})", 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.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 // When releasing a new version of the server, we should set xencenter_min and xencenter_max on the server
// as follows: // as follows:

2
mk/xenadmin-build.sh
View File

@ -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') 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') 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=$(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_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') 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/@COPYRIGHT_YEARS@/${COPYRIGHT_YEARS}/g" \
-e "s/@BRAND_CONSOLE@/${BRAND_CONSOLE}/g" \ -e "s/@BRAND_CONSOLE@/${BRAND_CONSOLE}/g" \
-e "s/@PRODUCT_VERSION@/${XC_PRODUCT_VERSION}/g" \ -e "s/@PRODUCT_VERSION@/${XC_PRODUCT_VERSION}/g" \
-e "s/@PRODUCT_VERSION_TEXT@/${PRODUCT_VERSION_TEXT}/g" \
$1 > $1.tmp $1 > $1.tmp
mv -f $1.tmp $1 mv -f $1.tmp $1
} }