Launchpad itself

Merge lp:~bjornt/launchpad/lazrjs-buildout into lp:launchpad

  1. lazrjs-buildout
  2. Merge into devel
Proposed by Björn Tillenius
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~bjornt/launchpad/lazrjs-buildout
Merge into: lp:launchpad
Diff against target: 121 lines
7 files modified
.bzrignore (+1/-0)
Makefile (+12/-6)
buildout-templates/bin/lint.sh.in (+1/-1)
buildout.cfg (+2/-0)
setup.py (+1/-0)
utilities/sourcedeps.conf (+0/-1)
versions.cfg (+1/-0)
To merge this branch: bzr merge lp:~bjornt/launchpad/lazrjs-buildout
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+13004@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

Remove lazr-js from sourcecode/, and make use of it through buildout.

Don't review this branch, unless you intend to review
lp:~bjornt/lazr-js/buildoutification first.

I haven't added the lazr-js 0.9 sdist to download-cache, so you have to
generate it manually for testing.

--
Björn Tillenius | https://launchpad.net/~bjornt

Revision history for this message
Gavin Panella (allenap) :
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 2009-10-08 20:42:07 +0000
3+++ .bzrignore 2009-10-26 14:29:12 +0000
4@@ -51,3 +51,4 @@
5 ./production-configs
6 bzr.dev
7 _trial_temp
8+lazr-js
9
10=== modified file 'Makefile'
11--- Makefile 2009-10-18 01:09:02 +0000
12+++ Makefile 2009-10-26 14:29:12 +0000
13@@ -27,7 +27,6 @@
14 API_INDEX = lib/canonical/launchpad/apidoc/index.html
15
16 EXTRA_JS_FILES=lib/canonical/launchpad/icing/MochiKit.js \
17- $(shell $(HERE)/utilities/yui-deps.py) \
18 lib/canonical/launchpad/icing/lazr/build/lazr.js
19
20 # DO NOT ALTER : this should just build by default
21@@ -122,7 +121,16 @@
22
23 inplace: build
24
25-build: $(BZR_VERSION_INFO) compile apidoc
26+build: $(BZR_VERSION_INFO) compile apidoc jsbuild
27+
28+jsbuild_lazr:
29+ ${SHHH} bin/jsbuild -b lazr-js/build
30+
31+jsbuild: jsbuild_lazr
32+ ${SHHH} bin/jsbuild \
33+ -n launchpad -s lib/canonical/launchpad/javascript \
34+ -b lib/canonical/launchpad/icing/build $(EXTRA_JS_FILES) \
35+ $(shell $(HERE)/utilities/yui-deps.py)
36
37 eggs:
38 # Usually this is linked via link-external-sourcecode, but in
39@@ -150,9 +158,6 @@
40 ${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \
41 PYTHON_VERSION=${PYTHON_VERSION} LPCONFIG=${LPCONFIG}
42 ${SHHH} LPCONFIG=${LPCONFIG} ${PY} -t buildmailman.py
43- ${SHHH} $(PY) sourcecode/lazr-js/tools/build.py \
44- -n launchpad -s lib/canonical/launchpad/javascript \
45- -b lib/canonical/launchpad/icing/build $(EXTRA_JS_FILES)
46
47 test_build: build
48 bin/test $(TESTFLAGS) $(TESTOPTS)
49@@ -347,4 +352,5 @@
50 start run ftest_build ftest_inplace test_build test_inplace pagetests\
51 check check_loggerhead_on_merge check_merge check_sourcecode_merge \
52 schema default launchpad.pot check_merge_ui pull scan sync_branches\
53- reload-apache hosted_branches check_db_merge check_mailman check_config
54+ reload-apache hosted_branches check_db_merge check_mailman check_config\
55+ jsbuild
56
57=== modified file 'buildout-templates/bin/lint.sh.in'
58--- buildout-templates/bin/lint.sh.in 2009-07-17 00:26:05 +0000
59+++ buildout-templates/bin/lint.sh.in 2009-10-26 14:29:12 +0000
60@@ -245,7 +245,7 @@
61
62 jsfiles=`echo "$files" | grep -E 'js$'`
63 if [ ! -z "$jsfiles" ]; then
64- jslint_notices=`$utilitiesdir/../sourcecode/lazr-js/tools/jslint.py 2>&1`
65+ jslint_notices=`$utilitiesdir/../bin/jslint 2>&1`
66 if [ ! -z "$jslint_notices" ]; then
67 echo ""
68 echo ""
69
70=== modified file 'buildout.cfg'
71--- buildout.cfg 2009-10-18 01:09:02 +0000
72+++ buildout.cfg 2009-10-26 14:29:12 +0000
73@@ -67,6 +67,8 @@
74 googletestservice=canonical.launchpad.testing.googletestservice:main
75 windmill=windmill.bin.windmill_bin:main
76 lp-windmill=lp.scripts.utilities.lpwindmill:main
77+ jsbuild=lazr.js.build:main
78+ jslint=lazr.js.jslint:main
79
80 [iharness]
81 recipe = zc.recipe.egg
82
83=== modified symlink 'lib/canonical/launchpad/icing/lazr'
84=== target changed u'../../../../sourcecode/lazr-js/lib/lazr' => u'../../../../lazr-js'
85=== modified symlink 'lib/canonical/launchpad/icing/yui'
86=== target changed u'../../../../sourcecode/lazr-js/lib/yui' => u'../../../../lazr-js/build/yui'
87=== modified file 'setup.py'
88--- setup.py 2009-10-08 10:56:00 +0000
89+++ setup.py 2009-10-26 14:29:12 +0000
90@@ -38,6 +38,7 @@
91 'lazr.restful',
92 'lazr.smtptest',
93 'lazr.uri',
94+ 'lazr-js',
95 'mechanize',
96 'mocker',
97 'oauth',
98
99=== modified file 'utilities/sourcedeps.conf'
100--- utilities/sourcedeps.conf 2009-08-17 19:16:23 +0000
101+++ utilities/sourcedeps.conf 2009-10-26 14:29:12 +0000
102@@ -3,7 +3,6 @@
103 bzr-svn=lp:~launchpad-pqm/bzr-svn/devel/
104 dulwich=lp:~launchpad-pqm/dulwich/devel/
105 launchpad-loggerhead=lp:~launchpad-pqm/launchpad-loggerhead/devel/
106-lazr-js=lp:~launchpad-pqm/lazr-js/toolchain/
107 loggerhead=lp:~launchpad-pqm/loggerhead/devel/
108 mailman=lp:~launchpad-pqm/mailman/2.1/
109 pygpgme=lp:~launchpad-pqm/pygpgme/devel/
110
111=== modified file 'versions.cfg'
112--- versions.cfg 2009-10-22 19:23:55 +0000
113+++ versions.cfg 2009-10-26 14:29:12 +0000
114@@ -33,6 +33,7 @@
115 lazr.restfulclient = 0.9.9
116 lazr.smtptest = 1.1
117 lazr.uri = 1.0.2
118+lazr-js = 0.9
119 martian = 0.11
120 mechanize = 0.1.7b
121 mocker = 0.10.1