diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2019-11-27 16:02:34 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2019-11-27 16:02:34 +0100 |
| commit | 29710b2839ed6f87a2ba745059daae6bc3ef5870 (patch) | |
| tree | 42226e816162eb80ce6523a7cfbfd03c95b1a27a /win/packaging/extra.wxs.in | |
| parent | ddbbf97670ede6d3d6c6ad597c9b0f826272c85d (diff) | |
| parent | 96c6b2b64926b7c2d57ce0a85d11039d062dfc3b (diff) | |
| download | mariadb-git-29710b2839ed6f87a2ba745059daae6bc3ef5870.tar.gz | |
Merge branch '10.4' into 10.5
# Conflicts:
# win/packaging/extra.wxs.in
Diffstat (limited to 'win/packaging/extra.wxs.in')
| -rw-r--r-- | win/packaging/extra.wxs.in | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index d8ea35fac81..7de62907300 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -59,9 +59,6 @@ <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" /> @@ -601,16 +598,19 @@ <?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" /> - + <CustomAction Id="Symlinks.SetProperty" Return="check" Property="Symlinks" Value="[INSTALLDIR]" /> + <CustomAction Id="Symlinks" BinaryKey="wixca.dll" DllEntry="FixSymlinks" Execute="deferred" Impersonate="no" Return="ignore"/> + <CustomAction Id="SymlinksRollback.SetProperty" Return="check" Property="SymlinksRollback" Value="[INSTALLDIR]" /> + <CustomAction Id="SymlinksRollback" BinaryKey="wixca.dll" DllEntry="FixSymlinksRollback" Execute="rollback" Impersonate="no" Return="ignore"/> + <CustomAction Id="SymlinksUninstall.SetProperty" Return="check" Property="SymlinksUninstall" Value="[INSTALLDIR]" /> + <CustomAction Id="SymlinksUninstall" BinaryKey="wixca.dll" DllEntry="SymlinksUninstall" Execute="deferred" Impersonate="no" Return="ignore"/> <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> + <Custom Action="Symlinks.SetProperty" Before="Symlinks">NOT Installed OR UPGRADINGPRODUCTCODE</Custom> + <Custom Action="Symlinks" After="SymlinksRollback">NOT Installed OR UPGRADINGPRODUCTCODE</Custom> + <Custom Action="SymlinksRollback.SetProperty" Before="SymlinksRollback">NOT Installed OR UPGRADINGPRODUCTCODE</Custom> + <Custom Action="SymlinksRollback" After="InstallFiles">NOT Installed OR UPGRADINGPRODUCTCODE</Custom> + <Custom Action="SymlinksUninstall.SetProperty" Before="SymlinksUninstall">Installed AND NOT UPGRADINGPRODUCTCODE</Custom> + <Custom Action="SymlinksUninstall" Before="RemoveFiles">Installed AND NOT UPGRADINGPRODUCTCODE</Custom> </InstallExecuteSequence> <!-- Custom action, call mysql_install_db --> @@ -821,7 +821,6 @@ Name='MinorVersion' Value='@MINOR_VERSION@' Type='string'/> </Component> </Feature> - <Condition Message= 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'> <![CDATA[ALLUSERS = "1"]]> |