X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=aa5cb1d22298de60dedcdfe6e8181fa67ca04d81;hb=342187d6e7ce34d4fdf403952637659b93aa4bee;hp=100dcdb6512de3820eeacd76cc3342f99c3f4288;hpb=7137010b13dcede2f6efcff0be902e1676b40144;p=nepi.git

diff --git a/Makefile b/Makefile
index 100dcdb6..aa5cb1d2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,9 @@
 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)
@@ -33,9 +21,19 @@ 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
@@ -48,7 +46,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
@@ -69,17 +67,26 @@ dist: MANIFEST
 # this assumes you have an entry 'pypi' in your .pypirc
 # see pypi documentation on how to create .pypirc
 PYPI_TARGET=pypi
-PYPI_TARBALL_HOST=root@build.onelab.eu
+PYPI_TARBALL_HOST=mario@build.onelab.eu
 PYPI_TARBALL_TOPDIR=/build/nepi
 
-VERSIONTAG=$(shell cat VERSION)
+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: 
-	setup.py sdist upload -r pypi
-	@if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/nepi-$(VERSIONTAG).tar.gz ] ;\
-	  then echo "nepi-$(VERSIONTAG).tar.gz already present on $(PYPI_TARBALL_HOST) - ignored" ;\
-	  else rsync -av dist/nepi-$(VERSIONTAG).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\
+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
 
 
@@ -88,4 +95,6 @@ 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