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

diff --git a/Makefile b/Makefile
index 100dcdb6..ff684af4 100644
--- a/Makefile
+++ b/Makefile
@@ -72,14 +72,21 @@ PYPI_TARGET=pypi
 PYPI_TARBALL_HOST=root@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: 
+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
-	@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)/ ;\
+	@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