Commit Graph

172 Commits

Author SHA1 Message Date
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
Cheng Zhang
1e7d9e649e CP-15403: Force update xenadmin-braning
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2016-01-14 10:42:47 +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
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
d998565f71 Update JENKINS_SERVER in the build script 2015-10-14 12:47:21 +01:00
Mihaela Stoica
24749bc3f8 Re-enable signing
Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-08-20 16:30:41 +01:00
Gabor Apati-Nagy
19524668c8 Build script: Removed switches from mkisofs cmd
These are no longer needed
2015-08-10 19:01:26 +01:00
Gabor Apati-Nagy
91bb854712 CP-13390: Update XenCenter installer to require .NET 4.5
getting there...
2015-08-06 16:33:49 +01:00
Gabor Apati-Nagy
cec70527e7 CP-13390: Update XenCenter installer to require .NET 4.5
we do not use print-eula in the installer, apparently it is not in the wix sources, so removing it from the build
2015-08-06 15:57:44 +01:00
Gabor Apati-Nagy
9d098948f7 Merge pull request #604 from GaborApatiNagy/master_CP-13390
CP-13390: Update XenCenter installer to require .NET 4.5
2015-08-06 15:23:52 +01:00
Gabor Apati-Nagy
6d38f10d51 CP-13390: Update XenCenter installer to require .NET 4.5
fixing wix_src_patch for 3.9 files
2015-08-06 15:22:49 +01:00
Gabor Apati-Nagy
03d839aef6 CP-13390: Update XenCenter installer to require .NET 4.5
fixed code to unzip wix39-sources-debug.zip and wix39-binaries.zip
2015-08-06 14:42:25 +01:00
Gabor Apati-Nagy
6fd154b5c7 CP-13390: Update XenCenter installer to require .NET 4.5
Fixing reference to NDP452-KB2901954-Web.exe
2015-08-06 14:22:10 +01:00
Gabor Apati-Nagy
32c36118db CP-13390: Update XenCenter installer to require .NET 4.5 2015-08-05 17:53:08 +01:00
Mihaela Stoica
6efa72cda2 CP-13389: Change build scripts to use .NET 4.5
- Configured msbuild to build .Net4.5 with visual studio 2013 (13.0)
- Changed .Net platform version to 4.5 in tests script

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-07-30 16:04:54 +01:00
Sorin Sbarnea
908bacf6c2 Enabled back the exection of devtools and improved the logging 2015-07-27 08:26:26 +01:00
Jenkins
8840a7a496 Added locking for execution of gui tests. 2015-07-27 08:12:22 +01:00
Sorin Sbarnea
45fddc97e9 Changed tests to output to console so we see the progress. 2015-07-27 08:10:26 +01:00
Sorin Sbarnea
87ff2d8a48 Fixed the building of the installer. 2015-07-27 08:09:40 +01:00
Sorin Sbarnea
03d176829c Configured to use mt.exe from the PATH and repaired the target name for splash project, which was supposed to be XenCenter.exe 2015-07-27 08:08:53 +01:00
Sorin Sbarnea
c566ba8d39 Cleaned logging 2015-07-27 07:36:18 +01:00
Sorin Sbarnea (tocco)
47588bc925 added fallback to trunk for unknown branches and an workaround for the msbuild not renaming the splash.pdb into xencenter.pdb 2015-07-27 07:34:15 +01:00
Sorin Sbarnea
a5f5298604 Now msbuild will build the entire solution instead of each project file. Remember not to submit the solution with some projects disabled. 2015-07-26 06:53:28 +01:00
Mihaela Stoica
6e134543c6 Merge pull request #565 from GaborApatiNagy/master_CP-13310
CP-13310: Installer: In change mode, the installer shows All Users/Current User option, but it should not.
2015-07-23 12:17:27 +01:00
Mihaela Stoica
b62f8c4cd3 CA-176895: [CAR-1866] Include XS 6.5 RPU hotfix in XenCenter
- changed the build script and the installer to copy the XS65ESP1006.xsupdate hotfix
- also updated the source package for XS62E006 hotfix
2015-07-22 12:51:58 +01:00
Sorin Sbarnea
1d69cc8ee8 Changed the order of parameters in the wget command.
- wget <options> <URL> is correct order

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
2015-07-21 16:28:21 +01:00
Mihaela Stoica
03f29efcee Revert "Enforced use of DotNet 4.5 via msbuild, enabled concurrent compiling."
This reverts commit 0ca9c98135.
2015-07-21 15:00:31 +01:00
Mihaela Stoica
ad44b4405f Revert "Now msbuild will build the entire solution instead of each project file. Remember not to submit the solution with some projects disabled."
This reverts commit 997a9e1489.
2015-07-21 14:59:58 +01:00
Gabor Apati-Nagy
3c40a43780 CP-13310: Installer: In change mode, the installer shows All Users/Current User option, but it should not. 2015-07-20 21:19:29 +01:00
Gabor Apati-Nagy
f5fd3a6d75 CP-13248: Changing the text "Install for" to "Install XenCenter for" in the installer, because this setting applies to XenCenter only and not to the Service. 2015-07-20 17:58:14 +01:00
Sorin Sbarnea
997a9e1489 Now msbuild will build the entire solution instead of each project file. Remember not to submit the solution with some projects disabled. 2015-07-20 16:07:40 +01:00
Sorin Sbarnea
0ca9c98135 Enforced use of DotNet 4.5 via msbuild, enabled concurrent compiling. 2015-07-20 15:19:45 +01:00
Sorin Sbarnea
93280441aa Made the build output less verbose by default and configured wget not to download files again if they already exists locally with the same datetime stamps. 2015-07-19 20:12:38 +01:00
Gabor Apati-Nagy
74718dbed2 CP-13217: Make the Call Home service optional in the XenCenter installer
Line endings in patch file

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2015-07-17 12:38:45 +01:00
Gabor Apati-Nagy
849936f637 CP-13217: Make the Call Home service optional in the XenCenter installer
-Added new page to the XenCenter installer to include a feature selector control where users can choose to install the XenServer Health Check Service.
-Removed the InstallDir page, because the new customize page does provide folder selection (per feature)

Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2015-07-16 13:22:55 +01:00
Sorin Sbarnea
74ea62a99f Build system cleanup: Disabled the bump build number, removed assumption that jenkins is localhost, moved logs location inside the workspace. 2015-07-14 08:42:07 +01:00
Sorin Sbarnea
c0785df6f4 Fixed build tool detection logic. 2015-07-13 16:59:25 +00:00
Sorin Sbarnea
907f078b34 Merge branch 'master' of github.com:xenserver/xenadmin
# Conflicts:
#	mk/build.sh
#	mk/tests-checks.sh
2015-07-13 17:29:18 +01:00
Sorin Sbarnea
2423cca0c1 Removed enforced debug more. If needed, set DEBUG=1 before calling the build script.
Remove hardcoded path for nunit-console.exe
2015-07-13 17:23:04 +01:00
Sorin Sbarnea
fe4f84322a Configured curl to load credentials from .netrc file. 2015-06-30 12:41:11 +01:00
Sorin Sbarnea
332fc6f79c Corrected dependendencies test which was always failing. 2015-06-22 17:08:38 +01:00
Sorin Sbarnea
37d3a4e621 Removed the -s parameter from which as cygwin is missing it. 2015-06-22 16:56:55 +01:00
Sorin Sbarnea
4787da7977 nunit-console should be in PATH, allowing us to upgrade it without changing the build scripts. 2015-06-22 16:48:23 +01:00
Sorin Sbarnea
b7ab395fc0 Added fail-fast code for required build tools. 2015-06-22 16:47:35 +01:00
Sorin Sbarnea
a51272dbc1 Added configure script which helps setting up build environment.
Replaced a hardcoded TEST_DIR path with one relatively to the workspace, CI builds should not touch files from outside their workspace.
2015-06-22 15:03:32 +01:00
Sorin Sbarnea
d48522a2b3 Changed the TEST_DIR to be inside the workspace. Builds should never touch things outside their workspace, especially not using hardcoded directories. 2015-06-22 14:38:22 +01:00
Mihaela Stoica
f206d77c83 CP-12162: Add Health Check Service to the XenCenter build system
xenadmin-build.sh: Added a backslash to separate the parameters of the cp command
2015-06-09 14:28:30 +01:00
Mihaela Stoica
415812fec1 Merge branch 'CP-12162' of https://github.com/cheng--zhang/xenadmin into cheng--zhang-CP-12162 2015-06-09 13:22:53 +01:00
Ross Lagerwall
9675089982 CP-7644: Write XenCenter product version and build number
Write out the XenCenter version and build number into a version file so
that other tools can determine them from the build artifacts.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>
2015-06-08 16:47:25 +01:00
Cheng Zhang
8f04a5b88c CP-12162: Add Health Check Service to the XenCenter build system
Signed-off-by: Cheng Zhang <cheng.zhang@citrix.com>
2015-06-08 16:02:25 +08:00
Gabor Apati-Nagy
8d96a17c53 CP-11956: ssh console: Include putty in our installer
fixing wget
2015-05-08 18:02:55 +01:00
Gabor Apati-Nagy
09c1374d8b CP-11956: ssh console: Include putty in our installer
fixing syntax error in xenadmin-build.sh
2015-05-08 17:44:46 +01:00
Gabor Apati-Nagy
d1c793fa9e CP-11956: ssh console: Include putty in our installer
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2015-05-08 16:54:16 +01:00
Gabor Apati-Nagy
2494e74f5c Resetting mk/ files (to pre-17-Dec-2014 state) in order to make master to build in non-secure environment. This seems to be feasible for now. 2015-01-19 16:39:21 +00:00
Gabor Apati-Nagy
de27c9c9ff Revert "Change the fetched XenServer-SDK file to the linked one"
This reverts commit a8a531f809.
2015-01-19 15:32:20 +00:00
Gabor Apati-Nagy
d50f8a7d94 Merge branch 'master' into master_github
Conflicts:
	XenModel/Messages.resx
	XenModel/XenAPI-Extensions/Host.cs
	mk/xenadmin-build.sh
