diff mbox series

[ovs-dev,6/6] installer-windows: Add x64 installer build via command line

Message ID 20171031172537.2292-7-aserdean@ovn.org
State Superseded
Headers show
Series installer fixes on msbuild64 | expand

Commit Message

Alin-Gabriel Serdean Oct. 31, 2017, 5:25 p.m. UTC
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 <aserdean@ovn.org>
---
 Makefile.am         | 1 +
 m4/openvswitch.m4   | 3 +++
 windows/automake.mk | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

Comments

Alin Balutoiu Nov. 2, 2017, 5:18 p.m. UTC | #1
Acked-by: Alin Balutoiu <abalutoiu@cloudbasesolutions.com>

> -----Original Message-----
> From: ovs-dev-bounces@openvswitch.org [mailto:ovs-dev-
> bounces@openvswitch.org] On Behalf Of Alin Gabriel Serdean
> Sent: Tuesday, October 31, 2017 6:26 PM
> To: dev@openvswitch.org
> Cc: Alin Gabriel Serdean <aserdean@ovn.org>
> Subject: [ovs-dev] [PATCH 6/6] installer-windows: Add x64 installer build via
> command line
> 
> 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 <aserdean@ovn.org>
> ---
>  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 \
> --
> 2.10.2.windows.1
> 
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
diff mbox series

Patch

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 \