Merge lp:~wallyworld/launchpad/fix-js-build-paths into lp:launchpad

[Ian Booth]

[r=wgrant][bug=808561] Fix path expr used to find js files during make

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.

[William Grant (wgrant)]

Thanks for the fixes.

review: Approve

=== modified file 'Makefile'
--- Makefile	2011-07-08 03:08:43 +0000
+++ Makefile	2011-07-11 01:36:41 +0000
@@ -25,9 +25,12 @@
 JS_BUILD := min
 endif
 
+JS_SOURCE_PATHS = -path './lib/lp/*/javascript/*' ! -path '*/tests/*' \
+    ! -path '*/testing/*' ! -path './lib/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