Commit Graph

106 Commits

Author SHA1 Message Date
Konstantina Chremmou
d28b384b75 Testing code for alternative brandings; optional script for setting up environment.
Remove hardcoded repo location.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-01-25 11:42:22 +00:00
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
Konstantina Chremmou
30ef6527a3 CP-20149: Too many variables we end up losing track of.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2017-01-18 13:48:41 +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
c2f66b0e81 Switch off treating unset variables as errors to check if branding is set.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2016-12-16 12:04:12 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Mihaela Stoica
e8d8f322cb CA-195662: Remove signing as a post build event from splash project
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2016-01-13 12:09:08 +00:00
Cheng Zhang
b74ae83300 CP-15396: Rename dir of XenAdmin-Branding to Branding
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-11 17:28:31 +08:00
Cheng Zhang
a9214c3463 CP-15396: Use xenadmin-branding and change the location of icons
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-08 16:29:59 +08:00
Mihaela Stoica
24749bc3f8 Re-enable signing
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-08-20 16:30:41 +01:00