launchpad-reviewers team mailing list archive

[Ian Booth <ian.booth@xxxxxxxxxxxxx>]

Ian Booth has proposed merging lp:~wallyworld/launchpad/fix-js-build-paths into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #808561 in Launchpad itself: "longpoll.js is not included in launchpad.js during make"
  https://bugs.launchpad.net/launchpad/+bug/808561

For more details, see:
https://code.launchpad.net/~wallyworld/launchpad/fix-js-build-paths/+merge/67473

The Makefile did not pick up the longpoll.js file when it packaged the javascript. The find expression used to locate the javascript files needed to be modified because the longpoll javascript lives in a slightly different location to where previous javascript has traditionally been put in the source tree.

This branch fixes the find expression used to locate the javascript. It makes it more permissive and also includes some extra exclusions to prevent unneeded javascript from being slurped up.

-- 
https://code.launchpad.net/~wallyworld/launchpad/fix-js-build-paths/+merge/67473
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wallyworld/launchpad/fix-js-build-paths into lp:launchpad.

=== modified file 'Makefile'
--- Makefile	2011-07-08 03:08:43 +0000
+++ Makefile	2011-07-11 00:58:26 +0000
@@ -25,9 +25,11 @@
 JS_BUILD := min
 endif
 
+JS_SOURCE_PATHS = -path '*lib/lp/*/javascript/*' ! -path '*/tests/*' \
+    ! -path '*/testing/*' ! -path '*lp/services/*' ! -path '*lib/lp/contrib/*'
 JS_YUI := $(shell utilities/yui-deps.py $(JS_BUILD:raw=))
 JS_OTHER := $(wildcard lib/canonical/launchpad/javascript/*/*.js)
-JS_LP := $(shell find lib/lp/*/javascript ! -path '*/tests/*' -name '*.js' ! -name '.*.js' )
+JS_LP := $(shell find $(JS_SOURCE_PATHS) -name '*.js' ! -name '.*.js' )
 JS_ALL := $(JS_YUI) $(JS_OTHER) $(JS_LP)
 JS_OUT := $(LP_BUILT_JS_ROOT)/launchpad.js