X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=ca37ab65d1f80e01581d146816c5bafd034bd266;hb=4db0fb4c8e067200712eb377e42013c6fc2c628b;hp=ddfac30aac9197d183b707e668cb29d0464fa3f0;hpb=75c658abdcb20681d688706bb378a3082443e2ef;p=sfa.git diff --git a/Makefile b/Makefile index ddfac30a..ca37ab65 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,12 @@ rpmversion:=$(shell rpm -q --specfile sfa.spec --queryformat="%{version}\n" | he # somehow %{taglevel} is empty, turns out %{release} has what we want rpmtaglevel:=$(shell rpm -q --specfile sfa.spec --queryformat="%{release}\n" 2> /dev/null | head -1) VERSIONTAG=$(rpmversion)-$(rpmtaglevel) -SCMURL=should-be-redefined-by-specfile +# this used to be 'should-be-redefined-by-specfile' and it indeed should be +SCMURL=git://git.onelab.eu/sfa.git +TARBALL_HOST=root@build.onelab.eu +TARBALL_TOPDIR=/build/sfa +# I have an alternate pypitest entry defined in my .pypirc +PYPI_TARGET=pypi python: version @@ -136,6 +141,41 @@ signatures: (cd sfa/methods; grep 'def.*call' *.py > SIGNATURES) .PHONY: signatures +########## for uploading onto pypi +# a quick attempt on pypitest did not quite work as expected +# I was hoping to register the project using "setup.py register" +# but somehow most of my meta data did not make it up there +# and I could not find out why +# so I went for the manual method instead +# there also was a web dialog prompting for a zip file that would +# be used to initialize the project's home dir but this too +# did not seem to work the way I was trying to use it, so ... + +# this target is still helpful to produce the readme in html from README.md +index.zip index.html: README.md + python readme.py + +# I need to run this on my mac as my pypi +# run git pull first as this often comes afet a module-tag +# we need to re-run make so the version is right +git_pypi: git pypi + +git: + git pull + $(MAKE) version + +# run this only once the sources are in on the right tag +pypi: index.html + setup.py sdist upload -r $(PYPI_TARGET) + ssh $(TARBALL_HOST) mkdir -p $(TARBALL_TOPDIR)/$(VERSIONTAG) + rsync -av dist/sfa-$(VERSIONTAG).tar.gz $(TARBALL_HOST):$(TARBALL_TOPDIR)/$(VERSIONTAG) + +# cleanup +clean: readme-clean + +readme-clean: + rm -f index.html index.zip + ########## sync # 2 forms are supported # (*) if your plc root context has direct ssh access: