Skip to content

Commit fedfba2

Browse files
author
Piotr Obrzut
committed
Bug #25658832 VALIDATION CHECK FOR MSVC REDIST NEEDED IN SERVER COMMUNITY MSI
Added matching redist prerequisite check to the server msi installer.
1 parent c34f2e5 commit fedfba2

File tree

2 files changed

+29
-2
lines changed

2 files changed

+29
-2
lines changed

packaging/WiX/create_msi.cmake.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
1+
# Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
22
#
33
# This program is free software; you can redistribute it and/or modify
44
# it under the terms of the GNU General Public License as published by
@@ -13,6 +13,7 @@
1313
# along with this program; if not, write to the Free Software
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515

16+
SET(LINK_STATIC_RUNTIME_LIBRARIES "@LINK_STATIC_RUNTIME_LIBRARIES@")
1617
SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
1718
SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
1819
SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")

packaging/WiX/mysql_server.wxs.in

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
33

44
<!--
5-
Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
66

77
This program is free software; you can redistribute it and/or modify
88
it under the terms of the GNU General Public License as published by
@@ -62,6 +62,32 @@
6262
<RemoveExistingProducts After="InstallInitialize"/>
6363
</InstallExecuteSequence>
6464

65+
<?if "@LINK_STATIC_RUNTIME_LIBRARIES@"="OFF" ?>
66+
<?if "@Platform@"="x64"?>
67+
<Property Id="VS08REDISTX64">
68+
<RegistrySearch Id="FindRedistVS08"
69+
Root="HKLM"
70+
Key="SOFTWARE\Classes\Installer\Products\153AA053AF120723B8A73845437E66DA"
71+
Name="Version"
72+
Type="raw" />
73+
</Property>
74+
<Condition Message="This application requires Visual Studio 2008 x64 Redistributable. Please install the Redistributable then run this installer again.">
75+
Installed OR VS08REDISTX64
76+
</Condition>
77+
<?elseif "@Platform@"="x86" ?>
78+
<Property Id="VS08REDISTX86">
79+
<RegistrySearch Id="FindRedistVS08"
80+
Root="HKLM"
81+
Key="SOFTWARE\Classes\Installer\Products\6F9E66FF7E38E3A3FA41D89E8A906A4A"
82+
Name="Version"
83+
Type="raw" />
84+
</Property>
85+
<Condition Message="This application requires Visual Studio 2008 x86 Redistributable. Please install the Redistributable then run this installer again.">
86+
Installed OR VS08REDISTX86
87+
</Condition>
88+
<?endif?>
89+
<?endif?>
90+
6591
<!-- Save/restore install location -->
6692
<CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
6793
<InstallExecuteSequence>

0 commit comments

Comments
 (0)