mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MSI installer : Use CAQuietExec64 on Win64 , not CAQuietExec

Browse source 
It works, but irritates people who look into the log and see
traces of 32bit custom action server.
This commit is contained in:
Vladislav Vaintroub 2020-05-28 02:06:23 +02:00
parent e2d7da4982
commit ff72f36948
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
win/packaging/create_msi.cmake.in
View file

@ -70,10 +70,12 @@ IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(Win64 " Win64='yes'")
SET(Platform x64)
SET(PlatformProgramFilesFolder ProgramFiles64Folder)
SET(CA_QUIET_EXEC CAQuietExec64)
ELSE()
SET(CANDLE_ARCH -arch x86)
SET(Platform x86)
SET(PlatformProgramFilesFolder ProgramFilesFolder)
SET(CA_QUIET_EXEC CAQuietExec)
SET(Win64)
ENDIF()

2
win/packaging/extra.wxs.in
View file

@ -666,7 +666,7 @@
<CustomAction Id="CreateDatabaseRollbackCommand" Property="CreateDatabaseRollback"
Value="[SERVICENAME]\[DATADIR]"
Execute="immediate"/>
<CustomAction Id="CreateDatabase" BinaryKey="WixCA" DllEntry="CAQuietExec"
<CustomAction Id="CreateDatabase" BinaryKey="WixCA" DllEntry="@CA_QUIET_EXEC@"
Execute="deferred" Return="check" Impersonate="no" />
<CustomAction Id="CreateDatabaseRollback" BinaryKey="wixca.dll" DllEntry="CreateDatabaseRollback"
Execute="rollback" Return="check" Impersonate="no"/>