resurrecting a minimal test infra - starting with linux node and application

[nepi.git] / Makefile

diff --git a/Makefile b/Makefile
index 4909c6c..aa5cb1d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,14 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-BUILDDIR    = $(CURDIR)/build
+TESTLIB     = $(TESTDIR)/lib
+BUILDDIR    = $(CURDIR)/build/lib
 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])')
-PYTHON25 := $(shell python -c 'import sys; v = sys.version_info; \
-    print (1 if v[0] <= 2 and v[1] <= 5 else 0)')
-
-ifeq ($(PYTHON25),0)
-BUILDDIR := $(BUILDDIR)/$(SUBBUILDDIR)
-else
-BUILDDIR := $(BUILDDIR)/lib
-endif
-
-PYPATH = $(BUILDDIR):$(PYTHONPATH)
+PYPATH = $(BUILDDIR):$(TESTLIB):$(PYTHONPATH)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
           coverage)
 
-all:
+all: clean
        PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
 
 install: all
@@ -33,6 +21,20 @@ test: all
               PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
               done; exit $$retval
 
+ifeq ($(file),)
+test-one:
+       echo Run $(make) $@ file=test/some/path
+else
+test-one: all
+       echo $(file) $(case)
+       PYTHONPATH="$(PYPATH)" $(file) $(case)
+endif
+
+test-app:
+       $(MAKE) test-one file=test/resources/linux/application.py case=$(case)
+test-node:
+       $(MAKE) test-one file=test/resources/linux/node.py case=$(case)
+
 coverage: all
        rm -f .coverage
        for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
@@ -44,8 +46,8 @@ coverage: all
        rm -f .coverage
 
 clean:
-       ./setup.py clean
-       rm -f `find -name \*.pyc` .coverage *.pcap
+       rm -f $$(find . -name '*.pyc') .coverage *.pcap
+       rm -rf "$(BUILDDIR)"
 
 distclean: clean
        rm -rf "$(DISTDIR)"
@@ -60,3 +62,39 @@ 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
+PYPI_TARGET=pypi
+PYPI_TARBALL_HOST=mario@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