Commit graph

47 commits

Author SHA1 Message Date
Marko Mäkelä
15139964d5 Merge 10.5 into 10.6 2021-09-11 17:55:27 +03:00
Vicențiu Ciorbaru
7c33ecb665 Merge remote-tracking branch 'upstream/10.4' into 10.5 2021-09-10 17:16:18 +03:00
Vicențiu Ciorbaru
de7e027d5e Merge remote-tracking branch 'upstream/10.3' into 10.4 2021-09-09 09:23:35 +03:00
Vicențiu Ciorbaru
b85b8348e7 Merge branch '10.2' into 10.3 2021-09-07 16:32:35 +03:00
Elena Stepanova
8382c3260b MDEV-26514 Option to build a separate test zip package on Windows
Add a possibility to run MTR tests on a release zip
2021-08-31 21:13:13 +03:00
Vladislav Vaintroub
4927bf2534 MDEV-25870 Windows - MSI generation cleanup, fix ARM64
- Support building ARM64 packages
- require InstallerVersion 5.0 -required for arm64, also
it is there already on Windows 7
2021-06-07 23:15:36 +02:00
Vladislav Vaintroub
5eff7c0226 MDEV-23462 Upgrade wizard not offered during 10.5 MSI installation on Windows
There is no mysql_upgrade_wizard target, only mariadb-upgrade-wizard
2020-08-12 21:38:03 +02:00
Marko Mäkelä
a793ae5bc1 Merge 10.4 into 10.5 2020-06-06 08:55:22 +03:00
Marko Mäkelä
6877ef9a7c Merge 10.4 into 10.5 2020-06-05 20:36:43 +03:00
Vladislav Vaintroub
9d479e2577 Merge branch '10.3' into 10.4 2020-06-05 18:00:14 +02:00
Vladislav Vaintroub
b9b279ecc4 Merge remote-tracking branch 'origin/10.2' into 10.3 2020-06-05 17:59:35 +02:00
Vladislav Vaintroub
15cdcb2af8 Fix appveyor build. 2020-06-05 17:56:34 +02:00
Marko Mäkelä
68d9d512e9 Merge 10.3 into 10.4 2020-06-05 18:05:22 +03:00
Marko Mäkelä
680463a8d9 Merge 10.2 into 10.3 2020-06-05 16:51:26 +03:00
Vladislav Vaintroub
1828196f73 Windows, build tweak.
Allow targets for building "noinstall" zip, and debuginfo zip.
2020-06-05 13:29:01 +02:00
Vladislav Vaintroub
3bfe305c5c MDEV-22555 Windows, packaging: binaries depend on vcruntime140_1.dll, which is not in MSI
When server is compiled with recent VS2019, then executables,
have dependency on  vcruntime140_1.dll

While we include the VC redistributable merge modules into our MSI package,
those merge modules were stale (taken from older VS version, 2017)

Since VS2019 brough new DLL dependency by introducing new exception handling
https://devblogs.microsoft.com/cppblog/making-cpp-exception-handling-smaller-x64
thus the old MSMs were not enough.

The fix is to change logic in win/packaging/CMakeLists.txt to look up for
the correct, new MSMs.

The bug only affects 10.4,as we compile with static CRT before 10.4,
and partly-statically(just vcruntime stub is statically linked, but not UCRT)
after 10.4

For the fix to work, it required also some changes on the build machine
(vs_installer, modify VS2019 installation, add Individual Component
"C++ 2019 Redistributable MSMs")
2020-05-14 15:55:18 +02:00
Marko Mäkelä
ddbbf97670 Merge 10.4 into 10.5 2019-11-27 06:29:14 +02:00
Rasmus Johansson
b6f7ec6a5b MDEV-19781 Create MariaDB named commands on Windows
Added CreateSymlinks and DeleteSymlinks functions to
CustomAction.cpp. Extra.wxs.in calls them.
2019-11-26 17:17:54 +02:00
Marko Mäkelä
624dd71b94 Merge 10.4 into 10.5 2019-08-13 18:57:00 +03:00
Marko Mäkelä
7a3d34d645 Merge 10.3 into 10.4 2019-07-02 21:44:58 +03:00
Marko Mäkelä
e82fe21e3a Merge 10.2 into 10.3 2019-07-02 17:46:22 +03:00
Vladislav Vaintroub
74a744b51f Windows : Do not package redistributable C runtime , nor merge modules into Windows
installers

Rely on Universal CRT to be on every computer we install.
2019-06-27 19:33:25 +02:00
Vladislav Vaintroub
dc11aab9b3 MDEV-19889 In CMakeLists.txt, use ${CMAKE_CPACK_COMMAND},rather than just cpack 2019-06-27 15:18:02 +02:00
Oleksandr Byelkin
c07325f932 Merge branch '10.3' into 10.4 2019-05-19 20:55:37 +02:00
Marko Mäkelä
be85d3e61b Merge 10.2 into 10.3 2019-05-14 17:18:46 +03:00
Marko Mäkelä
26a14ee130 Merge 10.1 into 10.2 2019-05-13 17:54:04 +03:00
Vicențiu Ciorbaru
5543b75550 Update FSF Address
* Update wrong zip-code
2019-05-11 21:29:06 +03:00
Vladislav Vaintroub
f4cdf90d73 MDEV-17279 Windows : link C runtime dynamically
Changed the build to use /MD flag so that DDL version of C runtime is used.

To make sure MariaDB is always runnable on target system, include
redistributable CRT libraries into installer.

