X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=aa5cb1d22298de60dedcdfe6e8181fa67ca04d81;hb=342187d6e7ce34d4fdf403952637659b93aa4bee;hp=12570b28b673f5d6eb8e1fdb8aaeb86753b39fa0;hpb=17c85d161444f91bc5a34eea4c4a150fe3927f4b;p=nepi.git

diff --git a/Makefile b/Makefile
index 12570b28..aa5cb1d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,53 +1,53 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
 TESTLIB     = $(TESTDIR)/lib
-BUILDDIR    = $(CURDIR)/build
+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):$(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
 
+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 \
 		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 -f $$(find . -name '*.pyc') .coverage *.pcap
+	rm -rf "$(BUILDDIR)"
 
 distclean: clean
 	rm -rf "$(DISTDIR)"
@@ -62,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