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
=== modified file '.bzrignore'
--- .bzrignore 2009-10-08 20:42:07 +0000
+++ .bzrignore 2009-10-26 14:29:12 +0000
@@ -51,3 +51,4 @@
51./production-configs51./production-configs
52bzr.dev52bzr.dev
53_trial_temp53_trial_temp
54lazr-js
5455
=== modified file 'Makefile'
--- Makefile 2009-10-18 01:09:02 +0000
+++ Makefile 2009-10-26 14:29:12 +0000
@@ -27,7 +27,6 @@
27API_INDEX = lib/canonical/launchpad/apidoc/index.html27API_INDEX = lib/canonical/launchpad/apidoc/index.html
2828
29EXTRA_JS_FILES=lib/canonical/launchpad/icing/MochiKit.js \29EXTRA_JS_FILES=lib/canonical/launchpad/icing/MochiKit.js \
30 $(shell $(HERE)/utilities/yui-deps.py) \
31 lib/canonical/launchpad/icing/lazr/build/lazr.js30 lib/canonical/launchpad/icing/lazr/build/lazr.js
3231
33# DO NOT ALTER : this should just build by default32# DO NOT ALTER : this should just build by default
@@ -122,7 +121,16 @@
122121
123inplace: build122inplace: build
124123
125build: $(BZR_VERSION_INFO) compile apidoc124build: $(BZR_VERSION_INFO) compile apidoc jsbuild
125
126jsbuild_lazr:
127 ${SHHH} bin/jsbuild -b lazr-js/build
128
129jsbuild: jsbuild_lazr
130 ${SHHH} bin/jsbuild \
131 -n launchpad -s lib/canonical/launchpad/javascript \
132 -b lib/canonical/launchpad/icing/build $(EXTRA_JS_FILES) \
133 $(shell $(HERE)/utilities/yui-deps.py)
126134
127eggs:135eggs:
128 # Usually this is linked via link-external-sourcecode, but in136 # Usually this is linked via link-external-sourcecode, but in
@@ -150,9 +158,6 @@
150 ${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \158 ${SHHH} $(MAKE) -C sourcecode build PYTHON=${PYTHON} \
151 PYTHON_VERSION=${PYTHON_VERSION} LPCONFIG=${LPCONFIG}159 PYTHON_VERSION=${PYTHON_VERSION} LPCONFIG=${LPCONFIG}
152 ${SHHH} LPCONFIG=${LPCONFIG} ${PY} -t buildmailman.py160 ${SHHH} LPCONFIG=${LPCONFIG} ${PY} -t buildmailman.py
153 ${SHHH} $(PY) sourcecode/lazr-js/tools/build.py \
154 -n launchpad -s lib/canonical/launchpad/javascript \
155 -b lib/canonical/launchpad/icing/build $(EXTRA_JS_FILES)
156161
157test_build: build162test_build: build
158 bin/test $(TESTFLAGS) $(TESTOPTS)163 bin/test $(TESTFLAGS) $(TESTOPTS)
@@ -347,4 +352,5 @@
347 start run ftest_build ftest_inplace test_build test_inplace pagetests\352 start run ftest_build ftest_inplace test_build test_inplace pagetests\
348 check check_loggerhead_on_merge check_merge check_sourcecode_merge \353 check check_loggerhead_on_merge check_merge check_sourcecode_merge \
349 schema default launchpad.pot check_merge_ui pull scan sync_branches\354 schema default launchpad.pot check_merge_ui pull scan sync_branches\
350 reload-apache hosted_branches check_db_merge check_mailman check_config355 reload-apache hosted_branches check_db_merge check_mailman check_config\
356 jsbuild
351357
=== modified file 'buildout-templates/bin/lint.sh.in'
--- buildout-templates/bin/lint.sh.in 2009-07-17 00:26:05 +0000
+++ buildout-templates/bin/lint.sh.in 2009-10-26 14:29:12 +0000
@@ -245,7 +245,7 @@
245245
246jsfiles=`echo "$files" | grep -E 'js$'`246jsfiles=`echo "$files" | grep -E 'js$'`
247if [ ! -z "$jsfiles" ]; then247if [ ! -z "$jsfiles" ]; then
248 jslint_notices=`$utilitiesdir/../sourcecode/lazr-js/tools/jslint.py 2>&1`248 jslint_notices=`$utilitiesdir/../bin/jslint 2>&1`
249 if [ ! -z "$jslint_notices" ]; then249 if [ ! -z "$jslint_notices" ]; then
250 echo ""250 echo ""
251 echo ""251 echo ""
252252
=== modified file 'buildout.cfg'
--- buildout.cfg 2009-10-18 01:09:02 +0000
+++ buildout.cfg 2009-10-26 14:29:12 +0000
@@ -67,6 +67,8 @@
67 googletestservice=canonical.launchpad.testing.googletestservice:main67 googletestservice=canonical.launchpad.testing.googletestservice:main
68 windmill=windmill.bin.windmill_bin:main68 windmill=windmill.bin.windmill_bin:main
69 lp-windmill=lp.scripts.utilities.lpwindmill:main69 lp-windmill=lp.scripts.utilities.lpwindmill:main
70 jsbuild=lazr.js.build:main
71 jslint=lazr.js.jslint:main
7072
71[iharness]73[iharness]
72recipe = zc.recipe.egg74recipe = zc.recipe.egg
7375
=== modified symlink 'lib/canonical/launchpad/icing/lazr'
=== target changed u'../../../../sourcecode/lazr-js/lib/lazr' => u'../../../../lazr-js'
=== modified symlink 'lib/canonical/launchpad/icing/yui'
=== target changed u'../../../../sourcecode/lazr-js/lib/yui' => u'../../../../lazr-js/build/yui'
=== modified file 'setup.py'
--- setup.py 2009-10-08 10:56:00 +0000
+++ setup.py 2009-10-26 14:29:12 +0000
@@ -38,6 +38,7 @@
38 'lazr.restful',38 'lazr.restful',
39 'lazr.smtptest',39 'lazr.smtptest',
40 'lazr.uri',40 'lazr.uri',
41 'lazr-js',
41 'mechanize',42 'mechanize',
42 'mocker',43 'mocker',
43 'oauth',44 'oauth',
4445
=== modified file 'utilities/sourcedeps.conf'
--- utilities/sourcedeps.conf 2009-08-17 19:16:23 +0000
+++ utilities/sourcedeps.conf 2009-10-26 14:29:12 +0000
@@ -3,7 +3,6 @@
3bzr-svn=lp:~launchpad-pqm/bzr-svn/devel/3bzr-svn=lp:~launchpad-pqm/bzr-svn/devel/
4dulwich=lp:~launchpad-pqm/dulwich/devel/4dulwich=lp:~launchpad-pqm/dulwich/devel/
5launchpad-loggerhead=lp:~launchpad-pqm/launchpad-loggerhead/devel/5launchpad-loggerhead=lp:~launchpad-pqm/launchpad-loggerhead/devel/
6lazr-js=lp:~launchpad-pqm/lazr-js/toolchain/
7loggerhead=lp:~launchpad-pqm/loggerhead/devel/6loggerhead=lp:~launchpad-pqm/loggerhead/devel/
8mailman=lp:~launchpad-pqm/mailman/2.1/7mailman=lp:~launchpad-pqm/mailman/2.1/
9pygpgme=lp:~launchpad-pqm/pygpgme/devel/8pygpgme=lp:~launchpad-pqm/pygpgme/devel/
109
=== modified file 'versions.cfg'
--- versions.cfg 2009-10-22 19:23:55 +0000
+++ versions.cfg 2009-10-26 14:29:12 +0000
@@ -33,6 +33,7 @@
33lazr.restfulclient = 0.9.933lazr.restfulclient = 0.9.9
34lazr.smtptest = 1.134lazr.smtptest = 1.1
35lazr.uri = 1.0.235lazr.uri = 1.0.2
36lazr-js = 0.9
36martian = 0.1137martian = 0.11
37mechanize = 0.1.7b38mechanize = 0.1.7b
38mocker = 0.10.139mocker = 0.10.1