diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-09 16:33:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-12-09 16:33:48 +0100 |
| commit | 3e8155c637096da8fd019c42b78746be2bf89944 (patch) | |
| tree | 7df7880c789de7c32fdd76e862170322afe6117c /win | |
| parent | 106664f8e86d694a9898c3e564bb72290f221bd6 (diff) | |
| parent | 03dabfa84d6bc9a8197c8d9fbe80f2a7f6a5b6ac (diff) | |
| download | mariadb-git-3e8155c637096da8fd019c42b78746be2bf89944.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'win')
| -rw-r--r-- | win/packaging/extra.wxs.in | 17 | ||||
| -rw-r--r-- | win/packaging/heidisql.cmake | 2 | ||||
| -rw-r--r-- | win/packaging/heidisql.wxi.in | 14 |
3 files changed, 28 insertions, 5 deletions
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in index befe070b404..016f6a8a97f 100644 --- a/win/packaging/extra.wxs.in +++ b/win/packaging/extra.wxs.in @@ -463,9 +463,24 @@ <RegistryValue Root='HKLM' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@' Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/> + <CreateFolder> + <util:PermissionEx User="NetworkService" GenericAll="yes" /> + </CreateFolder> + </Component> + + <Component Id="C.datadir.permissions" Directory="DATADIR"> + <Condition> + <!-- + Skip setting permissions for LogonUser, if package is installed by + service user (e.g LocalSystem) + --> + <![CDATA[ (UserSID <> "S-1-5-18") AND (UserSID <> "S-1-5-19") AND (UserSID <> "S-1-5-20") ]]> + </Condition> + <RegistryValue Root='HKLM' + Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@' + Name='InstalledBy' Value='[USER_DOMAIN]\[LogonUser]' Type='string' KeyPath='yes'/> <CreateFolder> <util:PermissionEx User="[LogonUser]" Domain="[USER_DOMAIN]" GenericAll="yes" /> - <util:PermissionEx User="NetworkService" GenericAll="yes" /> </CreateFolder> </Component> diff --git a/win/packaging/heidisql.cmake b/win/packaging/heidisql.cmake index e2636eb4af8..772834e7c7d 100644 --- a/win/packaging/heidisql.cmake +++ b/win/packaging/heidisql.cmake @@ -1,4 +1,4 @@ -SET(HEIDISQL_BASE_NAME "HeidiSQL_9.3_Portable") +SET(HEIDISQL_BASE_NAME "HeidiSQL_9.4_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}) diff --git a/win/packaging/heidisql.wxi.in b/win/packaging/heidisql.wxi.in index 4f07a07627c..1d5c4430cd2 100644 --- a/win/packaging/heidisql.wxi.in +++ b/win/packaging/heidisql.wxi.in @@ -45,14 +45,20 @@ <Component Id="component.HeidiSQL_ssleay32.dll" Guid="*" Win64="no"> <File Id="heidisql.ssleay32.dll" Name="ssleay32.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\ssleay32.dll" /> </Component> - <Component Id="component.HeidiSQL_libintl.dll" Guid="*" Win64="no"> - <File Id="heidisql.libintl.dll" Name="libintl.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl.dll" /> + <Component Id="component.HeidiSQL_libintl_8.dll" Guid="*" Win64="no"> + <File Id="heidisql.libintl_8.dll" Name="libintl-8.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libintl-8.dll" /> + </Component> + <Component Id="component.HeidiSQL_libiconv_2.dll" Guid="*" Win64="no"> + <File Id="heidisql.libiconv_2.dll" Name="libiconv-2.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\libiconv-2.dll" /> </Component> <Directory Id="D.HeidiSQL.plugins" Name="plugins"> <Component Id="component.HeidiSQL_dialog.dll" Guid="*" Win64="no"> <File Id="heidisql.dialog.dll" Name="dialog.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\dialog.dll" /> </Component> + <Component Id="component.HeidiSQL_auth_gssapi_client.dll" Guid="*" Win64="no"> + <File Id="heidisql.auth_gssapi_client.dll" Name="auth_gssapi_client.dll" Source="${HEIDISQL_DOWNLOAD_DIR}\plugins\auth_gssapi_client.dll" /> + </Component> </Directory> <Component Id="component.HeidiSQL_CleanupSettings" Guid="*" Win64="no"> @@ -70,8 +76,10 @@ <ComponentRef Id="component.HeidiSQL_libeay32.dll" /> <ComponentRef Id="component.HeidiSQL_libpq.dll" /> <ComponentRef Id="component.HeidiSQL_ssleay32.dll" /> - <ComponentRef Id="component.HeidiSQL_libintl.dll" /> + <ComponentRef Id="component.HeidiSQL_libintl_8.dll" /> + <ComponentRef Id="component.HeidiSQL_libiconv_2.dll" /> <ComponentRef Id="component.HeidiSQL_dialog.dll" /> + <ComponentRef Id="component.HeidiSQL_auth_gssapi_client.dll" /> <ComponentRef Id="component.HeidiSQL_CleanupSettings"/> </ComponentGroup> </Include> |