From ee52cb33f95502e4b2df861cc5201f3a537137ba Mon Sep 17 00:00:00 2001
From: Martin Levy <martin@cloudflare.com>
Date: Sat, 26 Aug 2017 23:47:04 -0700
Subject: [PATCH] tags added and some general cleanup

---
 Makefile | 47 +++++++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index a54ffff..953591d 100644
--- a/Makefile
+++ b/Makefile
@@ -12,38 +12,53 @@ README.rst: README.md
 	$(PANDOC) --from=markdown --to=rst < README.md > README.rst 
 
 CHANGELOG.md: FORCE
-	cp /dev/null CHANGELOG.md
-	echo '# Change Log' >> CHANGELOG.md
-	echo '' >> CHANGELOG.md
-	git log --date=iso-local --pretty=format:' - %ci [%h](https://github.com/cloudflare/python-cloudflare/commit/%H) %s' >> CHANGELOG.md
-	echo '' >> CHANGELOG.md
-
+	@ tmp=/tmp/_$$$$.md ; \
+	( \
+		cp /dev/null $$tmp ; \
+		echo '# Change Log' ; \
+		echo '' ; \
+		git log --date=iso-local --pretty=format:' - %ci [%h](https://github.com/cloudflare/python-cloudflare/commit/%H) %s' ; \
+		echo '' ; \
+	)  >> $$tmp ; \
+	diff $$tmp CHANGELOG.md || ( cp $$tmp CHANGELOG.md ; echo "CHANGELOG.md - updated" ) ; \
+	rm $$tmp
 FORCE:
 
 build: setup.py
-	$(PYTHON) setup.py build
+	$(PYTHON) setup.py -q build
 
 install: build
-	sudo $(PYTHON) setup.py install
+	sudo $(PYTHON) setup.py -q install
 	sudo rm -rf ${NAME}.egg-info
 
 test: all
-	# to be done
+#	 to be done
 
 sdist: all
 	make clean
 	make test
-	$(PYTHON) setup.py sdist
-	rm -rf ${NAME}.egg-info
+	$(PYTHON) setup.py -q sdist
+	@rm -rf ${NAME}.egg-info
 
 bdist: all
 	make clean
 	make test
-	$(PYTHON) setup.py bdist
-	rm -rf ${NAME}.egg-info
+	$(PYTHON) setup.py -q bdist
+	@rm -rf ${NAME}.egg-info
+
+upload: clean all tag upload-pypi upload-github
+
+upload-pypi:
+	$(PYTHON) setup.py -q sdist upload --sign --identity="$(EMAIL)"
+
+upload-github:
+	git push origin --tags
+
+showtag: sdist
+	@ v=`ls -r dist | head -1 | sed -e 's/cloudflare-\([0-9.]*\)\.tar.*/\1/'` ; echo "\tDIST VERSION =" $$v ; (git tag | fgrep -q "$$v") && echo "\tGIT TAG EXISTS"
 
-upload: clean all
-	$(PYTHON) setup.py sdist upload --sign --identity="$(EMAIL)"
+tag: sdist
+	@ v=`ls -r dist | head -1 | sed -e 's/cloudflare-\([0-9.]*\)\.tar.*/\1/'` ; echo "\tDIST VERSION =" $$v ; (git tag | fgrep -q "$$v") || git tag "$$v"
 
 lint:
 	$(PYLINT) CloudFlare cli4
@@ -52,6 +67,6 @@ clean:
 	rm -rf build
 	rm -rf dist
 	mkdir build dist
-	$(PYTHON) setup.py clean
+	$(PYTHON) setup.py -q clean
 	rm -rf ${NAME}.egg-info