Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2025-01-22 08:10:47 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,420 Commits 12 Branches 48 Tags 186 MiB
0df39a9d83
Commit Graph

257 Commits

Author SHA1 Message Date
Konstantina Chremmou
44fb5a11a3 Corrected comparison. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-15 15:26:44 +00:00
Konstantina Chremmou
0b74802e4f Do not retrieve dynamically, but rather specify explicitly, the version of .NET 
to use. Use trunk as XS_BRANCH only where needed (some places will be obsoleted).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-15 14:33:52 +00:00
Konstantina Chremmou
31c87eff7e The file xcversion is no longer necessary. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-15 14:31:25 +00:00
Konstantina Chremmou
771383f9b2 Create the manifest *after* the output directory is cleaned. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-14 10:05:35 +00:00
Konstantina Chremmou
bedd0f7b44 Moved the code printing out the tip of the branding repo to the branding script 
so it can be overriden.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-13 12:50:54 +00:00
Konstantina Chremmou
1bc79d3ce7 No need to store the location of the latest successful build anymore. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-13 12:37:37 +00:00
Konstantina Chremmou
84a349fc07 Removed branded ref repo and obsolete scripts. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-05 13:29:06 +00:00
Callum McIntyre
603e58ac49 [CP-19888] Add support for code coverage in build jobs 
Add support for a new environment variable REPORT_COVERAGE, which causes the tests phase to use the new script tests-checks-cover instead of tests-checks.This new script wraps the tests-checks script, by instrumenting NCover to monitor before it runs, and writing a summary log and generating a HTML report of coverage in the workspace output directory.
 2016-12-02 14:36:59 +00:00
Konstantina Chremmou
f9997cc663 Removed references to the old build system. Alos, for the time being retrieve the 
OVF fix up iso from a fixed location as this component has not changed in a while.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-02 11:52:12 +00:00
Konstantina Chremmou
d33832dea6 Change location where the product versions are to be found. Retrieve it from the 
source repo instead of the latest build (where it is output within an rpm which
XenCenter does not really need to consume).

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-12-02 11:51:51 +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
Konstantina Chremmou
b3c558d246 Stop creating the isos. Restructured output. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-30 01:35:52 +00:00
Konstantina Chremmou
3a4191bc34 Removed ref repo. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-29 16:04:06 +00:00
Konstantina Chremmou
57b2a6e7ec Package the VNCControl.msi as a tar.bz2. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-29 14:34:45 +00:00
Konstantina Chremmou
039c052e32 Remove loose pdb files from the output as they are now packaged. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-29 14:31:43 +00:00
Konstantina Chremmou
0f7df22f4d Changed the location of the branding repo. 
Corrected code reverting to trunk if this is not an official branch.
 2016-11-28 10:57:12 +00:00
Konstantina Chremmou
c0e4babed7 Refactored duplicate check for the SKIP_TESTS variable. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-25 18:22:49 +00:00
Mihaela Stoica
2ef6bb245c CA-233286: Error while running the package-and-sign script 
Use executables from WIX_BIN instead of the default Wix candle/lit/light exes

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-11-23 16:24:18 +00:00
Konstantina Chremmou
37a45934e2 Output the installers unpacked alongside the packed versions. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-22 11:29:40 +00:00
Konstantina Chremmou
571ebf9cce Restored falling back to trunk for xenadmin until we switch the branding repos to a different internal location. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-18 11:29:06 +00:00
Konstantina Chremmou
dfad3217dc Get the git branch from the environment variable and do not fall back to trunk 
if it can't be found.Use GIT_LOCAL_BRANCH instead of GIT_BRANCH to retrieve the
branch name without the remote.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-18 00:15:47 +00:00
Konstantina Chremmou
518f542e06 Tidy up the pdb files in an archive (todo: remove them once the main build system 
has started consuming the tar). Leave spell check only in the production build.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-15 15:41:11 +00:00
Mihaela Stoica
d76c450c41 CP-19664: Update RPU hotfixes in XenCenter 
Added the RPU hotfix for Dundee

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-11-10 14:59:39 +00:00
Konstantina Chremmou
fae16a9c92 CP-18097: package the english and l10n installer in a tar. 
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-02 21:09:27 +00:00
Konstantina Chremmou
864386daa1 We don't push automatically to xenadmin-ref.hg any longer, hence remove the relevant bits. 
Also remove config.xml as completely out of sync with the confiuration on the build machine.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
 2016-11-02 21:09:10 +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
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
Mihaela Stoica
0c5698b76f CP-15405: Copy all DotNetInstaller files to the local folder before building the installer 
- Fixes build error "build-installers.sh: line 134: ./InstallerLinker.exe: Accessing a corrupted shared library"

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
 2016-02-04 12:41:20 +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
Gabor Apati-Nagy
6cff4d546a Merge pull request #803 from MihaelaStoica/CP-15405 
CP-15405: Signing and packaging changes
 2016-02-02 15:48:28 +00:00
Mihaela Stoica
a34cffbd64 Merge pull request #806 from cheng--zhang/CP-15404 
CP-15404: Make help file rebrandable
 2016-02-02 11:00:20 +00:00
Mihaela Stoica
1726f8ce63 CP-15405: Fix packaging issues 
(Cherry picked from cream-indigo)

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
 2016-02-02 10:23:02 +00: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
Mihaela Stoica
8637187bc2 CP-15405: Sign dlls brought from dotnet-packages 
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
 2016-02-01 15:01:45 +00:00
Mihaela Stoica
74a759c44d CP-15405: Add script for signing and packaging 
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
 2016-02-01 14:26:04 +00:00
Mihaela Stoica
7085ad5672 CP-15405: Add script to collect unsigned files 
- Only collect the unsigned files if the option is specified
- When collecting the unsigned files, also copy all DotNetInstaller files

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
 2016-02-01 14:15:55 +00:00
Mihaela Stoica
46d982cc49 CP-15405: Move packaging and signing steps into a separate script file 
Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>
 2016-02-01 14:04:47 +00:00
Cheng Zhang
40e3ba3d66 CP-15162: Add desktop shortcut to installdlg 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-02-01 18:38:55 +08:00
Gabor Apati-Nagy
615a8cffe1 Merge pull request #795 from GaborApatiNagy/master_wix 
CP-15922: Investigate and fix WiX installer for InstallDir Extension UI
 2016-01-28 18:58:10 +00:00
Gabor Apati-Nagy
2adb9d1f43 CP-15922: Investigate and fix WiX installer for InstallDir Extension UI 
This changeset makes it possible to use InstallDir again - it hasn't worked since we changed to 3.9 from 3.5.
 2016-01-28 18:50:56 +00: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
23bed48f8e CP-15398: Make installer bmps rebrandable 
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
 2016-01-19 18:40:56 +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