X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=ed7f32d3b305ccd1e70391d8b27afb2a95989990;hb=e3ce3d767b284574087f630fb2a98d861811ced5;hp=f1a97d5aa441aa40a9c89b4c5971903e894cc4a2;hpb=85677e02eff12f0fc42c3e27abc8638a3418f18a;p=nepi.git

diff --git a/Makefile b/Makefile
index f1a97d5a..ed7f32d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,43 @@
+PYTHON	    = python
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB  = $(TESTDIR)/lib
-BUILDDIR    = $(CURDIR)/build
+TESTLIB     = $(TESTDIR)/lib
+BUILDDIR    = $(CURDIR)/build/lib
 DISTDIR     = $(CURDIR)/dist
 
-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)
 COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
 all: clean
-	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" $(PYTHON) ./setup.py build
 
 install: all
-	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" $(PYTHON) ./setup.py install
 
 test: all
 	retval=0; \
 	       for i in `find "$(TESTDIR)" -iname '*.py' -perm -u+x -type f`; do \
 	       echo $$i; \
-	       PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
+	       PYTHONPATH="$(PYPATH)" $(PYTHON) $$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)
+	PYTHONPATH="$(PYPATH)" $(PYTHON) $(file) $(case)
+endif
+
+
+all-tests: test-app test-node
+
+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
@@ -48,7 +50,7 @@ coverage: all
 	rm -f .coverage
 
 clean:
-	rm -f `find -name \*.pyc` .coverage *.pcap
+	rm -f $$(find . -name '*.pyc') .coverage *.pcap
 	rm -rf "$(BUILDDIR)"
 
 distclean: clean
@@ -68,8 +70,15 @@ dist: 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=root@build.onelab.eu
+PYPI_TARBALL_HOST=$(BUILD_ID)@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
 
 VERSION=$(shell cat VERSION)
@@ -83,7 +92,9 @@ pypi:
 	@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 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)/ ;\
@@ -95,4 +106,16 @@ pypi:
 # 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 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))"