Merge lp:~oubiwann/txaws/919862-add-makefile-old into lp:txaws

[Duncan McGreggor]

[lp:~oubiwann/txaws/919862-add-makefile-old]

116. By Duncan McGreggor on 2012-01-22

Added missing target dependencies.

117. By Duncan McGreggor on 2012-01-22

Added another missing make target dependency.

118. By Duncan McGreggor on 2012-01-23

Added targets for uninstalling packages inside the virtual envs.

119. By Duncan McGreggor on 2012-01-23

With python-dateutil's PyPI downloads updated, we no longer need to download
directly from labix.org.

[Thomas Herve (therve)]

[1]
+build-docs:
+ cd docs/sphinx; make html

+upload-docs: build-docs
+ python setup.py upload_docs --upload-dir=docs/html/

AFAIK there is no such doc, so you should probably remove that.

[2] It's 2012, it'd be nice to default to something more recent than python 2.5 :).

[3]
+ -@test -d .venv-$(VERSION) || virtualenv -p Python$(VERSION) .venv-$(VERSION)

It smells like OS X here. The Python2.X executables (with a capital P) don't exist on Linux.

Thanks!

review: Approve

[Thomas Herve (therve)]

Oh, and you may need to add some paths to bzrignore.

[Duncan McGreggor (oubiwann)]

> [1]
> +build-docs:
> + cd docs/sphinx; make html
>
> +upload-docs: build-docs
> + python setup.py upload_docs --upload-dir=docs/html/
>
> AFAIK there is no such doc, so you should probably remove that.

Hehe, yeah -- there is none. I am planning to add one, but these targets can always be put back in once there's something actually there. And who knows when I'll really get to it...

> [2] It's 2012, it'd be nice to default to something more recent than python
> 2.5 :).

Hehehe. Good call; will change.

> [3]
> + -@test -d .venv-$(VERSION) || virtualenv -p Python$(VERSION)
> .venv-$(VERSION)
>
> It smells like OS X here. The Python2.X executables (with a capital P) don't
> exist on Linux.

Indeed ;-) I'll update the Makefile to do a check on uname and then put some conditionals in there.

> Thanks!

Sure thing :-)

[Duncan McGreggor (oubiwann)]

> Oh, and you may need to add some paths to bzrignore.

Will do!

[lp:~oubiwann/txaws/919862-add-makefile-old]

120. By Duncan McGreggor on 2012-01-24

Removed docs targets, per review comment [1] of therve.

121. By Duncan McGreggor on 2012-01-24

Made 2.7 the default, per therve's recommendation in review comment [2].

122. By Duncan McGreggor on 2012-01-24

Added system checks and conditionals for binary names.

123. By Duncan McGreggor on 2012-01-24

Added ignores for virtual envs.

=== modified file '.bzrignore'
--- .bzrignore	2012-01-18 15:00:32 +0000
+++ .bzrignore	2012-01-24 22:10:28 +0000
@@ -1,2 +1,3 @@
 _trial_temp*
 .testrepository
+.venv-*

