Skip to content

Commit accc3e7

Browse files
igsilyaalmusil
igsilya
authored and
almusil
committed
treewide: Remove shards of Windows support.
Windows build was broken since the split from OVS. OVS also recently fully dropped support for building and running on Windows. Let's remove the bits of the Windows build system to avoid any confusion. Some notes: * debian/copyright.in is very outdated. Only removing bits directly related to the Windows build. * Comment in ovn-controller-vtep.at is removed without touching any code because it's just an outdated comment that should've been removed while moving to Python 3. * m4/absolute-header.m4 still has one Windows reference, but it is coming from the original sources and it should remain. * HOST_NAME_MAX is needed for BSD/OSX, not only for Windows. Signed-off-by: Ilya Maximets <i.maximets@ovn.org> Acked-by: Mark Michelson <mmichels@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com>
1 parent 860d5e4 commit accc3e7

26 files changed

Lines changed: 15 additions & 674 deletions

‎Documentation/automake.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ DOC_SOURCE = \
1111
Documentation/intro/install/fedora.rst \
1212
Documentation/intro/install/general.rst \
1313
Documentation/intro/install/ovn-upgrades.rst \
14-
Documentation/intro/install/windows.rst \
1514
Documentation/tutorials/index.rst \
1615
Documentation/tutorials/ovn-openstack.rst \
1716
Documentation/tutorials/ovn-sandbox.rst \

‎Documentation/index.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ First Steps
4949

5050
Getting started with Open Virtual Network (OVN) for Open vSwitch? Start here.
5151

52-
- **Install:** :doc:`intro/install/general` |
53-
:doc:`intro/install/windows`
52+
- **Install:** :doc:`intro/install/general`
5453

5554
- **Tutorials:** :doc:`tutorials/ovn-sandbox` |
5655
:doc:`tutorials/ovn-openstack` |

‎Documentation/intro/install/index.rst‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ Installation from Source
4040
:maxdepth: 2
4141

4242
general
43-
windows
4443

4544
Installation from Packages
4645
--------------------------

‎Documentation/intro/install/windows.rst‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎Makefile.am‎

Lines changed: 4 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,6 @@ AM_CPPFLAGS = $(SSL_CFLAGS)
1919
AM_LDFLAGS = $(SSL_LDFLAGS)
2020
AM_LDFLAGS += $(OVS_LDFLAGS)
2121

22-
AM_CPPFLAGS += -I $(top_srcdir)/include
23-
24-
if WIN32
25-
AM_CPPFLAGS += $(PTHREAD_INCLUDES)
26-
AM_CPPFLAGS += $(MSVC_CFLAGS)
27-
AM_LDFLAGS += $(PTHREAD_LDFLAGS)
28-
AM_LDFLAGS += $(MSVC64_LDFLAGS)
29-
PLATFORM = $(MSVC_PLATFORM)
30-
endif
31-
3222
AM_CPPFLAGS += -I $(top_srcdir)/include
3323
AM_CPPFLAGS += -I $(top_srcdir)/ovn
3424
AM_CPPFLAGS += -I $(top_builddir)/include
@@ -57,18 +47,13 @@ endif
5747

5848
AM_CTAGSFLAGS = $(OVS_CTAGS_IDENTIFIERS_LIST)
5949

60-
if WIN32
61-
psep=";"
62-
else
63-
psep=":"
64-
endif
6550
# PYTHONDONTWRITEBYTECODE=yes keeps Python from creating .pyc and .pyo
6651
# files. Creating .py[co] works OK for any given version of Open
6752
# vSwitch, but it causes trouble if you switch from a version with
6853
# foo/__init__.py into an (older) version with plain foo.py, since
6954
# foo/__init__.pyc will cause Python to ignore foo.py.
7055
run_python = \
71-
PYTHONPATH=$(OVS_SRCDIR)/python$(psep)$$PYTHONPATH \
56+
PYTHONPATH=$(OVS_SRCDIR)/python:$$PYTHONPATH \
7257
PYTHONDONTWRITEBYTECODE=yes $(PYTHON3)
7358

