diff mbox

[ovs-dev,2/4] build-windows: Propagate PACKAGE_VERSION to the driver files

Message ID 20161206025818.5140-3-aserdean@cloudbasesolutions.com
State Accepted
Delegated to: Guru Shetty
Headers show

Commit Message

Alin Serdean Dec. 6, 2016, 2:58 a.m. UTC
This patch propagates the automake value 'PACKAGE_VERSION' to the driver
specific information files, overwriting the Visual Studio default value of
Version, when building the driver via msys.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 Makefile.am | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Sairam Venugopal Dec. 8, 2016, 11:20 p.m. UTC | #1
Acked-by: Sairam Venugopal <vsairam@vmware.com>

On 12/5/16, 6:58 PM, "Alin Serdean" <aserdean@cloudbasesolutions.com>
wrote:

>This patch propagates the automake value 'PACKAGE_VERSION' to the driver
>specific information files, overwriting the Visual Studio default value of
>Version, when building the driver via msys.
>
>Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
>---
> Makefile.am | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index 974cb9a..6053301 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -394,13 +394,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)"
>-	MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build
>/property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
>+	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)"
> 
> CLEAN_LOCAL += ovsext_clean
> ovsext_clean: datapath-windows/ovsext.sln
>-	MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean
>/property:Configuration="Win8$(VSTUDIO_CONFIG)"
>-	MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean
>/property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
>+	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)"
> endif
> .PHONY: ovsext
> 
>-- 
>2.10.2.windows.1
>_______________________________________________
>dev mailing list
>dev@openvswitch.org
>https://urldefense.proofpoint.com/v2/url?u=https-3A__mail.openvswitch.org_
>mailman_listinfo_ovs-2Ddev&d=DgICAg&c=uilaK90D4TOVoH58JNXRgQ&r=Z6vowHUOjP5
>ysP_g372c49Nqc1vEKqHKNBkR5Q5Z7uo&m=_ZMWzKRdyj3pKBlim3BaEvlCRg0030yuMsDae9T
>qTNc&s=hR9LhIJcbZks698I4FM6REvVrZ-BTavv2ULrfgnNL6I&e=
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index 974cb9a..6053301 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -394,13 +394,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)"
-	MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
+	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)"
 
 CLEAN_LOCAL += ovsext_clean
 ovsext_clean: datapath-windows/ovsext.sln
-	MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)"
-	MSBuild.exe //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)"
+	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)"
 endif
 .PHONY: ovsext