diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/CPackWixConfig.cmake | 5 | ||||
| -rw-r--r-- | win/packaging/create_msi.cmake.in | 2 | ||||
| -rw-r--r-- | win/packaging/extra.wxs.in | 90 | ||||
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 11 |
4 files changed, 36 insertions, 72 deletions
diff --git a/win/packaging/CPackWixConfig.cmake b/win/packaging/CPackWixConfig.cmake index 6df49678d52..e954110ef19 100644 --- a/win/packaging/CPackWixConfig.cmake +++ b/win/packaging/CPackWixConfig.cmake @@ -9,7 +9,7 @@ IF(ESSENTIALS) ENDIF() ELSE() SET(CPACK_COMPONENTS_USED - "Server;Client;Development;SharedLibraries;Embedded;Documentation;IniFiles;Readme;Debuginfo;Common;connect-engine;ClientPlugins;gssapi-server;gssapi-client;aws-key-management") + "Server;Client;Development;SharedLibraries;Documentation;Readme;Debuginfo;Common;VCCRT;connect-engine;ClientPlugins;gssapi-server;gssapi-client;aws-key-management;rocksdb-engine") ENDIF() SET( WIX_FEATURE_MySQLServer_EXTRA_FEATURES "DBInstance;SharedClientServerComponents") @@ -35,6 +35,7 @@ SET(CPACK_COMPONENTS_ALL ${CPACK_ALL}) SET(CPACK_COMPONENT_GROUP_ALWAYSINSTALL_HIDDEN 1) SET(CPACK_COMPONENT_README_GROUP "AlwaysInstall") SET(CPACK_COMPONENT_COMMON_GROUP "AlwaysInstall") +SET(CPACK_COMPONENT_VCCRT_GROUP "AlwaysInstall") # Feature MySQL Server SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DISPLAY_NAME "MariaDB Server") @@ -57,7 +58,7 @@ SET(CPACK_COMPONENT_GROUP_MYSQLSERVER_DESCRIPTION "Install server") #Miscellaneous (hidden) components, part of server / or client programs - FOREACH(comp connect-engine ClientPlugins gssapi-server gssapi-client aws-key-management) + FOREACH(comp connect-engine ClientPlugins gssapi-server gssapi-client aws-key-management rocksdb-engine) STRING(TOUPPER "${comp}" comp) SET(CPACK_COMPONENT_${comp}_GROUP "MySQLServer") SET(CPACK_COMPONENT_${comp}_HIDDEN 1) diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in index 1f847a39695..4b05e61decd 100644 --- a/win/packaging/create_msi.cmake.in +++ b/win/packaging/create_msi.cmake.in @@ -425,7 +425,7 @@ EXECUTE_PROCESS( ) EXECUTE_PROCESS( - COMMAND ${LIGHT_EXECUTABLE} -ext WixUIExtension -ext WixUtilExtension + COMMAND ${LIGHT_EXECUTABLE} -v -ext WixUIExtension -ext WixUtilExtension -ext WixFirewallExtension -sice:ICE61 mysql_server.wixobj extra.wixobj -out ${CPACK_PACKAGE_FILE_NAME}.msi ${EXTRA_LIGHT_ARGS} diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 016f6a8a97f..3aba129fdf3 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -12,7 +12,7 @@ <!-- If Innodb is compiled in, enable "optimize for transactions" checkbox --> <?ifndef HaveInnodb ?> - <?define HaveInnodb="0"?> + <?define HaveInnodb="1"?> <?endif?> <Property Id="PortTemplate" Value="#####" /> @@ -55,13 +55,14 @@ <!-- Activate feedback plugin--> <Property Id="FEEDBACK" Secure="yes"/> - <?if $(var.HaveInnodb) = "1" ?> - <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode --> - <Property Id="STDCONFIG" Secure="yes" Value="1"/> - <?endif?> + + <!-- Quick configuration : set default storage engine to innodb, use strict sql_mode --> + <Property Id="STDCONFIG" Secure="yes" Value="1"/> + <!-- Innodb Buffer pool size in MB--> <Property Id="BUFFERPOOLSIZE" Secure="yes"/> - + <!-- Innodb page size --> + <Property Id="PAGESIZE" Secure="yes" Value="16K"/> <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" /> @@ -267,18 +268,7 @@ <Condition Action="disable">NOT ModifyRootPassword</Condition> </Control> - <Control Id="CheckBoxCreateDefaultUser" Type="CheckBox" X="8" Y="154" Width="200" Height="18" Property="DEFAULTUSER" - CheckBoxValue="--default-user" TabSkip="no"> - <Text>{\Font1}Create An Anonymous Account</Text> - </Control> - <Control Id="Text14" Type="Text" X="21" Y="174" Width="268" Height="16" TabSkip="yes"> - <Text>This option will create an anonymous account on this server. </Text> - </Control> - <Control Id="Text13" Type="Text" X="21" Y="190" Width="254" Height="24" TabSkip="yes"> - <Text>Please note: this setting can lead to insecure systems.</Text> - </Control> - - <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="215" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no"> + <Control Id="CheckBoxUTF8" Type="CheckBox" X="8" Y="154" Width="250" Height="18" Property="UTF8" CheckBoxValue="1" TabSkip="no"> <Text>{\Font1}Use UTF8 as default server's character set</Text> </Control> @@ -336,29 +326,23 @@ <Condition Action="disable">Not EnableNetworking</Condition> </Control> - <?if $(var.HaveInnodb) = "1" ?> - <Control Id="CheckBoxStandardConfig" Type="CheckBox" Height="18" Width="220" X="9" Y="171" Property="STDCONFIG" CheckBoxValue="1"> - <Text>{\Font1}Optimize for transactions</Text> - </Control> - - <Control Id="StandardConfigExplain" Type="Text" X="25" Y="190" Width="270" Height="14" TabSkip="yes"> - <Text>(Uses transactional storage engine and "strict" SQL mode)</Text> - <Condition Action="enable" >STDCONFIG</Condition> - <Condition Action="disable">Not STDCONFIG</Condition> - </Control> - <Control Id="LabelInnodbBufferpool" Type="Text" Height="17" Width="77" X="25" Y="210" Text="Buffer pool size:" > - <Condition Action="enable" >STDCONFIG</Condition> - <Condition Action="disable">Not STDCONFIG</Condition> - </Control> - <Control Id="BPSize" Type="MaskedEdit" X="104" Y="208" Width="40" Height="15" Property="BUFFERPOOLSIZE" Sunken="yes" Text="[BufferPoolSizeTemplate]"> - <Condition Action="enable" >STDCONFIG</Condition> - <Condition Action="disable">Not STDCONFIG</Condition> + <Control Id="LabelInnodbSettings" Type="Text" Height="18" Width="220" X="25" Y="171" > + <Text>{\Font1}Innodb engine settings</Text> </Control> - <Control Id="LabelMB" Type="Text" Height="17" Width="15" X="150" Y="210" Text="MB" > - <Condition Action="enable" >STDCONFIG</Condition> - <Condition Action="disable">Not STDCONFIG</Condition> + <Control Id="LabelInnodbBufferpool" Type="Text" Height="17" Width="77" X="25" Y="190" Text="Buffer pool size:" /> + <Control Id="BPSize" Type="MaskedEdit" X="104" Y="188" Width="40" Height="15" Property="BUFFERPOOLSIZE" Sunken="yes" Text="[BufferPoolSizeTemplate]"/> + <Control Id="LabelMB" Type="Text" Height="17" Width="15" X="150" Y="190" Text="MB" /> + <Control Id="LabelInnodbPageSize" Type="Text" Height="17" Width="77" X="25" Y="208" Text="Page size:" /> + <Control Id="LabelKB" Type="Text" Height="17" Width="15" X="150" Y="210" Text="KB" /> + <Control Id="ComboBoxInnodbPageSize" Type="ComboBox" X="104" Y="208" Width="30" Height="17" ComboList="yes" Sorted="yes" Property="PAGESIZE" > + <ComboBox Property="PAGESIZE"> + <ListItem Text=" 4" Value="4K"/> + <ListItem Text=" 8" Value="8K"/> + <ListItem Text="16" Value="16K"/> + <ListItem Text="32" Value="32K"/> + <ListItem Text="64" Value="64K"/> + </ComboBox> </Control> - <?endif?> <!-- Navigation buttons--> <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="&Back"> @@ -493,26 +477,11 @@ <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='both' Remove='uninstall' Wait='yes'/> <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/> </Component> - <?if $(var.HaveInnodb) = "1" ?> + <Component Id="C.myiniconfig" Guid="*" Directory="DATADIR"> - <Condition>STDCONFIG</Condition> <RegistryValue Root='HKLM' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@' Name='STDCONFIG' Value='1' Type='string' KeyPath='yes'/> - <IniFile Id="Ini1" - Action="createLine" - Directory="DATADIR" - Section="mysqld" - Name="my.ini" - Key="sql_mode" - Value=""STRICT_TRANS_TABLES,NO_ENGINE_SUBSTITUTION"" /> - <IniFile Id="Ini2" - Action="createLine" - Directory="DATADIR" - Section="mysqld" - Name="my.ini" - Key="default_storage_engine" - Value="innodb" /> <IniFile Id="Ini3" Action="createLine" Directory="DATADIR" @@ -520,16 +489,7 @@ Name="my.ini" Key="innodb_buffer_pool_size" Value="[BUFFERPOOLSIZE]M" /> - <IniFile Id="Ini4" - Action="createLine" - Directory="DATADIR" - Section="mysqld" - Name="my.ini" - Key="innodb_log_file_size" - Value="[LOGFILESIZE]M" /> </Component> - <?endif?> - <Component Id="C.feedback" Guid="*" Directory="DATADIR"> <Condition>FEEDBACK</Condition> <RegistryValue Root='HKLM' @@ -699,7 +659,7 @@ <CustomAction Id='PresetDatabaseProperties' BinaryKey='wixca.dll' DllEntry='PresetDatabaseProperties' /> <CustomAction Id="CreateDatabaseCommand" Property="CreateDatabase" Value= - ""[#F.bin.mysql_install_db.exe]" "--service=[SERVICENAME]" --port=[PORT] "--password=[ESCAPEDPASSWORD]" "--datadir=[DATADIR]\" [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap" + ""[#F.bin.mysql_install_db.exe]" "--service=[SERVICENAME]" --port=[PORT] --innodb-page-size=[PAGESIZE] "--password=[ESCAPEDPASSWORD]" "--datadir=[DATADIR]\" [SKIPNETWORKING] [ALLOWREMOTEROOTACCESS] [DEFAULTUSER] --verbose-bootstrap" Execute="immediate" HideTarget="yes" /> diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index 44d6249ea1e..dc4ef67387d 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -16,10 +16,13 @@ IF(NOT MFC_FOUND) ENDIF() RETURN() ENDIF() - -# MFC should be statically linked -SET(CMAKE_MFC_FLAG 1) - +IF(MSVC_CRT_TYPE MATCHES "/MD") + # MFC should be dynamically linked + SET(CMAKE_MFC_FLAG 2) +ELSE() + # MFC should be statically linked + SET(CMAKE_MFC_FLAG 1) +ENDIF() # Enable exception handling (avoids warnings) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") |