diff mbox

[ovs-dev,4/4] build-windows: Propagate PACKAGE_VERSION to the MSI

Message ID 20161206025818.5140-5-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 variable PACKAGE_VERSION when building
the MSI via msys.

Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
---
 windows/automake.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 variable PACKAGE_VERSION when building
>the MSI via msys.
>
>Signed-off-by: Alin Gabriel Serdean <aserdean@cloudbasesolutions.com>
>---
> windows/automake.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/windows/automake.mk b/windows/automake.mk
>index fa610ec..db2b616 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"
>+	MSBuild.exe windows/ovs-windows-installer.sln /target:Build
>/property:Configuration="Release" /property:Version="$(PACKAGE_VERSION)"
> 
> EXTRA_DIST += \
> 	windows/.gitignore \
>-- 
>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=kcczl0Nb7m02rc1yHuo0rIfxVDbVlD_98w2kb5A
>crPE&s=yXdqDsRSBLBXVU3zBGXs6rwsN06hkZ5qxKaw4LfHm0Y&e=
diff mbox

Patch

diff --git a/windows/automake.mk b/windows/automake.mk
index fa610ec..db2b616 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"
+	MSBuild.exe windows/ovs-windows-installer.sln /target:Build /property:Configuration="Release" /property:Version="$(PACKAGE_VERSION)"
 
 EXTRA_DIST += \
 	windows/.gitignore \