X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=4629ec7018fc3730a31d4bc391bbb924710a6b71;hb=83880a4c0856307dc617da9e75a49cf64bf78cbf;hp=1d47ef4839635587f197b52bdd8bda5aca3400b8;hpb=2ff5b287769a5772968642c7b145062856e06f0f;p=nepi.git

diff --git a/Makefile b/Makefile
index 1d47ef48..4629ec70 100644
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,9 @@ test-one: all
 	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:
@@ -70,8 +73,10 @@ dist: MANIFEST
 LOCAL_ID=$(shell id)
 ifneq "$(LOCAL_ID)" "$(filter $(LOCAL_ID),parmen)"
 BUILD_ID=thierry
+USE_TWINE=
 else
 BUILD_ID=mario
+USE_TWINE=true
 endif
 
 PYPI_TARGET=pypi
@@ -83,15 +88,20 @@ VERSIONTAG=nepi-$(VERSION)-pypi
 VERSIONTAR=nepi-$(VERSION).tar.gz
 ALREADY_SET=$(shell git tag | grep '^$(VERSIONTAG)$$')
 
+##########
+# depending on the value of USE_TWINE, we either do the upload with setup.py itself,
+# or with the help of twine which apparently is the only way that mario could find out on his setup
+define upload_pypi
+$(if $(USE_TWINE),./setup.py sdist && twine upload dist/* -r $(1),./setup.py sdist upload -r $(1))
+endef
+
 # 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
+	$(call upload_pypi,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)/ ;\
@@ -102,10 +112,8 @@ pypi:
 # 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
+testpypi:
+	$(call upload_pypi,testpypi)
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)