various formatting, including mixes of tab and spaces detected in py3

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index 12570b2..0354813 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,6 @@ TESTLIB     = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
-# stupid distutils, it's broken in so many ways
 SUBBUILDDIR = $(shell python -c 'import distutils.util, sys; \
              print "lib.%s-%s" % (distutils.util.get_platform(), \
              sys.version[0:3])')
@@ -17,37 +16,40 @@ else
 BUILDDIR := $(BUILDDIR)/lib
 endif
 
-#PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
-PYPATH = "../nepi2/src:../nepi2/test/util:../netns/src"
+PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
           coverage)
 
-all:
-       ./setup.py build
+all: clean
+       PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
 
 install: all
-       ./setup.py install
+       PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
 
 test: all
        retval=0; \
-              for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
+              for i in `find "$(TESTDIR)" -iname '*.py' -perm -u+x -type f`; do \
               echo $$i; \
-              TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $$i || retval=$$?; \
+              PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
               done; exit $$retval
 
+test-one: all
+       echo $(file) $(case)
+       PYTHONPATH="$(PYPATH)" $(file) $(case)
+
 coverage: all
        rm -f .coverage
        for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
                set -e; \
-               TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i; \
+               PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i -v; \
                done
        $(COVERAGE) -c
        $(COVERAGE) -r -m `find "$(BUILDDIR)" -name \\*.py -type f`
        rm -f .coverage
 
 clean:
-       ./setup.py clean
        rm -f `find -name \*.pyc` .coverage *.pcap
+       rm -rf "$(BUILDDIR)"
 
 distclean: clean
        rm -rf "$(DISTDIR)"
@@ -62,3 +64,56 @@ dist: MANIFEST
        ./setup.py sdist
 
 .PHONY: all clean distclean dist test coverage install MANIFEST
+
+########## for uploading onto pypi
+# this assumes you have an entry 'pypi' in your .pypirc
+# see pypi documentation on how to create .pypirc
+LOCAL_ID=$(shell id)
+ifneq "$(LOCAL_ID)" "$(filter $(LOCAL_ID),parmen)"
+BUILD_ID=thierry
+else
+BUILD_ID=mario
+endif
+
+PYPI_TARGET=pypi
+PYPI_TARBALL_HOST=$(BUILD_ID)@build.onelab.eu
+PYPI_TARBALL_TOPDIR=/build/nepi
+
+VERSION=$(shell cat VERSION)
+VERSIONTAG=nepi-$(VERSION)-pypi
+VERSIONTAR=nepi-$(VERSION).tar.gz
+ALREADY_SET=$(shell git tag | grep '^$(VERSIONTAG)$$')
+
+# run this only once the sources are in on the right tag
+pypi:
+       @echo "Have you committed all changes (type Ctrl-c if not) ? " ; read _
+       @if [ -n "$(ALREADY_SET)" ] ; then echo "tag $(VERSIONTAG) already set"; false; fi
+       @echo "You are about to release $(VERSION) - OK (Ctrl-c if not) ? " ; read _
+       git tag $(VERSIONTAG)
+       #./setup.py sdist upload -r pypi
+       ./setup.py sdist
+       twine upload dist/* -r pypi
+       @if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAR) ] ;\
+         then echo "$(VERSIONTAR) already present on $(PYPI_TARBALL_HOST) - ignored" ;\
+         else rsync -av dist/$(VERSIONTAR) $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
+         fi
+
+
+# it can be convenient to define a test entry, say testpypi
+# that points at the testpypi public site
+# in this case we do not want to upload anything on the build box though
+
+testpypi: 
+       #./setup.py sdist upload -r testpypi
+       ./setup.py sdist
+       twine upload dist/* -r testpypi
+
+#################### convenience, for debugging only
+# make +foo : prints the value of $(foo)
+# make ++foo : idem but verbose, i.e. foo=$(foo)
+++%: varname=$(subst +,,$@)
+++%:
+       @echo "$(varname)=$($(varname))"
++%: varname=$(subst +,,$@)
++%:
+       @echo "$($(varname))"