summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-02-03 16:05:21 +0100
committerVladislav Vaintroub <wlad@montyprogram.com>2011-02-03 16:05:21 +0100
commit57d477c7cf7f06d76840529b9852246b3405d25c (patch)
tree7a246abcebddd7d520af9c0e6b536281e179099a /win
parent550823b5337263c1895f74b056893cfe00ce26be (diff)
downloadmariadb-git-57d477c7cf7f06d76840529b9852246b3405d25c.tar.gz
MWL#55 : force per-machine installation.
Problem: user without privileges can have an half-complete installation, if he manages to click on "Ignore" for all errors in the installer. As a result, he will miss ARP registry keys, and uninstall will not be possible using "Add/Remove Programs" applet.
Diffstat (limited to 'win')
-rw-r--r--win/packaging/extra.wxs.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index f2488f20b7c..826fcc40e64 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -28,7 +28,8 @@
<Property Id="DEFAULTUSER" Secure="yes"/>
<!-- Whether to data on uninstall (default yes, after asking user consent) -->
<Property Id="CLEANUPDATA" Secure="yes" Value="1"/>
-
+ <!-- Force per machine installation -->
+ <Property Id="ALLUSERS" Secure="yes" Value="1"/>
<!--
User interface dialogs
@@ -638,5 +639,9 @@
>
NOT NSISINSTALLKEY OR Installed
</Condition>
+ <Condition Message=
+ 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'>
+ <![CDATA[ALLUSERS = "1"]]>
+ </Condition>
</Fragment>
</Wix>