testsuite: Add timeout to add_of_br() command.

[cascardo/ovs.git] / python / automake.mk

diff --git a/python/automake.mk b/python/automake.mk
index b656f08..dc62422 100644 (file)
--- a/python/automake.mk
+++ b/python/automake.mk
@@ -35,23 +35,51 @@ ovs_pyfiles = \
        python/ovs/version.py \
        python/ovs/vlog.py
 
+# These python files are used at build time but not runtime,
+# so they are not installed.
+EXTRA_DIST += \
+       python/build/__init__.py \
+       python/build/nroff.py
+
+# PyPI support.
+EXTRA_DIST += \
+       python/README.rst \
+       python/setup.py
+
 PYFILES = $(ovs_pyfiles) python/ovs/dirs.py $(ovstest_pyfiles)
 EXTRA_DIST += $(PYFILES)
 PYCOV_CLEAN_FILES += $(PYFILES:.py=.py,cover)
 
+FLAKE8_PYFILES += \
+       $(filter-out python/ovs/dirs.py,$(PYFILES)) \
+       python/setup.py \
+       python/build/__init__.py \
+       python/build/nroff.py \
+       python/ovs/dirs.py.template
+
 if HAVE_PYTHON
 nobase_pkgdata_DATA = $(ovs_pyfiles) $(ovstest_pyfiles)
 ovs-install-data-local:
        $(MKDIR_P) python/ovs
-       (echo "import os" && \
-        echo 'PKGDATADIR = os.environ.get("OVS_PKGDATADIR", """$(pkgdatadir)""")' && \
-        echo 'RUNDIR = os.environ.get("OVS_RUNDIR", """@RUNDIR@""")' && \
-        echo 'LOGDIR = os.environ.get("OVS_LOGDIR", """@LOGDIR@""")' && \
-        echo 'BINDIR = os.environ.get("OVS_BINDIR", """$(bindir)""")') \
+       sed \
+               -e '/^##/d' \
+                -e 's,[@]pkgdatadir[@],$(pkgdatadir),g' \
+                -e 's,[@]RUNDIR[@],$(RUNDIR),g' \
+                -e 's,[@]LOGDIR[@],$(LOGDIR),g' \
+                -e 's,[@]bindir[@],$(bindir),g' \
+                -e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+                -e 's,[@]DBDIR[@],$(DBDIR),g' \
+               < $(srcdir)/python/ovs/dirs.py.template \
                > python/ovs/dirs.py.tmp
        $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/python/ovs
        $(INSTALL_DATA) python/ovs/dirs.py.tmp $(DESTDIR)$(pkgdatadir)/python/ovs/dirs.py
        rm python/ovs/dirs.py.tmp
+
+python-sdist: $(srcdir)/python/ovs/version.py $(ovs_pyfiles) python/ovs/dirs.py
+       (cd python/ && $(PYTHON) setup.py sdist)
+
+pypi-upload: $(srcdir)/python/ovs/version.py $(ovs_pyfiles) python/ovs/dirs.py
+       (cd python/ && $(PYTHON) setup.py sdist upload)
 else
 ovs-install-data-local:
        @:
@@ -64,6 +92,20 @@ ovs-uninstall-local:
 
 ALL_LOCAL += $(srcdir)/python/ovs/version.py
 $(srcdir)/python/ovs/version.py: config.status
-       $(ro_shell) > $(@F).tmp
-       echo 'VERSION = "$(VERSION)"' >> $(@F).tmp
+       $(AM_V_GEN)$(ro_shell) > $(@F).tmp && \
+       echo 'VERSION = "$(VERSION)"' >> $(@F).tmp && \
        if cmp -s $(@F).tmp $@; then touch $@; rm $(@F).tmp; else mv $(@F).tmp $@; fi
+
+ALL_LOCAL += $(srcdir)/python/ovs/dirs.py
+$(srcdir)/python/ovs/dirs.py: python/ovs/dirs.py.template
+       $(AM_V_GEN)sed \
+               -e '/^##/d' \
+                -e 's,[@]pkgdatadir[@],/usr/local/share/openvswitch,g' \
+                -e 's,[@]RUNDIR[@],/var/run,g' \
+                -e 's,[@]LOGDIR[@],/usr/local/var/log,g' \
+                -e 's,[@]bindir[@],/usr/local/bin,g' \
+                -e 's,[@]sysconfdir[@],/usr/local/etc,g' \
+                -e 's,[@]DBDIR[@],/usr/local/etc/openvswitch,g' \
+               < $? > $@.tmp && \
+       mv $@.tmp $@
+EXTRA_DIST += python/ovs/dirs.py.template