Commit fedfba21 authored by Piotr Obrzut's avatar Piotr Obrzut

Bug #25658832 VALIDATION CHECK FOR MSVC REDIST NEEDED IN SERVER COMMUNITY MSI

Added matching redist prerequisite check to the server msi installer.
parent c34f2e51
# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved. # Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET(LINK_STATIC_RUNTIME_LIBRARIES "@LINK_STATIC_RUNTIME_LIBRARIES@")
SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@") SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@") SET(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@") SET(CANDLE_EXECUTABLE "@CANDLE_EXECUTABLE@")
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
<!-- <!--
Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
...@@ -62,6 +62,32 @@ ...@@ -62,6 +62,32 @@
<RemoveExistingProducts After="InstallInitialize"/> <RemoveExistingProducts After="InstallInitialize"/>
</InstallExecuteSequence> </InstallExecuteSequence>
<?if "@LINK_STATIC_RUNTIME_LIBRARIES@"="OFF" ?>
<?if "@Platform@"="x64"?>
<Property Id="VS08REDISTX64">
<RegistrySearch Id="FindRedistVS08"
Root="HKLM"
Key="SOFTWARE\Classes\Installer\Products\153AA053AF120723B8A73845437E66DA"
Name="Version"
Type="raw" />
</Property>
<Condition Message="This application requires Visual Studio 2008 x64 Redistributable. Please install the Redistributable then run this installer again.">
Installed OR VS08REDISTX64
</Condition>
<?elseif "@Platform@"="x86" ?>
<Property Id="VS08REDISTX86">
<RegistrySearch Id="FindRedistVS08"
Root="HKLM"
Key="SOFTWARE\Classes\Installer\Products\6F9E66FF7E38E3A3FA41D89E8A906A4A"
Name="Version"
Type="raw" />
</Property>
<Condition Message="This application requires Visual Studio 2008 x86 Redistributable. Please install the Redistributable then run this installer again.">
Installed OR VS08REDISTX86
</Condition>
<?endif?>
<?endif?>
<!-- Save/restore install location --> <!-- Save/restore install location -->
<CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" /> <CustomAction Id="SaveTargetDir" Property="ARPINSTALLLOCATION" Value="[INSTALLDIR]" />
<InstallExecuteSequence> <InstallExecuteSequence>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment