X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=f1a97d5aa441aa40a9c89b4c5971903e894cc4a2;hb=refs%2Fremotes%2Forigin%2FHEAD;hp=a89ea3a13aa0c9aad5569bf2cf87d9ff8a563a5f;hpb=9b6a92c1bb6c85d1b6d194624e49ea01ce3893e7;p=nepi.git diff --git a/Makefile b/Makefile index a89ea3a1..f1a97d5a 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ PYPI_TARBALL_TOPDIR=/build/nepi 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 @@ -82,10 +83,10 @@ 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 - @if [ ssh $(PYPI_TARBALL_HOST) ls $(PYPI_TARBALL_TOPDIR)/nepi-$(VERSION).tar.gz ] ;\ - then echo "nepi-$(VERSION).tar.gz already present on $(PYPI_TARBALL_HOST) - ignored" ;\ - else rsync -av dist/nepi-$(VERSION).tar.gz $(PYPI_TARBALL_HOST):$(PYPI_TARBALL_TOPDIR)/ ;\ + ./setup.py sdist upload -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 @@ -94,4 +95,4 @@ 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