For MSI package, use Microsoft's merge modules.
For ZIP  use "applocal" approach,i.e place redistributable dlls
into the bin directory of the package(via InstallRequiredSystemLibraries
cmake module) The space overhead of libraries in negligible, ~ 3MB unpacked.

There are 2 cases, where we still link C runtime statically

- Upgrade wizard, it uses MFC, and we link statically to avoid
redistribute also whole MFC (for this single application, does not
make much sense).

- MSI installer's custom action dll wixca.dll.Here, we need static link
so that MSI won't fail on a target system that does not have VC++2015
runtime already installed.
2018-10-09 08:42:48 +01:00
Sergei Golubchik
57e0da50bb Merge branch '10.2' into 10.3 2018-09-28 16:37:06 +02:00
Vladislav Vaintroub
4a026596f5 MDEV-15088 Lighter version of Windows Zip distributions
Added forgotten code signing command.
2018-09-18 21:30:03 +01:00
Vladislav Vaintroub
f0ee8496d2 MDEV-15088 Lighter version of Windows Zip distributions
Add new target win_package, that produces
a) light ZIP (no test suite, no sql-bench, no debugsymbols)
b) debug symbols ZIP
2018-09-14 20:54:54 +01:00
Sergei Golubchik
6b53f9d781 MDEV-16662 CMake warnings: CMP0026 2018-08-12 11:37:42 +02:00
Marko Mäkelä
2a3fe45dd2 Remove XtraDB
The XtraDB storage engine was already replaced by InnoDB
and disabled in MariaDB Server 10.2. Let us remove it altogether
to avoid dragging dead code around.

Replace some references to XtraDB with references to InnoDB.

rpl_get_position_info(): Remove.

Remove the mysql-test-run --suite=percona, because it only contains
tests specific to XtraDB, many of which were disabled already in
earlier MariaDB versions.
2017-06-21 13:44:16 +03:00
Vladislav Vaintroub
b56262f696 MDEV-12328, attempt to fix windows packaging 2017-03-26 23:03:25 +00:00
Vladislav Vaintroub
3990e55fef Windows : Fix packaging when building with VS2017 2017-03-13 23:31:03 +00:00
Vladislav Vaintroub
09cb64682b Windows : fix search for WiX root directory when using 64bit cmake
"C:\Program Files (x86)" directory needs to be checked as well in
this case.
2016-08-11 19:39:04 +00:00
Sergei Golubchik
c4cb240061 MDEV-9024 Build fails with VS2015
cherry-pick f1daf9ce from 10.0 branch
-------------------------------------

Fix build failures caused by new C runtime library
- isnan, snprintf, struct timespec are now defined, attempt to
redefine them leads
- P_tmpdir, tzname are no more defined
-  lfind() and lsearch() in lf_hash.c had to be renamed,  declaration
conflicts with some C runtime functions with the same name declared in
a header included by stdlib.h

 Also fix couple of annoying warnings :
- remove #define NOMINMAX from config.h to avoid "redefined" compiler
warnings(NOMINMAX is already in compile flags)

- disable incremental linker in Debug as well (feature not used much
and compiler crashes often)

Also simplify package building with Wix, require Wix 3.9 or later
(VS2015 is not compatible with old Wix 3.5/3.6)
2016-02-06 22:41:58 +01:00
Nirbhay Choubey
4ba6ee1b31 MDEV-6891: Update company name 2014-12-12 10:38:19 -05:00
Vladislav Vaintroub
feb4776ecf MDEV233 - Support Wix3.6 for MSI 2012-04-25 15:30:19 +02:00
Vladislav Vaintroub
c0f2f1f1f6 Fix a problem building MSI using localized (Spanish) Visual Studio 2010.
VS did not like to execute 2 commands in custom build step, workaround is 
to use single COMMAND instead of 2.
2011-06-08 16:56:35 +02:00
Vladislav Vaintroub
58c6165e28 Use our libmysql.dll with Heidi, if we compile 32 bit 2011-06-01 21:14:10 +02:00
Vladislav Vaintroub
02dabe3597 MWL#200 - provide options to install 3rd party components.
Added HeidiSQL as example, i.e cmake -DWITH_THIRD_PARTY=HeidiSQL  
and building MSI will bundle HeidiSQL.
2011-06-01 15:52:52 +02:00
Vladislav Vaintroub
2a60cc126d enable 'Optimized for transactions'configuration checkbox if innodb is compiled in 2011-04-08 02:49:04 +02:00
Vladislav Vaintroub
3ec6533ac8 MWL#55 : address Philip's final review comments :
- rename upgrade_wizard.exe to mysql_upgrade_wizard.exe
- have shortcut to upgrade wizard in the menu folder
2011-02-14 19:36:06 +01:00
Vladislav Vaintroub
074dc9a550 On Philips request, introduce a variable
BUILD_RELEASE to disable graceful fallbacks
if WiX or MFC is not available.
2011-02-03 21:02:20 +01:00
Vladislav Vaintroub
366ee3c791 Move common functionality (analyze service configuration) into winservice library 2011-01-30 22:27:59 +01:00
Vladislav Vaintroub
e353bc80f7 MWL#55 : implement MSI installer
The  general technique to generate MSI using CMake is taken from MySQL 5.5

Additional features not present in 5.5 installer : 
-optionally creating a new database
(as Windows service), using new mysql_install_db.exe to do the job
 
- optional upgrade of existing services from old MySQL or Maria installation.
This work is actually done by the upgrade wizard that is launched at the 
end of installation.
2011-01-29 19:06:50 +01:00