X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=Makefile;h=db13b68a58cfa03675409f252ada6b163b01c46d;hb=ddb5d7e50ffef50b41186199de2a9b6b21850bf8;hp=c9deb28d1ef8f1ff48a190cd60b109c2f53ab736;hpb=b9237caed1e08ba0ae47c872bebaea7fb393999e;p=nepi.git

diff --git a/Makefile b/Makefile
index c9deb28d..db13b68a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
-SRCDIR      = $(CURDIR)/src
+PYTHON	    = python
+SRCDIR      = $(CURDIR)
 TESTDIR     = $(CURDIR)/test
 TESTLIB     = $(TESTDIR)/lib
 BUILDDIR    = $(CURDIR)/build/lib
@@ -9,16 +10,16 @@ COVERAGE = $(or $(shell which coverage), $(shell which python-coverage), \
 	   coverage)
 
 all: clean
-	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py build
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" $(PYTHON) ./setup.py build
 
 install: all
-	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" ./setup.py install
+	PYTHONPATH="$(PYTHONPATH):$(SRCDIR)" $(PYTHON) ./setup.py install
 
 test: all
 	retval=0; \
 	       for i in `find "$(TESTDIR)" -iname '*.py' -perm -u+x -type f`; do \
 	       echo $$i; \
-	       PYTHONPATH="$(PYPATH)" $$i -v || retval=$$?; \
+	       PYTHONPATH="$(PYPATH)" $(PYTHON) $$i -v || retval=$$?; \
 	       done; exit $$retval
 
 ifeq ($(file),)
@@ -27,9 +28,12 @@ test-one:
 else
 test-one: all
 	echo $(file) $(case)
-	PYTHONPATH="$(PYPATH)" $(file) $(case)
+	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:
@@ -69,42 +73,61 @@ 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
 PYPI_TARBALL_HOST=$(BUILD_ID)@build.onelab.eu
 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)$$')
+VERSION = $(shell cat VERSION)
+VERSIONTAG = nepi-$(VERSION)-pypi
+VERSIONTAR = nepi-$(VERSION).tar.gz
+GIT-TAG-ALREADY-SET = $(shell git tag | grep '^$(VERSIONTAG)$$')
+# to check for uncommitted changes
+GIT-CHANGES = $(shell echo $$(git diff HEAD | wc -l))
+GIT-URL = git://git.onelab.eu/nepi.git
+
+version: nepi/util/version.py
+nepi/util/version.py: VERSION nepi/util/version.py.in
+	sed -e "s,@VERSIONTAG@,$(VERSION),g" -e "s,@SCMURL@,$(GIT-URL),g" nepi/util/version.py.in > $@
+
+clean: version-clean
+version-clean:
+	rm -f nepi/util/version.py
+
+##########
+# 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
+pypi: version
+	@if [ $(GIT-CHANGES) != 0 ]; then echo "You have uncommitted changes - cannot publish"; false; fi
+	@if [ -n "$(GIT-TAG-ALREADY-SET)" ] ; then echo "tag $(VERSIONTAG) already set"; false; fi
+	@if ! grep -q ' $(VERSION)' CHANGELOG.md ; then echo no mention of $(VERSION) in CHANGELOG.md; 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)/ ;\
 	  fi
 
 
-# it can be convenient to define a test entry, say testpypi
+# it can be convenient to define a test entry, say testpypi, in your .pypirc
 # 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
+# no upload to build.onelab.eu is done in this case 
+# try it out with
+# pip install -i https://testpypi.python.org/pypi nepi
+# dependencies need to be managed manually though
+testpypi: version
+	$(call upload_pypi,testpypi)
 
 #################### convenience, for debugging only
 # make +foo : prints the value of $(foo)