summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2020-05-28 02:06:23 +0200
committerVladislav Vaintroub <wlad@mariadb.com>2020-05-29 12:28:34 +0200
commitff72f36948985a0dcd2811e4d8dd66e600badc0e (patch)
tree151bb4119c47f7055482a44fcebc060a86d1b404 /win
parente2d7da498231a303854a45455b0b9753af54e3be (diff)
downloadmariadb-git-ff72f36948985a0dcd2811e4d8dd66e600badc0e.tar.gz
MSI installer : Use CAQuietExec64 on Win64 , not CAQuietExec
It works, but irritates people who look into the log and see traces of 32bit custom action server.
Diffstat (limited to 'win')
-rw-r--r--win/packaging/create_msi.cmake.in2
-rw-r--r--win/packaging/extra.wxs.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/win/packaging/create_msi.cmake.in b/win/packaging/create_msi.cmake.in
index 21c59dd4f38..c589f98becc 100644
--- a/win/packaging/create_msi.cmake.in
+++ b/win/packaging/create_msi.cmake.in
@@ -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()
diff --git a/win/packaging/extra.wxs.in b/win/packaging/extra.wxs.in
index 3aba129fdf3..4c8e1a5a973 100644
--- a/win/packaging/extra.wxs.in
+++ b/win/packaging/extra.wxs.in
@@ -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"/>