7459
ALL_LOCAL =
@@ -176,7 +161,7 @@ submodules = $(shell grep 'path =' $(srcdir)/.gitmodules | sed -E 's/[\t ]*path
176161

177162
SUFFIXES += .in
178163
.in:
179-
$(AM_V_GEN)PYTHONPATH=$(OVS_SRCDIR)/python$(psep)$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/soexpand.py -I$(srcdir) -I$(OVS_SRCDIR) < $< | \
164+
$(AM_V_GEN)PYTHONPATH=$(OVS_SRCDIR)/python:$$PYTHONPATH:$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/soexpand.py -I$(srcdir) -I$(OVS_SRCDIR) < $< | \
180165
$(PYTHON3) $(srcdir)/build-aux/dpdkstrip.py $(DPDKSTRIP_FLAGS) | \
181166
sed \
182167
-e 's,[@]PKIDIR[@],$(PKIDIR),g' \
@@ -275,7 +260,7 @@ config-h-check:
275260
fi
276261
.PHONY: config-h-check
277262

278-
# Check for printf() type modifiers that MSVC doesn't support.
263+
# Check for non-portable printf() type modifiers.
279264
ALL_LOCAL += printf-check
280265
printf-check:
281266
@cd $(srcdir); \
@@ -444,7 +429,7 @@ CLEANFILES += flake8-check
444429

445430
include $(srcdir)/manpages.mk
446431
$(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py $(OVS_SRCDIR)/python/ovs_build_helpers/soutil.py
447-
@PYTHONPATH=$(OVS_SRCDIR)/python$(psep)$$PYTHONPATH$(psep)$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -Isrcdir,$(srcdir) -IOVS_MANDIR,$(OVS_MANDIR) $(MAN_ROOTS) >$(@F).tmp
432+
@PYTHONPATH=$(OVS_SRCDIR)/python:$$PYTHONPATH:$(srcdir)/python $(PYTHON3) $(srcdir)/build-aux/sodepends.py -I. -Isrcdir,$(srcdir) -IOVS_MANDIR,$(OVS_MANDIR) $(MAN_ROOTS) >$(@F).tmp
448433
@if cmp -s $(@F).tmp $@; then \
449434
touch $@; \
450435
rm -f $(@F).tmp; \
@@ -453,35 +438,6 @@ $(srcdir)/manpages.mk: $(MAN_ROOTS) build-aux/sodepends.py $(OVS_SRCDIR)/python/
453438
fi
454439
CLEANFILES += manpage-dep-check
455440

456-
if VSTUDIO_DDK
457-
ALL_LOCAL += ovsext
458-
ARCH = x64
459-
ovsext: datapath-windows/ovsext.sln $(srcdir)/datapath-windows/include/OvsDpInterface.h
460-
if VSTUDIO_WIN8
461-
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
462-
endif
463-
if VSTUDIO_WIN8_1
464-
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
465-
endif
466-
if VSTUDIO_WIN10
467-
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Build /property:Configuration="Win10$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
468-
endif
469-
470-
471-
CLEAN_LOCAL += ovsext_clean
472-
ovsext_clean: datapath-windows/ovsext.sln
473-
if VSTUDIO_WIN8
474-
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
475-
endif
476-
if VSTUDIO_WIN8_1
477-
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win8.1$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
478-
endif
479-
if VSTUDIO_WIN10
480-
MSBuild.exe //nologo //maxcpucount datapath-windows/ovsext.sln /target:Clean /property:Configuration="Win10$(VSTUDIO_CONFIG)" /property:Version="$(PACKAGE_VERSION)" //p:Platform=$(ARCH)
481-
endif
482-
endif
483-
.PHONY: ovsext
484-
485441
clang-analyze: clean
486442
@which clang scan-build >/dev/null 2>&1 || \
487443
(echo "Unable to find clang/scan-build, Install clang,clang-analyzer packages"; exit 1)

‎NEWS‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ Post v26.03.0
1818
static routes as higher-priority than connected routes, which in turn led
1919
to changes in administrative distance for specific route types. Please see
2020
the "Route Administrative Distance" section of the ovn-northd manpage.
21+
- Windows support was broken since the split from OVS repository.
22+
Remaining bits of the build system and the documentation are now removed.
2123

2224
OVN v26.03.0 - xxx xx xxxx
2325
--------------------------

‎README.rst‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,6 @@ As mentioned, OVN is licensed under the open source Apache 2 license. Some
9191
files may be marked specifically with a different license, in which case that
9292
license applies to the file in question.
9393

94-
File build-aux/cccl is licensed under the GNU General Public License, version 2.
95-
9694
Contact
9795
-------
9896

‎build-aux/automake.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
EXTRA_DIST += \
22
build-aux/calculate-pipeline-cksum \
33
build-aux/calculate-schema-cksum \
4-
build-aux/cccl \
54
build-aux/cksum-pipeline-check \
65
build-aux/cksum-schema-check \
76
build-aux/dist-docs \

0 commit comments

Comments
 (0)