diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-28 22:01:55 +0200 |
| commit | 3361aee591b1eb8c676f60887ffc535cd509890a (patch) | |
| tree | 54a65f83ba7d9293e6f8e8281ad920fbae6eb823 /win | |
| parent | 6ce20fb2b9fe57330c797694b9dbea4028f40d7c (diff) | |
| parent | 0fdb17e6c3f50ae22eb97b6363bcbd8b0cd9e040 (diff) | |
| download | mariadb-git-3361aee591b1eb8c676f60887ffc535cd509890a.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 4 | ||||
| -rw-r--r-- | win/packaging/extra.wxs.in | 7 | ||||
| -rw-r--r-- | win/packaging/heidisql.cmake | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 3cb8520b65d..56df4ae791e 100644 --- a/win/packaging/ca/CustomAction.cpp +++ b/win/packaging/ca/CustomAction.cpp @@ -886,11 +886,11 @@ extern "C" UINT __stdcall CheckServiceUpgrades(MSIHANDLE hInstall) (QUERY_SERVICE_CONFIGW*)(void *)config_buffer; DWORD needed; BOOL ok= QueryServiceConfigW(service, config,sizeof(config_buffer), - &needed); + &needed) && (config->dwStartType != SERVICE_DISABLED); CloseServiceHandle(service); if (ok) { - mysqld_service_properties props; + mysqld_service_properties props; if (get_mysql_service_properties(config->lpBinaryPathName, &props)) continue; /* diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index 978a5c9c90d..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> @@ -851,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' @@ -898,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 dfde0cc53b3..bf9433ca34f 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}) |