From patchwork Thu Feb 1 02:58:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shashank Ram X-Patchwork-Id: 868130 X-Patchwork-Delegate: aserdean@cloudbasesolutions.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zX4dB0H1cz9s7M for ; Thu, 1 Feb 2018 14:01:18 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 1DBF7EE4; Thu, 1 Feb 2018 03:00:44 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id AB270E75 for ; Thu, 1 Feb 2018 03:00:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com [208.91.0.189]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id C3ED1DF for ; Thu, 1 Feb 2018 03:00:41 +0000 (UTC) Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Wed, 31 Jan 2018 19:00:35 -0800 Received: from localhost.localdomain (desktop-gtu4ktv.prom.eng.vmware.com [10.33.78.79]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 7C13540847; Wed, 31 Jan 2018 19:00:40 -0800 (PST) From: Shashank Ram To: Date: Wed, 31 Jan 2018 18:58:55 -0800 Message-ID: <20180201025856.16216-1-rams@vmware.com> X-Mailer: git-send-email 2.9.3.windows.2 MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: rams@vmware.com does not designate permitted sender hosts) X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v1 1/2] datapath-windows: Allow compiling all targets using SDK 10.0 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Previously, Win8/8.1 targets would use SDK8.1. However, its recommended to use the newer SDK as newer VS versions typically drop support for older SDKs later on. This patch adds support to compile all targets (Win8/8.1/10) using the 10.0 SDK. Note that his patch does not drop support for older SDKs. Signed-off-by: Shashank Ram Acked-by: Alin Gabriel Serdean Signed-off-by: Shashank Ram Acked-by: Alin Gabriel Serdean Signed-off-by: Shashank Ram --- datapath-windows/Package/package.VcxProj | 28 ++++++++++++------ datapath-windows/ovsext/ovsext.vcxproj | 50 +++++++++++++++++++------------- 2 files changed, 49 insertions(+), 29 deletions(-) diff --git a/datapath-windows/Package/package.VcxProj b/datapath-windows/Package/package.VcxProj index 47cadcd..de747ee 100644 --- a/datapath-windows/Package/package.VcxProj +++ b/datapath-windows/Package/package.VcxProj @@ -42,6 +42,8 @@ $(VCTargetsPath11) + 10.0 + 8.1 @@ -52,46 +54,54 @@ WindowsV6.3 true - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) WindowsV6.3 true - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) true - WindowsKernelModeDriver10.0 + 10.0 + WindowsKernelModeDriver$(PlatformToolsetVer) Desktop Windows8 true - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) Windows8 true - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) false - WindowsKernelModeDriver10.0 + 10.0 + WindowsKernelModeDriver$(PlatformToolsetVer) Universal WindowsV6.3 false - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) Windows8 false - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) @@ -175,4 +185,4 @@ - \ No newline at end of file + diff --git a/datapath-windows/ovsext/ovsext.vcxproj b/datapath-windows/ovsext/ovsext.vcxproj index 48055b9..0509b76 100644 --- a/datapath-windows/ovsext/ovsext.vcxproj +++ b/datapath-windows/ovsext/ovsext.vcxproj @@ -43,6 +43,8 @@ Win8 Debug Win32 {0D37F250-E766-44C7-90B4-D7E07E77D1AA} + 10.0 + 8.1 @@ -52,46 +54,54 @@ WindowsV6.3 True - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) WindowsV6.3 True - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) True - WindowsKernelModeDriver10.0 + 10.0 + WindowsKernelModeDriver$(PlatformToolsetVer) Desktop - Win8 + Windows8 True - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) - Win8 + Windows8 True - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) WindowsV6.3 False - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) False - WindowsKernelModeDriver10.0 + 10.0 + WindowsKernelModeDriver$(PlatformToolsetVer) Desktop - Win8 + Windows8 False - WindowsKernelModeDriver8.1 + 8.1 + WindowsKernelModeDriver$(PlatformToolsetVer) @@ -144,7 +154,7 @@ - + @@ -275,14 +285,14 @@ Level4 - $(IntDir);%(AdditionalIncludeDirectories);..\.. - $(IntDir);%(AdditionalIncludeDirectories);..\.. - $(IntDir);%(AdditionalIncludeDirectories);..\.. - $(IntDir);%(AdditionalIncludeDirectories);..\.. - $(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) - $(IntDir);%(AdditionalIncludeDirectories);..\.. - $(IntDir);%(AdditionalIncludeDirectories);..\.. - $(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) + .;$(IntDir);%(AdditionalIncludeDirectories);..\.. + .;$(IntDir);%(AdditionalIncludeDirectories);..\.. + .;$(IntDir);%(AdditionalIncludeDirectories);..\.. + .;$(IntDir);%(AdditionalIncludeDirectories);..\.. + .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) + .;$(IntDir);%(AdditionalIncludeDirectories);..\.. + .;$(IntDir);%(AdditionalIncludeDirectories);..\.. + .;$(IntDir);%(AdditionalIncludeDirectories);..\..;$(MSBuildProjectDirectory) true true true From patchwork Thu Feb 1 02:58:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shashank Ram X-Patchwork-Id: 868129 X-Patchwork-Delegate: aserdean@cloudbasesolutions.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zX4cZ0JCKz9s7M for ; Thu, 1 Feb 2018 14:00:45 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 247D8E87; Thu, 1 Feb 2018 03:00:43 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id BC3C6E75 for ; Thu, 1 Feb 2018 03:00:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from EX13-EDG-OU-001.vmware.com (ex13-edg-ou-001.vmware.com [208.91.0.189]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 16D4CDF for ; Thu, 1 Feb 2018 03:00:41 +0000 (UTC) Received: from sc9-mailhost3.vmware.com (10.113.161.73) by EX13-EDG-OU-001.vmware.com (10.113.208.155) with Microsoft SMTP Server id 15.0.1156.6; Wed, 31 Jan 2018 19:00:35 -0800 Received: from localhost.localdomain (desktop-gtu4ktv.prom.eng.vmware.com [10.33.78.79]) by sc9-mailhost3.vmware.com (Postfix) with ESMTP id 858C840872; Wed, 31 Jan 2018 19:00:40 -0800 (PST) From: Shashank Ram To: Date: Wed, 31 Jan 2018 18:58:56 -0800 Message-ID: <20180201025856.16216-2-rams@vmware.com> X-Mailer: git-send-email 2.9.3.windows.2 In-Reply-To: <20180201025856.16216-1-rams@vmware.com> References: <20180201025856.16216-1-rams@vmware.com> MIME-Version: 1.0 Received-SPF: None (EX13-EDG-OU-001.vmware.com: rams@vmware.com does not designate permitted sender hosts) X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH v1 2/2] datapath-windows: Specify platform arch during compilation X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Newer compilers expect the platorm architecture to be passed. Signed-off-by: Shashank Ram Acked-by: Alin Gabriel Serdean Signed-off-by: Shashank Ram --- Makefile.am | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index ed4b7fd..5988c02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -409,14 +409,15 @@ CLEANFILES += manpage-dep-check if VSTUDIO_DDK ALL_LOCAL += ovsext +ARCH = x64 ovsext: datapath-windows/ovsext.sln $(srcdir)/datapath-windows/include/OvsDpInterface.h - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) CLEAN_LOCAL += ovsext_clean ovsext_clean: datapath-windows/ovsext.sln - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" - MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH) endif .PHONY: ovsext