Launchpad itself

Merge lp://qastaging/~bjornt/launchpad/bug-462502 into lp://qastaging/launchpad

  1. bug-462502
  2. Merge into devel
Proposed by Björn Tillenius
Status: Merged
Merged at revision: not available
Proposed branch: lp://qastaging/~bjornt/launchpad/bug-462502
Merge into: lp://qastaging/launchpad
Diff against target: 26 lines
1 file modified
Makefile (+4/-5)
To merge this branch: bzr merge lp://qastaging/~bjornt/launchpad/bug-462502
Reviewer Review Type Date Requested Status
Jeroen T. Vermeulen (community) Approve
Deryck Hodge (community) code Approve
Review via email: mp+14082@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Björn Tillenius (bjornt) wrote :

Unbreak Javascript when devmode is turned off.

When lazr-js was buildoutified, the order of the files passed in to the JS combinator changed. This had the effect that some code stopped working, since it depended on definitions being above it.

This branch changes the order of the files, so that launchpad.js is now identical to the one in r9785. I removed EXTRA_JS_FILES variable, since I couldn't find a way of inserting the output of yui-deps.py into it. Simply putting EXTRA_JS_FILES as the last argument didn't work either, the JS was still broken.

Revision history for this message
Deryck Hodge (deryck) wrote :

Looks good to me.

review: Approve (code)
Revision history for this message
Jeroen T. Vermeulen (jtv) wrote :

Couldn't find anything wrong despite insistent probing. Tests were breaking and this fixes them. That variable never helped much, there's no easy better way of fixing it, and it broke lines in a misleading way.

Tillenius, you are cleared for landing.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2009-10-26 14:26:57 +0000
3+++ Makefile 2009-10-28 11:10:28 +0000
4@@ -26,9 +26,6 @@
5 WADL_FILE = lib/canonical/launchpad/apidoc/wadl-$(LPCONFIG).xml
6 API_INDEX = lib/canonical/launchpad/apidoc/index.html
7
8-EXTRA_JS_FILES=lib/canonical/launchpad/icing/MochiKit.js \
9- lib/canonical/launchpad/icing/lazr/build/lazr.js
10-
11 # DO NOT ALTER : this should just build by default
12 default: inplace
13
14@@ -129,8 +126,10 @@
15 jsbuild: jsbuild_lazr
16 ${SHHH} bin/jsbuild \
17 -n launchpad -s lib/canonical/launchpad/javascript \
18- -b lib/canonical/launchpad/icing/build $(EXTRA_JS_FILES) \
19- $(shell $(HERE)/utilities/yui-deps.py)
20+ -b lib/canonical/launchpad/icing/build \
21+ lib/canonical/launchpad/icing/MochiKit.js \
22+ $(shell $(HERE)/utilities/yui-deps.py) \
23+ lib/canonical/launchpad/icing/lazr/build/lazr.js
24
25 eggs:
26 # Usually this is linked via link-external-sourcecode, but in