=== added file 'Makefile'
--- Makefile	1970-01-01 00:00:00 +0000
+++ Makefile	2012-01-24 22:10:28 +0000
@@ -0,0 +1,126 @@
+PLATFORM = $(shell uname)
+ifeq ($(PLATFORM), Darwin)
+PYBIN = Python
+else
+PYBIN = python
+endif
+
+
+check-pybin:
+	echo "$(PYBIN)"
+
+version:
+	@python -c "from txaws import version;print version.txaws;"
+
+
+clean:
+	find ./ -name "*~" -exec rm {} \;
+	find ./ -name "*.pyc" -exec rm {} \;
+	find ./ -name "*.pyo" -exec rm {} \;
+	find . -name "*.sw[op]" -exec rm {} \;
+	rm -rf _trial_temp/ build/ dist/ MANIFEST *.egg-info
+
+
+build:
+	@python setup.py build
+	@python setup.py sdist
+
+
+virtual-dir-setup: VERSION ?= 2.7
+virtual-dir-setup:
+	-@test -d .venv-$(VERSION) || virtualenv -p $(PYBIN)$(VERSION) .venv-$(VERSION)
+	-@test -e .venv-$(VERSION)/bin/twistd || . .venv-$(VERSION)/bin/activate && pip install twisted
+	-@test -e .venv-$(VERSION)/bin/pep8 || . .venv-$(VERSION)/bin/activate && pip install pep8
+	-@test -e .venv-$(VERSION)/bin/pyflakes || . .venv-$(VERSION)/bin/activate && pip install pyflakes
+	-. .venv-$(VERSION)/bin/activate && pip install lxml
+	-. .venv-$(VERSION)/bin/activate && pip install PyOpenSSL
+	-. .venv-$(VERSION)/bin/activate && pip install venusian
+	-. .venv-$(VERSION)/bin/activate && pip install 'python-dateutil<2.0'
+
+
+virtual-builds:
+	-@test -e "`which $(PYBIN)2.5`" && VERSION=2.5 make virtual-dir-setup || echo "Couldn't find $(PYBIN)2.5"
+	-@test -e "`which $(PYBIN)2.6`" && VERSION=2.6 make virtual-dir-setup || echo "Couldn't find $(PYBIN)2.6"
+	-@test -e "`which $(PYBIN)2.7`" && VERSION=2.7 make virtual-dir-setup || echo "Couldn't find $(PYBIN)2.7"
+
+
+virtual-trial: VERSION ?= 2.7
+virtual-trial:
+	-. .venv-$(VERSION)/bin/activate && trial ./txaws
+
+
+virtual-pep8: VERSION ?= 2.7
+virtual-pep8:
+	-. .venv-$(VERSION)/bin/activate && pep8 ./txaws
+
+
+virtual-pyflakes: VERSION ?= 2.7
+virtual-pyflakes:
+	-. .venv-$(VERSION)/bin/activate && pyflakes ./txaws
+
+
+virtual-check: VERSION ?= 2.7
+virtual-check:
+	-VERSION=$(VERSION) make virtual-trial
+	-VERSION=$(VERSION) make virtual-pep8
+	-VERSION=$(VERSION) make virtual-pyflakes
+
+
+virtual-setup-build: VERSION ?= 2.7
+virtual-setup-build:
+	-@. .venv-$(VERSION)/bin/activate && python setup.py build
+	-@. .venv-$(VERSION)/bin/activate && python setup.py sdist
+
+
+virtual-setup-builds: VERSION ?= 2.7
+virtual-setup-builds: virtual-builds
+	-@test -e "`which python2.5`" && VERSION=2.5 make virtual-setup-build
+	-@test -e "`which python2.6`" && VERSION=2.6 make virtual-setup-build
+	-@test -e "`which python2.7`" && VERSION=2.7 make virtual-setup-build
+
+
+virtual-checks: virtual-setup-builds
+	-@test -e "`which python2.5`" && VERSION=2.5 make virtual-check
+	-@test -e "`which python2.6`" && VERSION=2.6 make virtual-check
+	-@test -e "`which python2.7`" && VERSION=2.7 make virtual-check
+
+
+virtual-uninstall: VERSION ?= 2.7
+virtual-uninstall: PACKAGE ?= ""
+virtual-uninstall:
+	-. .venv-$(VERSION)/bin/activate && pip uninstall $(PACKAGE)
+
+
+virtual-uninstalls: PACKAGE ?= ""
+virtual-uninstalls:
+	-@test -e "`which python2.5`" && VERSION=2.5 PACKAGE=$(PACKAGE) make virtual-uninstall
+	-@test -e "`which python2.6`" && VERSION=2.6 PACKAGE=$(PACKAGE) make virtual-uninstall
+	-@test -e "`which python2.7`" && VERSION=2.7 PACKAGE=$(PACKAGE) make virtual-uninstall
+
+
+virtual-dir-remove: VERSION ?= 2.7
+virtual-dir-remove:
+	rm -rfv .venv-$(VERSION)
+
+
+clean-virtual-builds: clean
+	@VERSION=2.5 make virtual-dir-remove
+	@VERSION=2.6 make virtual-dir-remove
+	@VERSION=2.7 make virtual-dir-remove
+
+
+virtual-build-clean: clean-virtual-builds build virtual-builds
+.PHONY: virtual-build-clean
+
+
+check: MOD ?= txaws
+check: build
+	trial ./txaws
+
+
+register:
+	python setup.py register
+
+
+upload: check build
+	python setup.py sdist upload --show-response