Merge lp:~deryck/launchpad/minify-app-specific-js-592795 into lp:launchpad

[Deryck Hodge]

Ensure JavaScript included from app-specific modules is minified.

This gets js files that live in app-specific javascript directories
minified. They are not currently minified, and while moving bugs js
code to lp.bugs.javascript, I got the build error about launchpad.js
being over 500k.

I've run the fix by rockstar who wrote the original lp-dep script,
and mars since he maintains the front-end build infrastructure. Both
seemed generally fine with the approach here, after some small
discussion on IRC.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  Makefile
  utilities/lp-deps.py

[Māris Fogels (mars)]

Hi Deryck,

I assume the log_none() monkey patch is because this script's output to STDOUT is a programmatic input to another script? It would be nice to put a comment before if that is the case.

I assume you ran this through 'xvfb-run make jscheck'?

And thanks for the Makefile fix.

With the added comment, r=mars.

Maris

review: Approve

[Deryck Hodge (deryck)]

Hi, Maris.

I'm adding a comment for the monkey patch, and yes, I have run this through make jscheck. Passes fine.

Thanks for the review and comments!

Cheers,
deryck

=== modified file 'Makefile'
--- Makefile	2010-06-09 14:49:31 +0000
+++ Makefile	2010-06-14 13:36:38 +0000
@@ -153,7 +153,7 @@
 		-s lib/canonical/launchpad/javascript \
 		-b $(LP_BUILT_JS_ROOT) \
 		$(shell $(HERE)/utilities/yui-deps.py) \
-		$(shell $(HERE)/utilities/lp-deps.py) \
+		$(shell $(PY) $(HERE)/utilities/lp-deps.py) \
 		lib/canonical/launchpad/icing/lazr/build/lazr.js
 	${SHHH} bin/jssize
 

=== modified file 'utilities/lp-deps.py'
--- utilities/lp-deps.py	2010-05-18 18:04:00 +0000
+++ utilities/lp-deps.py	2010-06-14 13:36:38 +0000
@@ -13,6 +13,7 @@
 
 import os
 
+from lazr.js.build import Builder
 
 TOP = os.path.abspath(
     os.path.join(os.path.dirname(__file__), '..'))
@@ -26,13 +27,27 @@
 ICING_ROOT = os.path.join(TOP, 'lib', 'canonical', 'launchpad', 'icing')
 ICING_BUILD = os.path.join(ICING_ROOT, 'build')
 
+# Builder has lots of logging, which might not
+# play well with printing filenames.  Monkey patch
+# to disable it.
+def log_none(msg):
+    return
+
 for DIRSET in JS_DIRSET:
     full_dir = os.path.join(TOP, DIRSET[0])
+    module_name = DIRSET[1]
+    BUILD_DIR = os.path.join(ICING_BUILD, module_name)
+    if not os.path.exists(BUILD_DIR):
+        os.mkdir(BUILD_DIR)
+    builder = Builder(
+        name=module_name, src_dir=full_dir, build_dir=ICING_BUILD)
+    builder.log = log_none
     # We don't want the tests to be included.  If we want to nest the files in
     # more folders though, this is where we change it.
     for filename in os.listdir(full_dir):
         if filename.endswith('.js'):
+            basename, nothing = filename.split('.js')
+            min_filename = basename + '-min.js'
             absolute_filename = os.path.join(full_dir, filename)
-            print absolute_filename
-
-    os.symlink(full_dir, os.path.join(ICING_BUILD, DIRSET[1]))
+            builder.link_and_minify(builder.name, absolute_filename)
+            print os.path.join(BUILD_DIR, min_filename)