Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-20 15:29:26 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,416 Commits 12 Branches 48 Tags 186 MiB
0c9d9bfb89
Commit Graph

182 Commits

Author SHA1 Message Date
Callum McIntyre
5cb4cc8ba1 Add the branding for 6.0 to branding.sh and re-branding.sh 2016-10-21 10:58:32 +01:00
Callum McIntyre
239c2e8b9d [DotNet Upgrade] Revert the temporary change to use the local .net installer, get .net 4.6 from dotnetpackages again 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-19 09:38:18 +01:00
Callum McIntyre
fd14e4205c [DotNet Upgrade] Use REPO_CITRITE_HOST in WEB_HOTFIXES_ROOT 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-18 10:14:51 +01:00
Callum McIntyre
8d9007205f (TEMPORARY) Swap .net installer for a local copy of the 4.6 one, for 
testing

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:16:09 +01:00
Callum McIntyre
dfe627b5ee [DotNet upgrade] Use executables from WIX_BIN instead of the default Wix candle/lit/light exes (which may not be the WIX_BIN ones), to guarantee using the patched+built 3.10 exes 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:16:08 +01:00
Callum McIntyre
574c7ed221 [DotNet upgrade] Update wix patches for 3.10, to address changes in the source files 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:16:07 +01:00
Callum McIntyre
4b5e4ce11a [DotNet upgrade] Use Wix 3.10 binaries so that we can support .net 4.6 checks 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:12:41 +01:00
Callum McIntyre
168dbe4c13 [DotNet upgrade] Upgrade the XenCenter installer to use .net 4.6 
In the dotnet installers we now compare the Release Dword against the lowest 4.6 version, accepting anything >=. Build number from https://msdn.microsoft.com/en-us/library/hh925568(v=vs.110).aspx

Also updated the wix check and xe project, as was done in the similar .net 4.5 upgrade

Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-10-17 14:09:08 +01:00
Callum McIntyre
fb261afcf1 [DotNet Upgrade] Update the build scripts to use .net 4.6 
Signed-off-by: Callum McIntyre <callumiandavid.mcintyre@citrix.com>
 2016-09-29 11:02:46 +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
