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

Proposed by Duncan McGreggor
Status: Merged
Approved by: Duncan McGreggor
Approved revision: 123
Merged at revision: 114
Proposed branch: lp:~oubiwann/txaws/919862-add-makefile
Merge into: lp:txaws
Diff against target: 138 lines (+127/-0)
2 files modified
.bzrignore (+1/-0)
Makefile (+126/-0)
To merge this branch: bzr merge lp:~oubiwann/txaws/919862-add-makefile
Reviewer Review Type Date Requested Status
Duncan McGreggor Approve
Review via email: mp+90010@code.launchpad.net

Description of the change

Note that this has already been reviewed and approved; see: https://code.launchpad.net/~oubiwann/txaws/919862-add-makefile-old

This branch was created to fix some bad author info in a series of commits. I did the following:
 * renamed the original branch to 919862-add-makefile-old
 * used the git bzr tool to import the bzr branch to git
 * used git to change the author
 * pushed the newly changed (correct author email addresses) branch to 919862-add-makefile

To post a comment you must log in.
Revision history for this message
Duncan McGreggor (oubiwann) :
review: Approve
Revision history for this message
Duncan McGreggor (oubiwann) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-01-18 15:00:32 +0000
3+++ .bzrignore 2012-01-24 22:36:35 +0000
4@@ -1,2 +1,3 @@
5 _trial_temp*
6 .testrepository
7+.venv-*
8
9=== added file 'Makefile'
10--- Makefile 1970-01-01 00:00:00 +0000
11+++ Makefile 2012-01-24 22:36:35 +0000
12@@ -0,0 +1,126 @@
13+PLATFORM = $(shell uname)
14+ifeq ($(PLATFORM), Darwin)
15+PYBIN = Python
16+else
17+PYBIN = python
18+endif
19+
20+
21+check-pybin:
22+ echo "$(PYBIN)"
23+
24+version:
25+ @python -c "from txaws import version;print version.txaws;"
26+
27+
28+clean:
29+ find ./ -name "*~" -exec rm {} \;
30+ find ./ -name "*.pyc" -exec rm {} \;
31+ find ./ -name "*.pyo" -exec rm {} \;
32+ find . -name "*.sw[op]" -exec rm {} \;
33+ rm -rf _trial_temp/ build/ dist/ MANIFEST *.egg-info
34+
35+
36+build:
37+ @python setup.py build
38+ @python setup.py sdist
39+
40+
41+virtual-dir-setup: VERSION ?= 2.7
42+virtual-dir-setup:
43+ -@test -d .venv-$(VERSION) || virtualenv -p $(PYBIN)$(VERSION) .venv-$(VERSION)
44+ -@test -e .venv-$(VERSION)/bin/twistd || . .venv-$(VERSION)/bin/activate && pip install twisted
45+ -@test -e .venv-$(VERSION)/bin/pep8 || . .venv-$(VERSION)/bin/activate && pip install pep8
46+ -@test -e .venv-$(VERSION)/bin/pyflakes || . .venv-$(VERSION)/bin/activate && pip install pyflakes
47+ -. .venv-$(VERSION)/bin/activate && pip install lxml
48+ -. .venv-$(VERSION)/bin/activate && pip install PyOpenSSL
49+ -. .venv-$(VERSION)/bin/activate && pip install venusian
50+ -. .venv-$(VERSION)/bin/activate && pip install 'python-dateutil<2.0'
51+
52+
53+virtual-builds:
54+ -@test -e "`which $(PYBIN)2.5`" && VERSION=2.5 make virtual-dir-setup || echo "Couldn't find $(PYBIN)2.5"
55+ -@test -e "`which $(PYBIN)2.6`" && VERSION=2.6 make virtual-dir-setup || echo "Couldn't find $(PYBIN)2.6"
56+ -@test -e "`which $(PYBIN)2.7`" && VERSION=2.7 make virtual-dir-setup || echo "Couldn't find $(PYBIN)2.7"
57+
58+
59+virtual-trial: VERSION ?= 2.7
60+virtual-trial:
61+ -. .venv-$(VERSION)/bin/activate && trial ./txaws
62+
63+
64+virtual-pep8: VERSION ?= 2.7
65+virtual-pep8:
66+ -. .venv-$(VERSION)/bin/activate && pep8 ./txaws
67+
68+
69+virtual-pyflakes: VERSION ?= 2.7
70+virtual-pyflakes:
71+ -. .venv-$(VERSION)/bin/activate && pyflakes ./txaws
72+
73+
74+virtual-check: VERSION ?= 2.7
75+virtual-check:
76+ -VERSION=$(VERSION) make virtual-trial
77+ -VERSION=$(VERSION) make virtual-pep8
78+ -VERSION=$(VERSION) make virtual-pyflakes
79+
80+
81+virtual-setup-build: VERSION ?= 2.7
82+virtual-setup-build:
83+ -@. .venv-$(VERSION)/bin/activate && python setup.py build
84+ -@. .venv-$(VERSION)/bin/activate && python setup.py sdist
85+
86+
87+virtual-setup-builds: VERSION ?= 2.7
88+virtual-setup-builds: virtual-builds
89+ -@test -e "`which python2.5`" && VERSION=2.5 make virtual-setup-build
90+ -@test -e "`which python2.6`" && VERSION=2.6 make virtual-setup-build
91+ -@test -e "`which python2.7`" && VERSION=2.7 make virtual-setup-build
92+
93+
94+virtual-checks: virtual-setup-builds
95+ -@test -e "`which python2.5`" && VERSION=2.5 make virtual-check
96+ -@test -e "`which python2.6`" && VERSION=2.6 make virtual-check
97+ -@test -e "`which python2.7`" && VERSION=2.7 make virtual-check
98+
99+
100+virtual-uninstall: VERSION ?= 2.7
101+virtual-uninstall: PACKAGE ?= ""
102+virtual-uninstall:
103+ -. .venv-$(VERSION)/bin/activate && pip uninstall $(PACKAGE)
104+
105+
106+virtual-uninstalls: PACKAGE ?= ""
107+virtual-uninstalls:
108+ -@test -e "`which python2.5`" && VERSION=2.5 PACKAGE=$(PACKAGE) make virtual-uninstall
109+ -@test -e "`which python2.6`" && VERSION=2.6 PACKAGE=$(PACKAGE) make virtual-uninstall
110+ -@test -e "`which python2.7`" && VERSION=2.7 PACKAGE=$(PACKAGE) make virtual-uninstall
111+
112+
113+virtual-dir-remove: VERSION ?= 2.7
114+virtual-dir-remove:
115+ rm -rfv .venv-$(VERSION)
116+
117+
118+clean-virtual-builds: clean
119+ @VERSION=2.5 make virtual-dir-remove
120+ @VERSION=2.6 make virtual-dir-remove
121+ @VERSION=2.7 make virtual-dir-remove
122+
123+
124+virtual-build-clean: clean-virtual-builds build virtual-builds
125+.PHONY: virtual-build-clean
126+
127+
128+check: MOD ?= txaws
129+check: build
130+ trial ./txaws
131+
132+
133+register:
134+ python setup.py register
135+
136+
137+upload: check build
138+ python setup.py sdist upload --show-response

Subscribers

People subscribed via source and target branches

to all changes: