Commit Graph

31 Commits

Author SHA1 Message Date
Konstantina Chremmou
83d92aa573 Merge remote-tracking branch 'upstream/master' into CAR-2205
# Conflicts:
#	Branding/branding.sh
#	mk/archive-unsigned.sh
#	mk/build.sh
#	mk/bumpBuildNumber.sh
#	mk/copy-build-output.sh
#	mk/declarations.sh
#	mk/tests-checks-cover.sh
#	mk/tests-checks.sh
2017-01-24 13:54:42 +00:00
Konstantina Chremmou
88b7cd53b4 CP-20149: Build overhaul: build XenCenter using a Jenkinsfile.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-01-18 13:48:42 +00:00
Konstantina Chremmou
71547b90db CP-20149: do not have the build scripts copy the production output to a network share.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-01-18 13:48:42 +00:00
Gabor Apati-Nagy
f30daff3b6 CA-176169: Fixed copyright statements in the shell scripts
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2017-01-16 20:15:39 +00:00
Konstantina Chremmou
ea3c8be435 Do not retrieve the SDK from the latest main build output. Instead, use source
code found locally in this repo.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-12-02 11:46:57 +00:00
Callum McIntyre
5cb4cc8ba1 Add the branding for 6.0 to branding.sh and re-branding.sh 2016-10-21 10:58:32 +01:00
Cheng Zhang
76f7946ec4 CA-213045: Make server backup file name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-06-30 10:31:10 +08:00
Mihaela Stoica
ed393b5800 Fix re-branding of the product version
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-05-13 00:40:35 +01:00
Craig Emery
814cb366b9 Checking for re-branding.sh being run more than once 2016-03-09 13:30:42 +00:00
Gabor Apati-Nagy
e64779b4ce Merge pull request #868 from MihaelaStoica/CP-16205
CP-16205: Add AdditionalFeatures branding variable
2016-03-02 13:30:25 +00:00
Mihaela Stoica
d358b2ddb2 CA-202103: Add branding variable for version 7.0
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-29 15:08:01 +00:00
Mihaela Stoica
a7b5c52e1c CP-16205: Add AdditionalFeatures branding variable
We now have two branding variables, one for hidden features and one for additional features (empty by default)
2016-02-29 14:54:26 +00:00
Gabor Apati-Nagy
5a05b794ef CP-15915: fixed typo 2016-02-26 14:27:37 +00:00
Mihaela Stoica
3645e5e8dc CP-15915: Replace MHT files for the home page with the ones from the branding folder
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-25 11:52:10 +00:00
Cheng Zhang
900d152301 CA-198962: Fix compile error of rebranding
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-17 18:33:37 +08:00
Mihaela Stoica
9f99c37f83 CP-16012: Rename branding variables
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-02-10 11:52:30 +00:00
Cheng Zhang
6e33547393 CP-15404: Use local binary replace to avoid using linux ending
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-04 10:44:52 +08:00
Cheng Zhang
c209bae16e CP-15404: Make help file rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-02-02 13:19:14 +08:00
Cheng Zhang
9f09d8cb60 CP-15404: Make component GUID rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 14:55:59 +08:00
Cheng Zhang
a2d62b2c2b CP-15404: Add reg key to hide feature
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-26 14:21:47 +08:00
Cheng Zhang
d03a570b6b CP-15400: Use condition check to install xenserver updates
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:29 +08:00
Cheng Zhang
1485a056e9 CP-15399: Make xsupdate rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-22 13:50:12 +08:00
Cheng Zhang
91f7f0646f CP-15398: Make version rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-20 11:33:07 +08:00
Cheng Zhang
b794112536 CP-15398: Fix test failures
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:55 +08:00
Cheng Zhang
15ef3410a3 CP-15398: Make file name and dir rebrandablei
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:55 +08:00
Cheng Zhang
08741a1fa0 CP-15398: Make texture company name rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:54 +08:00
Cheng Zhang
e4d97dcef4 CP-15398: Make texture XenServer for health check
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:40:53 +08:00
Cheng Zhang
010ff919c1 CP-15398: Make texture XenServer product rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-19 18:36:21 +08:00
Cheng Zhang
a33d10bade CP-15398: Make texture XenCenter rebrandable
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 18:52:53 +08:00
Cheng Zhang
9dcbd0a430 CP-15403: Remove year information in copyright
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 10:42:46 +08:00
Cheng Zhang
766cb72cbe CP-15403: Add rebranding phase in xenadmin
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 10:42:45 +08:00