diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:11:02 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-21 14:11:02 +0200 |
| commit | c081c978a2c83b9dc9efa84414cf40232460987d (patch) | |
| tree | b625b53c941b75d122ba21d7bf650016f78c9bd5 /win | |
| parent | 1d21b22155242f604ab8e4a7b4ed92a422f61266 (diff) | |
| parent | a482e76e65a4fee70479e877929381c86b1ec62f (diff) | |
| download | mariadb-git-c081c978a2c83b9dc9efa84414cf40232460987d.tar.gz | |
Merge branch '5.5' into bb-10.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/extra.wxs.in | 18 | ||||
| -rw-r--r-- | win/packaging/heidisql.cmake | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 3425a76427b..befe070b404 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -66,6 +66,7 @@ <CustomAction Id="LaunchUrl" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" /> + <!-- User interface dialogs --> @@ -463,7 +464,7 @@ Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@' Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/> <CreateFolder> - <util:PermissionEx User="[LogonUser]" GenericAll="yes" /> + <util:PermissionEx User="[LogonUser]" Domain="[USER_DOMAIN]" GenericAll="yes" /> <util:PermissionEx User="NetworkService" GenericAll="yes" /> </CreateFolder> </Component> @@ -542,17 +543,6 @@ Value="utf8" /> </Component> - <!--- Grant service account permission to the database folder (Windows 7 and later) --> - <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'> - <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition> - <RegistryValue Root='HKLM' - Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@' - Name='servicepermission' Value='1' Type='string' KeyPath='yes'/> - <CreateFolder> - <util:PermissionEx User="NT SERVICE\[SERVICENAME]" GenericAll="yes" /> - </CreateFolder> - </Component> - <!-- Shortcuts in program menu (mysql client etc) --> <Component Id="c.shortcuts" Guid="*" Directory="ShortcutFolder"> <!-- shortcut to my.ini--> @@ -862,6 +852,7 @@ <Property Id="ARPSYSTEMCOMPONENT" Value="1" Secure="yes" /> <Property Id="ARPINSTALLLOCATION" Secure="yes"/> <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="InstallValidate" Sequence="execute"/> + <SetProperty Id="USER_DOMAIN" Value="[%USERDOMAIN]" After="LaunchConditions" Sequence="first" /> <Feature Id='ARPRegistryEntries' Title='Add or remove program entries' Description='Add or remove program entries' @@ -909,5 +900,8 @@ 'Setting the ALLUSERS property is not allowed because [ProductName] is a per-machine application. Setup will now exit.'> <![CDATA[ALLUSERS = "1"]]> </Condition> + <Condition Message='This application is only supported on Windows Vista, Windows Server 2008, or higher.'> + <![CDATA[Installed OR (VersionNT >= 600)]]> + </Condition> </Fragment> </Wix> diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index 5b0cd07cea4..e2636eb4af8 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,4 +1,4 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_9.1_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_9.3_Portable") SET(HEIDISQL_ZIP "${HEIDISQL_BASE_NAME}.zip") SET(HEIDISQL_URL "http://www.heidisql.com/downloads/releases/${HEIDISQL_ZIP}") SET(HEIDISQL_DOWNLOAD_DIR ${THIRD_PARTY_DOWNLOAD_LOCATION}/${HEIDISQL_BASE_NAME}) |