diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-11 17:55:27 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-11 17:55:27 +0300 |
| commit | 15139964d52539a8bb96d090fa1b5b26921eab3e (patch) | |
| tree | 926d23e30e2c3aa09014a8005db95ad543694357 /win | |
| parent | 54f79a0f7fc8b1b30073391319f1b2c37b4cc015 (diff) | |
| parent | 40b743f99e8ca5ac479e8c559f8316b606033582 (diff) | |
| download | mariadb-git-15139964d52539a8bb96d090fa1b5b26921eab3e.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | win/packaging/CPackZIPTestConfig.cmake | 6 | ||||
| -rw-r--r-- | win/packaging/mysql_server.wxs.in | 2 |
3 files changed, 13 insertions, 1 deletions
diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index 2c8f0c309eb..a4d951bfa5c 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -230,6 +230,12 @@ ADD_CUSTOM_TARGET( WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) +ADD_CUSTOM_TARGET( + win_package_test + COMMAND ${CMAKE_CPACK_COMMAND} ${CPACK_CONFIG_PARAM} --config ${CMAKE_CURRENT_SOURCE_DIR}/CPackZipTestConfig.cmake + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} +) + ADD_CUSTOM_TARGET(win_package DEPENDS win_package_zip win_package_debuginfo) SET_TARGET_PROPERTIES( win_package win_package_zip win_package_debuginfo diff --git a/win/packaging/CPackZIPTestConfig.cmake b/win/packaging/CPackZIPTestConfig.cmake new file mode 100644 index 00000000000..1dfba7ecabf --- /dev/null +++ b/win/packaging/CPackZIPTestConfig.cmake @@ -0,0 +1,6 @@ +INCLUDE(CPackConfig.cmake) +set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-test") +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_GROUPING ALL_COMPONENTS_IN_ONE) +SET(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY ON) +SET(CPACK_COMPONENTS_ALL Test) diff --git a/win/packaging/mysql_server.wxs.in b/win/packaging/mysql_server.wxs.in index c1bcc0c9012..0d955659a34 100644 --- a/win/packaging/mysql_server.wxs.in +++ b/win/packaging/mysql_server.wxs.in @@ -18,7 +18,7 @@ SummaryCodepage='1252' Platform='@Platform@'/> - <Media Id='1' Cabinet='product.cab' EmbedCab='yes' CompressionLevel='high' /> + <MediaTemplate EmbedCab="yes" MaximumUncompressedMediaSize="2" CompressionLevel="high"/> <!-- Upgrade --> <Upgrade Id="@CPACK_WIX_UPGRADE_CODE@"> |