X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=035481316be81a6b5ea0fe5993adfbf593bd3d3a;hb=3a425e860e6bb734d1adee38ffe3aa9947f26a78;hp=118c778b3d049ca42225b173dc19f7a4f9e7919a;hpb=e96e370df463518cf451a8f8df9f9a93d2b94730;p=nepi.git

diff --git a/Makefile b/Makefile
index 118c778b..03548131 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 SRCDIR      = $(CURDIR)/src
 TESTDIR     = $(CURDIR)/test
-TESTLIB  = $(TESTDIR)/lib
+TESTLIB     = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build
 DISTDIR     = $(CURDIR)/dist
 
@@ -66,16 +66,54 @@ dist: MANIFEST
 .PHONY: all clean distclean dist test coverage install MANIFEST
 
 ########## for uploading onto pypi
-# use pypitest instead for tests (both entries need to be defined in your .pypirc)
+# 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
 
-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_TARGET)
-	ssh $(PYPI_TARBALL_HOST) mkdir -p $(PYPI_TARBALL_TOPDIR)/$(VERSIONTAG)
-	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
 
+
+# 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
+
+#################### 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))"