diff mbox series

[ovs-dev,v3,5/8] windows, installer: Bundle latest runtime version

Message ID 20200924062023.755-1-aserdean@ovn.org
State Accepted
Headers show
Series [ovs-dev,v3,1/8] windows: Remove unused variable | expand

Commit Message

Alin-Gabriel Serdean Sept. 24, 2020, 6:20 a.m. UTC 
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 <aserdean@ovn.org>
---
 windows/automake.mk                       |  3 ++-
 windows/ovs-windows-installer/Product.wxs | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

Comments

0-day Robot Sept. 24, 2020, 7:08 a.m. UTC | #1 
Bleep bloop.  Greetings Alin Gabriel Serdean, I am a robot and I have tried out your patch.
Thanks for your contribution.

I encountered some error that I wasn't expecting.  See the details below.


checkpatch:
WARNING: Line is 115 characters long (recommended limit is 79)
#40 FILE: windows/ovs-windows-installer/Product.wxs:54:
      <Feature Id="VC140Redistx86" Title="Visual C++ 14 Runtime x86" AllowAdvertise="no" Display="hidden" Level="1"

WARNING: Line is 115 characters long (recommended limit is 79)
#45 FILE: windows/ovs-windows-installer/Product.wxs:58:
      <Feature Id="VC140Redistx64" Title="Visual C++ 14 Runtime x64" AllowAdvertise="no" Display="hidden" Level="1"

WARNING: Line is 88 characters long (recommended limit is 79)
#46 FILE: windows/ovs-windows-installer/Product.wxs:59:
               Absent="disallow" InstallDefault="followParent" TypicalDefault="install">

WARNING: Line is 107 characters long (recommended limit is 79)
#56 FILE: windows/ovs-windows-installer/Product.wxs:267:
      <Merge Id="VC140Redistx86" SourceFile="Redist\Microsoft_VC140_CRT_x86.msm" DiskId="1" Language="0" />

WARNING: Line is 107 characters long (recommended limit is 79)
#57 FILE: windows/ovs-windows-installer/Product.wxs:268:
      <Merge Id="VC140Redistx64" SourceFile="Redist\Microsoft_VC140_CRT_x64.msm" DiskId="1" Language="0" />

Lines checked: 63, Warnings: 5, Errors: 0


Please check this out.  If you feel there has been an error, please email aconole@redhat.com

Thanks,
0-day Robot
diff mbox series

Patch

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>