2015-01-19 15:22:59 +00:00
Gabor Apati-Nagy
b1f4c8ca4c Merge remote-tracking branch 'creedence-ln_internal/master'
Conflicts:
	mk/declarations.sh
	mk/xenadmin-build.sh
2015-01-19 14:49:55 +00:00
Craig Emery
a8a531f809 Change the fetched XenServer-SDK file to the linked one 2014-12-18 14:01:04 +00:00
Craig Emery
ba6e844559 Temporarily disable quiet wget for XenServer-SDK.zip 2014-12-18 13:55:13 +00:00
Peter Westlake
6f34e1853b CA-148495: get the dotnet-packages branch right! 2014-12-17 19:28:49 +00:00
Peter Westlake
844952afe3 CA-148495: remove a lurking "creedence-sb"! 2014-12-17 18:17:51 +00:00
Peter Westlake
9c18a4dd3a CA-148495: remove a lurking "creedence-sb" path. 2014-12-17 18:17:05 +00:00
Peter Westlake
02c157dd2d CA-148495: secure build. 2014-12-17 18:05:06 +00:00
Peter Westlake
a3c1e56e1b CA-148495: secure build. 2014-12-17 16:49:35 +00:00
Gabor Apati-Nagy
36fb8807d4 Update xenadmin-build.sh
Disabling signing for now.
2014-12-16 12:24:50 +00:00
Gabor Apati-Nagy
21b9a9e9c9 Update archive-push.sh
DISABLE_PUSH=1
2014-12-08 16:19:03 +00:00
Peter Westlake
5d7e2ed792 CA-148495: secure build. 2014-10-10 16:20:00 +01:00
Stephen Turner
83cba26943 CA-142537 Increase NUnit timeout 2014-08-14 18:12:03 +01:00
Gabor Apati-Nagy
47faad4d99 CP-9090: Update RPU hotfixes in XenCenter
-Adding copying source files to the make script
2014-08-05 17:27:21 +01:00
Gabor Apati-Nagy
426910b4a0 CA-139890: Installer shouldn't download the .NET installer without asking but bundle it instead
-Bundling the redistributable Microsoft .NET Framework 4 (Web Installer) into our exe XenCenter installer
2014-07-04 15:44:36 +01:00
Gabor Apati-Nagy
ff3066a986 Update xenadmin-build.sh
CP-8667: Update RPU hotfixes in XenCenter (fixing build script)
2014-06-11 11:03:27 +01:00
Gabor Apati-Nagy
a5cba2ae69 CAR-100: Upgrade to .NET 4.0 instead of 3.5 -- Disable push in archive-push.sh
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-19 13:44:36 +00:00
Gabor Apati-Nagy
7480148626 Merge branch 'car-100', removed car-100 from declarations.sh at the same time
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-19 13:39:42 +00:00
Gabor Apati-Nagy
369cd68bda fixing missing character in xenadmin-build.sh script
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-17 19:02:32 +00:00
Gabor Apati-Nagy
55e65bb810 [CP-6475] CAR-100: Include .NET installer in the XenCenter installer -- xenadmin build to push to ref repo (in car-100 branch)
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-17 16:55:44 +00:00
Gabor Apati-Nagy
74b6569a4d CAR-100: Upgrade to .NET 4.0 instead of 3.5 -- Setting back JENKINS_SERVER to tocco
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-16 17:24:59 +00:00
Konstantina Chremmou
b676b5232f Restored repo name in the manifest files so we can trace in which build a change first appears.
Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
2013-12-13 18:59:26 +00:00
Gabor Apati-Nagy
e12e5fdfae [CP-6475] CAR-100: Include .NET installer in the XenCenter installer -- Modifying autorun.inf
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-13 00:21:44 +00:00
Gabor Apati-Nagy
3aa56bcd0f [CP-6475] CAR-100: Include .NET installer in the XenCenter installer -- Adding bootstrapper installer creation to build process (in progress)
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-12 20:07:09 +00:00
Gabor Apati-Nagy
7e3752ff84 [CP-6475] CAR-100: Include .NET installer in the XenCenter installer -- Adding bootstrapper installer creation to build process (initial commit)
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-12 19:47:13 +00:00
Gabor Apati-Nagy
38fd6159bd CAR-100: Upgrade to .NET 4.0 instead of 3.5 -- Adding /framework=net-4.0 option to nunit-console in tests-checks.sh shell script (instead of nunit-console.config)
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-12 12:51:10 +00:00
Gabor Apati-Nagy
9239316464 CAR-100: Upgrade to .NET 4.0 instead of 3.5 -- Adding /framework=net-4.0 option to nunit-console in shell script (instead of nunit-console.config)
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-12 10:46:13 +00:00
Gabor Apati-Nagy
44fbeafc33 Changing Jenkins build server address to test Jenkins instace's
Signed-off-by: Gabor Apati-Nagy <gabor.apati-nagy@citrix.com>
2013-12-09 19:58:07 +00:00