Until now we were bundling MSVC120 x86 runtime.
This patch changes it too the latest version and also add the 64 bit version
of it.
Signed-off-by: Alin Gabriel Serdean <aserd...@ovn.org>
---
windows/automake.mk | 3 ++-
windows/ovs-windows-installer/Product.wxs | 11 ++++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/windows/automake.mk b/windows/automake.mk
index 49c8985fd..ce1fac66c 100644
--- a/windows/automake.mk
+++ b/windows/automake.mk
@@ -26,7 +26,8 @@ windows_installer: all
cp -f $(top_srcdir)/ovsdb/ovsdb-tool.pdb
windows/ovs-windows-installer/Symbols/
#Third party files needed by the installer
cp -f $(PTHREAD_WIN32_DIR_DLL_WIN_FORM)/*.dll
windows/ovs-windows-installer/Binaries/
- cp -f "/c/Program Files (x86)/Common Files/Merge
Modules/Microsoft_VC120_CRT_x86.msm"
windows/ovs-windows-installer/Redist/Microsoft_VC120_CRT_x86.msm
+ cp -f "/c/Program Files (x86)/Common Files/Merge
Modules/Microsoft_VC140_CRT_x86.msm"
windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x86.msm
+ cp -f "/c/Program Files (x86)/Common Files/Merge
Modules/Microsoft_VC140_CRT_x64.msm"
windows/ovs-windows-installer/Redist/Microsoft_VC140_CRT_x64.msm
#Forwarding extension files needed for the installer
cp -f
$(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.cat
windows/ovs-windows-installer/Driver/Win8/ovsext.cat
cp -f
$(top_srcdir)/datapath-windows/x64/Win8$(VSTUDIO_CONFIG)/package/ovsext.inf
windows/ovs-windows-installer/Driver/Win8/ovsext.inf
diff --git a/windows/ovs-windows-installer/Product.wxs
b/windows/ovs-windows-installer/Product.wxs
index ea1bc6896..d722fe927 100644
--- a/windows/ovs-windows-installer/Product.wxs
+++ b/windows/ovs-windows-installer/Product.wxs
@@ -51,9 +51,13 @@
<ComponentGroupRef Id="SymbolsComponentGroup" />
<ComponentRef Id="OpenvSwitchEnvVars" />
- <Feature Id="VC120Redist" Title="Visual C++ 12.0 Runtime"
AllowAdvertise="no" Display="hidden" Level="1"
+ <Feature Id="VC140Redistx86" Title="Visual C++ 14 Runtime x86"
AllowAdvertise="no" Display="hidden" Level="1"
Absent="disallow" InstallDefault="followParent"
TypicalDefault="install">
- <MergeRef Id="VC120Redist" />
+ <MergeRef Id="VC140Redistx86" />
+ </Feature>
+ <Feature Id="VC140Redistx64" Title="Visual C++ 14 Runtime x64"
AllowAdvertise="no" Display="hidden" Level="1"
+ Absent="disallow" InstallDefault="followParent"
TypicalDefault="install">
+ <MergeRef Id="VC140Redistx64" />
</Feature>
</Feature>
@@ -260,7 +264,8 @@
<Fragment>
<DirectoryRef Id="TARGETDIR">
- <Merge Id="VC120Redist" SourceFile="Redist\Microsoft_VC120_CRT_x86.msm"
DiskId="1" Language="0" />
+ <Merge Id="VC140Redistx86"
SourceFile="Redist\Microsoft_VC140_CRT_x86.msm" DiskId="1" Language="0" />
+ <Merge Id="VC140Redistx64"
SourceFile="Redist\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0" />
</DirectoryRef>
</Fragment>
--
2.27.0.windows.1
_______________________________________________
dev mailing list
d...@openvswitch.org
https://mail.openvswitch.org/mailman/listinfo/ovs-dev
