diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-01 15:52:52 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-06-01 15:52:52 +0200 |
| commit | 02dabe3597be3bd418c1cd28a3172a6b0cce24e3 (patch) | |
| tree | 3d5103bf2f915c44b9bac0134f8c6254cf65959b /win/packaging/extra.wxs.in | |
| parent | 00752ba43c9034fd77e03a65f2a6be9ea15032d2 (diff) | |
| download | mariadb-git-02dabe3597be3bd418c1cd28a3172a6b0cce24e3.tar.gz | |
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.
Diffstat (limited to 'win/packaging/extra.wxs.in')
| -rw-r--r-- | win/packaging/extra.wxs.in | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 456b833cf4f..5aab7bc813c 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -46,6 +46,9 @@ <Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
<!-- Force per machine installation -->
<Property Id="ALLUSERS" Secure="yes" Value="1"/>
+ <!-- Disable advertised shortcuts weirdness -->
+ <Property Id="DISABLEADVTSHORTCUTS" Secure="yes" Value="1"/>
+
<?if $(var.HaveInnodb) = "1" ?>
<!-- Quick configuration : set default storage engine to innodb, use strict sql_mode -->
<Property Id="STDCONFIG" Secure="yes" Value="1"/>
@@ -567,6 +570,38 @@ <?endif?>
</Feature>
+ <!-- Optional 3rd party tools -->
+ <DirectoryRef Id='TARGETDIR'>
+ <Directory Id='CommonFilesFolder'>
+ <Directory Id='MariaDBShared' Name='MariaDBShared'/>
+ </Directory>
+ <Directory Id='DesktopFolder'/>
+ </DirectoryRef>
+
+
+ <?if "@WITH_THIRD_PARTY@" != "" ?>
+
+ <!-- Include definition of 3party components -->
+ <?foreach tool in @WITH_THIRD_PARTY@ ?>
+ <?include "${CMAKE_CURRENT_BINARY_DIR}\$(var.tool).wxi" ?>
+ <?endforeach ?>
+
+ <Feature Id="ThirdPartyTools"
+ Title='Third party tools'
+ Description= 'Third party tools'
+ AllowAdvertise='no'
+ Level='1'
+ Display='expand'>
+ @THIRD_PARTY_FEATURE_CONDITION@
+ <!-- Include definition of 3rd party features -->
+ <?foreach tool in @WITH_THIRD_PARTY@ ?>
+ <?include "${CMAKE_CURRENT_BINARY_DIR}\$(var.tool)_feature.wxi" ?>
+ <?endforeach ?>
+
+ </Feature>
+
+ <?endif ?>
+
<!-- Custom action, call mysql_install_db -->
<SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="SKIPNETWORKING" Value="--skip-networking" >SKIPNETWORKING</SetProperty>
<SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="ALLOWREMOTEROOTACCESS" Value="--allow-remote-root-access">ALLOWREMOTEROOTACCESS</SetProperty>
|