16270af4d4 CA-210984: XenCenter build fails in the secure environment while getting RPU hotfixes from artifactory 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-05-13 12:31:55 +01: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
Mihaela Stoica
7409d99d06 CA-210193: Update build script to pick up the latest RPU hotfixes (#979) 
* CA-210193: Update build script to pick up the latest RPU hotfixes

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>

* CA-210193: Update build script to pick up the latest RPU hotfixes

- fixed the parameters of the second WGET

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-05-06 14:21:29 +01:00
Mihaela Stoica
308faed52f CA-207758: New script for copying the build output 
(moved from archive-push)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-04-14 11:41:47 +01:00
Mihaela Stoica
dc7bd55448 CA-205116: Remove keep-build call from push-latest-successful-build 2016-04-12 23:19:34 +01:00
Stephen Turner
b2ec3bf89d Merge pull request #936 from MihaelaStoica/CA-207296 
CA-207296: Update Health Check service assembly info and sign the assembly
 2016-04-12 14:39:43 +01:00
Mihaela Stoica
e20bff0cd9 CA-207296: Update Health Check service assembly info and sign the assembly 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-04-12 13:52:01 +01:00
Stephen Turner
961cf0c809 Merge pull request #925 from MihaelaStoica/CA-205116 
CA-205116: Add scripts to push latest successful build to the ref rep…
 2016-04-11 15:08:05 +01:00
Gabor Apati-Nagy
40a6842587 CA-205171: I18n: JA: The hotkey key for “All Users” line breaks 
Moved the second radiobutton 20pxs right

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-04-07 17:02:18 +01:00
Mihaela Stoica
a2df2ec496 CA-205116: Add scripts to push latest successful build to the ref repository and mark build as keep-forever 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-04-05 12:03:20 +01:00
Mihaela Stoica
341cc925af CA-204917: XenCenter build script should not archive each build on the build machine 2016-03-24 13:39:28 +00:00
Craig Emery
814cb366b9 Checking for re-branding.sh being run more than once 2016-03-09 13:30:42 +00:00
Craig Emery
56aa2aa2ff Put WGET_OPT back as it is used by brandingh 2016-03-09 11:11:33 +00:00
Craig Emery
950b9ce5eb Move --spider to the right place. 2016-03-09 10:27:58 +00:00
Craig Emery
ef642f55fc Move DOTNET_LOC into the bash function 2016-03-09 09:33:51 +00:00
Craig Emery
ab0b7a215a Try getting the hotfix from the current branch first and fall back to trunk 2016-03-08 16:55:18 +00:00
Craig Emery
63b720e093 Production build script changes 2016-03-03 16:13:36 +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
Gabor Apati-Nagy
8fb92187ee Merge pull request #861 from MihaelaStoica/CP-15699 
CP-15699: Re-enable the ExpectedResults test
 2016-02-26 14:11:16 +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
Mihaela Stoica
70187718da CP-15699: Re-enable the ExpectedResults test 
Also, changed the build script to skip the tests execution if a variable is defined (SKIP_TESTS)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-25 11:26:34 +00:00
Gabor Apati-Nagy
1fd749af15 tests-check.sh not to kill already running nunit 
this change makes sure we don't kill any nunit processes before acquiring the lock
 2016-02-24 17:16:01 +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
Stephen Turner
5a6283c5ec Merge pull request #843 from GaborApatiNagy/homepage2 
CP-15402: Improvements to the new HomePage
 2016-02-17 09:31:52 +00:00
Gabor Apati-Nagy
27df0a609b CP-15402: HomePage 
Chanegd build script to pick up the mht file as well for translators

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-16 19:01:11 +00:00
Cheng Zhang
6d2a4d06fc CA-198903: Fix unsigned package build failure 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-02-16 15:32:15 +08:00
Stephen Turner
95b395401d Merge pull request #831 from MihaelaStoica/CP-16068 
CP-16068: Pick up new RPU hotfixes
 2016-02-12 12:15:11 +00:00
Mihaela Stoica
7a46698141 CP-16068: Pick up new RPU hotfixes 
- XenCenter build system picks up the RPU hotfixes from Artifactory
- RPU001 and RPU002 replace XS62E006 and XS65ESP1006
- Removed hotfixes from the solution, moved  XS60E001 to Branding folder
- also cleaned up code in the HotfixFactory class, removing MNR and Cowley hotfixes (not supported anymore)

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-11 22:18:06 +00:00
Gabor Apati-Nagy
eb9bd591aa Merge remote-tracking branch 'github_xenadmin/master' into inst 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>

Conflicts:
	WixInstaller/XenCenter.l10n.diff
	WixInstaller/XenCenter.wxs
 2016-02-11 18:55:54 +00:00
Gabor Apati-Nagy
8d400f74c6 CP-16075: Fixing a fix in a diff of a diff... 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-10 15:03:18 +00:00
Gabor Apati-Nagy
24a7648397 CP-16075: typo fix in diff 
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-10 14:49:22 +00:00
Gabor Apati-Nagy
016c967e29 CA-182819: Changed the layout of the CustomizeDialog 
to have more space for the SelectionTree control. This will be needed when changing the features to be hierarchically displayed.

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
 2016-02-10 14:32:53 +00: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
Mihaela Stoica
a1e2032e65 Merge pull request #818 from MihaelaStoica/CP-15405 
CP-15405: Build scripts changes
 2016-02-05 12:08:35 +00:00
Mihaela Stoica
f0a1f37472 CP-15405: Add support for writing the latest-successful-build file to a different repository 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-05 11:52:42 +00:00
Mihaela Stoica
ec5ac17b48 CP-15405: Fix build failure (XenCenter.wxs not found) 
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-05 11:42:47 +00:00
Gabor Apati-Nagy
50b7132aa2 Merge pull request #816 from MihaelaStoica/CP-15405 
CP-15405: Copy all DotNetInstaller files to the local folder before b…
 2016-02-04 17:25:57 +00:00