diff options
| author | Rasmus Johansson <razze@iki.fi> | 2019-11-17 10:39:47 +0200 |
|---|---|---|
| committer | Rasmus Johansson <razze@iki.fi> | 2019-11-26 17:17:54 +0200 |
| commit | b6f7ec6a5b8da27866136d50f50337fcce64eff5 (patch) | |
| tree | 22ef6f29eaf5cf9d140b9381e98d123a53327bc4 /win/packaging/extra.wxs.in | |
| parent | f9ceb0a67ffb20631c936a7e8e8776c000d677ac (diff) | |
| download | mariadb-git-b6f7ec6a5b8da27866136d50f50337fcce64eff5.tar.gz | |
MDEV-19781 Create MariaDB named commands on Windowsbb-10.4-MDEV-19781
Added CreateSymlinks and DeleteSymlinks functions to
CustomAction.cpp. Extra.wxs.in calls them.
Diffstat (limited to 'win/packaging/extra.wxs.in')
| -rw-r--r-- | win/packaging/extra.wxs.in | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 1955799f6f9..68e455d6486 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -63,6 +63,9 @@ <Property Id="BUFFERPOOLSIZE" Secure="yes"/> <!-- Innodb page size --> <Property Id="PAGESIZE" Secure="yes" Value="16K"/> + <!-- Symlinks --> + <Property Id="SYMLINK_TOS" Value="@MARIADB_SYMLINK_TOS@" /> + <Property Id="SYMLINK_FROMS" Value="@MARIADB_SYMLINK_FROMS@" /> <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" /> @@ -660,11 +663,24 @@ <MergeRef Id="VCRedist"/> </Feature> <?endif?> + + <!-- Custom action, create symlinks --> + <CustomAction Id="CreateSymlinks.SetProperty" Return="check" Property="CreateSymlinks" Value="[INSTALLDIR]|[SYMLINK_FROMS]|[SYMLINK_TOS]" /> + <CustomAction Id="CreateSymlinks" BinaryKey="wixca.dll" DllEntry="CreateSymlinks" Execute="deferred" Impersonate="no" Return="ignore" /> + <CustomAction Id="DeleteSymlinks.SetProperty" Return="check" Property="DeleteSymlinks" Value="[INSTALLDIR]|[SYMLINK_FROMS]|[SYMLINK_TOS]" /> + <CustomAction Id='DeleteSymlinks' BinaryKey="wixca.dll" DllEntry="DeleteSymlinks" Execute="deferred" Impersonate="no" Return="ignore" /> - <!-- 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> - <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="DEFAULTUSER" Value="--default-user">DEFAULTUSER</SetProperty> + <InstallExecuteSequence> + <Custom Action="CreateSymlinks.SetProperty" Before="CreateSymlinks">NOT Installed</Custom> + <Custom Action="CreateSymlinks" Before="InstallFinalize">NOT Installed</Custom> + <Custom Action="DeleteSymlinks.SetProperty" Before="DeleteSymlinks">Installed AND NOT REINSTALL</Custom> + <Custom Action="DeleteSymlinks" Before="RemoveFiles">Installed AND NOT REINSTALL</Custom> + </InstallExecuteSequence> + + <!-- 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> + <SetProperty Sequence='execute' Before='CreateDatabaseCommand' Id="DEFAULTUSER" Value="--default-user">DEFAULTUSER</SetProperty> <CustomAction Id='CheckDatabaseProperties' BinaryKey='wixca.dll' DllEntry='CheckDatabaseProperties' /> <CustomAction Id='PresetDatabaseProperties' BinaryKey='wixca.dll' DllEntry='PresetDatabaseProperties' /> <CustomAction Id="CreateDatabaseCommand" Property="CreateDatabase" @@ -881,10 +897,10 @@ > <![CDATA[ NOT(NSISINSTALLKEY << "MariaDB @MAJOR_VERSION@.@MINOR_VERSION@.") OR Installed]]> </Condition> - <Condition Message= + <!-- Condition Message= 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'> <![CDATA[ALLUSERS = "1"]]> - </Condition> + </Condition --> <Condition Message='This application is only supported on Windows Vista, Windows Server 2008, or higher.'> <![CDATA[Installed OR (VersionNT >= 600)]]> </Condition> |