From patchwork Mon Nov 6 10:11:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 834579 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 3yVpKx19zvz9s4s for ; Mon, 6 Nov 2017 21:13:24 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 47AEFAB9; Mon, 6 Nov 2017 10:13:19 +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 CFE2FA95 for ; Mon, 6 Nov 2017 10:13:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 1177C16A for ; Mon, 6 Nov 2017 10:13:17 +0000 (UTC) X-Originating-IP: 79.114.0.160 Received: from localhost.localdomain (unknown [79.114.0.160]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 2DBC41720E7; Mon, 6 Nov 2017 11:13:15 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 6 Nov 2017 12:11:58 +0200 Message-Id: <20171106101203.10508-1-aserdean@ovn.org> X-Mailer: git-send-email 2.10.2.windows.1 X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH v2 1/6] build-windows: Suppress output from MSBuild 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Add `nologo` parameter to MSBuild to suppress the banner. This will make tidier log messages. Signed-off-by: Alin Gabriel Serdean Acked-by: Alin Balutoiu --- v2: Add acked --- Makefile.am | 8 ++++---- datapath-windows/automake.mk | 4 ++-- windows/automake.mk | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 5ceb382..ebbc045 100644 --- a/Makefile.am +++ b/Makefile.am @@ -406,13 +406,13 @@ CLEANFILES += manpage-dep-check if VSTUDIO_DDK ALL_LOCAL += ovsext ovsext: datapath-windows/ovsext.sln $(srcdir)/datapath-windows/include/OvsDpInterface.h - MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" - MSBuild.exe //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)" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" CLEAN_LOCAL += ovsext_clean ovsext_clean: datapath-windows/ovsext.sln - MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" - MSBuild.exe //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)" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" endif .PHONY: ovsext diff --git a/datapath-windows/automake.mk b/datapath-windows/automake.mk index 36018ea..3820041 100644 --- a/datapath-windows/automake.mk +++ b/datapath-windows/automake.mk @@ -86,5 +86,5 @@ EXTRA_DIST += \ datapath-windows/ovsext/resource.h datapath_windows_analyze: all - MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1Analyze" - MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8Analyze" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1Analyze" + MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8Analyze" diff --git a/windows/automake.mk b/windows/automake.mk index 4fec99e..11ab4c7 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -35,7 +35,7 @@ windows_installer: all cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8.1/ovsext.cat cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8.1/ovsext.inf cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win8.1/ovsext.sys - MSBuild.exe windows/ovs-windows-installer.sln /target:Build /property:Configuration="Release" /property:Version="$(PACKAGE_VERSION)" + MSBuild.exe windows/ovs-windows-installer.sln //nologo /target:Build /property:Configuration="Release" /property:Version="$(PACKAGE_VERSION)" EXTRA_DIST += \ windows/automake.mk \ From patchwork Mon Nov 6 10:11:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 834580 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 3yVpLb6mCcz9s7c for ; Mon, 6 Nov 2017 21:13:59 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 4BE92AE0; Mon, 6 Nov 2017 10:13:20 +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 D3960AAB for ; Mon, 6 Nov 2017 10:13:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 4875E1AD for ; Mon, 6 Nov 2017 10:13:18 +0000 (UTC) X-Originating-IP: 79.114.0.160 Received: from localhost.localdomain (unknown [79.114.0.160]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id CA91B1720F7; Mon, 6 Nov 2017 11:13:16 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 6 Nov 2017 12:11:59 +0200 Message-Id: <20171106101203.10508-2-aserdean@ovn.org> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20171106101203.10508-1-aserdean@ovn.org> References: <20171106101203.10508-1-aserdean@ovn.org> X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH v2 2/6] installer-windows: Remove unused entries from WIX project 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Remove duplicate and obsolete entries from the installer WIX project. Found by inspection. Signed-off-by: Alin Gabriel Serdean Acked-by: Alin Balutoiu --- v2: Add acked --- .../ovs-windows-installer.wixproj | 36 ---------------------- 1 file changed, 36 deletions(-) diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj index f0e8f50..a8256ed 100644 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj @@ -12,11 +12,6 @@ $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets 1.0.0.0 - - bin\$(Configuration)\ - obj\$(Configuration)\ - Debug;Version=$(Version) - bin\$(Configuration)\ obj\$(Configuration)\ @@ -25,37 +20,6 @@ False 1076; - - Debug - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version) - False - False - 1076; - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - Debug;Version=$(Version) - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version) - False - False - 1076; - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - - - Debug;Version=$(Version) - bin\$(Platform)\$(Configuration)\ - obj\$(Platform)\$(Configuration)\ - BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version) False From patchwork Mon Nov 6 10:12:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 834581 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 3yVpMT5nK2z9s4s for ; Mon, 6 Nov 2017 21:14:45 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9954CABC; Mon, 6 Nov 2017 10:13:22 +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 60C8FA95 for ; Mon, 6 Nov 2017 10:13:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 15F5A16A for ; Mon, 6 Nov 2017 10:13:19 +0000 (UTC) X-Originating-IP: 79.114.0.160 Received: from localhost.localdomain (unknown [79.114.0.160]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 6AAD71720E9; Mon, 6 Nov 2017 11:13:17 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 6 Nov 2017 12:12:00 +0200 Message-Id: <20171106101203.10508-3-aserdean@ovn.org> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20171106101203.10508-1-aserdean@ovn.org> References: <20171106101203.10508-1-aserdean@ovn.org> X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH v2 3/6] installer-windows: Resolve WIX solution build type 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Until now the x64 build of the installer solution was pointing to the x86 build of the WIX project. This patch changes for them to match. Signed-off-by: Alin Gabriel Serdean Acked-by: Alin Balutoiu --- v2: Add acked --- windows/ovs-windows-installer.sln | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/ovs-windows-installer.sln b/windows/ovs-windows-installer.sln index 09311f9..f563438 100644 --- a/windows/ovs-windows-installer.sln +++ b/windows/ovs-windows-installer.sln @@ -10,8 +10,8 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.ActiveCfg = Release|x86 - {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.Build.0 = Release|x86 + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.ActiveCfg = Release|x64 + {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x64.Build.0 = Release|x64 {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.ActiveCfg = Release|x86 {259905A2-7434-4190-8A33-8FBA67171DD6}.Release|x86.Build.0 = Release|x86 EndGlobalSection From patchwork Mon Nov 6 10:12:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 834583 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 3yVpN51Dcyz9s4s for ; Mon, 6 Nov 2017 21:15:17 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 8050EB01; Mon, 6 Nov 2017 10:13:23 +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 0B069A95 for ; Mon, 6 Nov 2017 10:13:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 9AA7A16A for ; Mon, 6 Nov 2017 10:13:19 +0000 (UTC) X-Originating-IP: 79.114.0.160 Received: from localhost.localdomain (unknown [79.114.0.160]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 296211720B1; Mon, 6 Nov 2017 11:13:17 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 6 Nov 2017 12:12:01 +0200 Message-Id: <20171106101203.10508-4-aserdean@ovn.org> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20171106101203.10508-1-aserdean@ovn.org> References: <20171106101203.10508-1-aserdean@ovn.org> X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH v2 4/6] installer-windows: Call WIX binaries outside of MSBuild on x64 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Unfortunately all WIX binaries (candle, heat, etc) are only 32 bit (up to the latest version 3.11). For performance reasons they are run as .NET assemblies inside the MSBuild process. Running 32 bit assemblies inside a 64 bit process (MSBuild) makes them segfault. Add a new option for heat to be run as an individual process when the platform is not x86. Signed-off-by: Alin Gabriel Serdean Acked-by: Alin Balutoiu --- v2: Add acked --- windows/ovs-windows-installer/ovs-windows-installer.wixproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows/ovs-windows-installer/ovs-windows-installer.wixproj b/windows/ovs-windows-installer/ovs-windows-installer.wixproj index a8256ed..241d605 100644 --- a/windows/ovs-windows-installer/ovs-windows-installer.wixproj +++ b/windows/ovs-windows-installer/ovs-windows-installer.wixproj @@ -13,6 +13,7 @@ 1.0.0.0 + true bin\$(Configuration)\ obj\$(Configuration)\ BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version) @@ -21,6 +22,7 @@ 1076; + true BinariesPath=Binaries;SymbolsPath=Symbols;Version=$(Version) False False @@ -67,9 +69,9 @@ - + - + + + + + + + + + - + From patchwork Mon Nov 6 10:12:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alin-Gabriel Serdean X-Patchwork-Id: 834585 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 3yVpPC63sVz9s7c for ; Mon, 6 Nov 2017 21:16:15 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 50D90BA2; Mon, 6 Nov 2017 10:13:25 +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 51C87ACC for ; Mon, 6 Nov 2017 10:13:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EC18D1AD for ; Mon, 6 Nov 2017 10:13:20 +0000 (UTC) X-Originating-IP: 79.114.0.160 Received: from localhost.localdomain (unknown [79.114.0.160]) (Authenticated sender: aserdean@ovn.org) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 789F5172095; Mon, 6 Nov 2017 11:13:19 +0100 (CET) From: Alin Gabriel Serdean To: dev@openvswitch.org Date: Mon, 6 Nov 2017 12:12:03 +0200 Message-Id: <20171106101203.10508-6-aserdean@ovn.org> X-Mailer: git-send-email 2.10.2.windows.1 In-Reply-To: <20171106101203.10508-1-aserdean@ovn.org> References: <20171106101203.10508-1-aserdean@ovn.org> X-Spam-Status: No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW autolearn=disabled version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Cc: Alin Gabriel Serdean Subject: [ovs-dev] [PATCH v2 6/6] installer-windows: Add x64 installer build via command line 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: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Add a new variable to know on which platform we are compiling. Make the msbuild command to be aware of the platform we want to build. Shorter the msbuild parameters from `property:`->`p:`. Change slashes to double slashes so msys does not get confused. Signed-off-by: Alin Gabriel Serdean Acked-by: Alin Balutoiu --- v2: Add acked --- Makefile.am | 1 + m4/openvswitch.m4 | 3 +++ windows/automake.mk | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index ebbc045..5d19f08 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,6 +20,7 @@ AM_CPPFLAGS += $(PTHREAD_INCLUDES) AM_CPPFLAGS += $(MSVC_CFLAGS) AM_LDFLAGS += $(PTHREAD_LDFLAGS) AM_LDFLAGS += $(MSVC64_LDFLAGS) +PLATFORM = $(MSVC_PLATFORM) endif AM_CPPFLAGS += -I $(top_srcdir)/include diff --git a/m4/openvswitch.m4 b/m4/openvswitch.m4 index 59e1352..5b13baa 100644 --- a/m4/openvswitch.m4 +++ b/m4/openvswitch.m4 @@ -79,11 +79,14 @@ AC_DEFUN([OVS_CHECK_WIN64], if (cl) 2>&1 | grep 'x64' >/dev/null 2>&1; then cl_cv_x64=yes MSVC64_LDFLAGS=" /MACHINE:X64 " + MSVC_PLATFORM="x64" else cl_cv_x64=no MSVC64_LDFLAGS="" + MSVC_PLATFORM="x86" fi]) AC_SUBST([MSVC64_LDFLAGS]) + AC_SUBST([MSVC_PLATFORM]) ]) dnl Checks for WINDOWS. diff --git a/windows/automake.mk b/windows/automake.mk index 11ab4c7..80dca14 100644 --- a/windows/automake.mk +++ b/windows/automake.mk @@ -35,7 +35,7 @@ windows_installer: all cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.cat windows/ovs-windows-installer/Driver/Win8.1/ovsext.cat cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.inf windows/ovs-windows-installer/Driver/Win8.1/ovsext.inf cp -f $(top_srcdir)/datapath-windows/x64/Win8.1$(VSTUDIO_CONFIG)/package/ovsext.sys windows/ovs-windows-installer/Driver/Win8.1/ovsext.sys - MSBuild.exe windows/ovs-windows-installer.sln //nologo /target:Build /property:Configuration="Release" /property:Version="$(PACKAGE_VERSION)" + MSBuild.exe windows/ovs-windows-installer.sln //nologo //target:Build //p:Configuration="Release" //p:Version="$(PACKAGE_VERSION)" //p:Platform=$(PLATFORM) EXTRA_DIST += \ windows/automake.mk \