Merge lp:~salgado/lazr-js/build-fixes into lp:lazr-js

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

This branch moves the copying of src-js/lazrjs/yui/ to the build dir
from the Makefile to the build script, so that we don't have to
duplicate that 'cp -r' hack in Launchpad's Makefile. This is not related
to the combo loader but is needed to make Launchpad to work against a
lazr-js version that has the combo loader.

It also adds a --no-skin argument to the meta.py script, so that we can
use the combo loader for javascript but not for CSS.

 reviewer mars

[Māris Fogels (mars)]

Hi Salgado,

As discussed on IRC, your changes look good, r=mars. We'll leave the --copy-yui-to switch, in favour of --no-yui, and change the Python parameter from 'no_skin=False' to 'include_skin=True'.

Maris

review: Approve

[lp:~salgado/lazr-js/build-fixes]

166. By Guilherme Salgado on 2009-12-08

Couple minor changes as suggested by Maris

=== modified file 'Makefile'
--- Makefile	2009-11-30 19:07:28 +0000
+++ Makefile	2009-12-08 20:19:10 +0000
@@ -21,7 +21,6 @@
 
 # Update the build directory
 build: $(PY)
-	cp -r src-js/lazrjs/yui/* build
 	$(PYTHON) -S bin/jsbuild -b build/lazr -s src-js/lazrjs -n lazr -x lazr/yui
 	$(PYTHON) -S bin/yuimeta -n LAZR_MODULES \
 		-s build/lazr \

=== modified file 'src-py/lazr/js/build.py'
--- src-py/lazr/js/build.py	2009-11-13 21:25:57 +0000
+++ src-py/lazr/js/build.py	2009-12-08 20:19:10 +0000
@@ -9,7 +9,6 @@
 import re
 import shutil
 import sys
-import xml.dom
 
 from glob import glob
 
@@ -24,7 +23,6 @@
 ESCAPE_STAR_PROPERTY_RE = re.compile(r'\*([a-zA-Z0-9_-]+):')
 UNESCAPE_STAR_PROPERTY_RE = re.compile(r'([a-zA-Z0-9_-]+)_ie_star_hack:')
 
-import lazrjs
 from jsmin import JavascriptMinify
 
 
@@ -185,7 +183,8 @@
 class Builder:
 
     def __init__(self, name='lazr', build_dir=BUILD_DIR, src_dir=SRC_DIR,
-                 extra_files=None, exclude_regex='', file_type='raw'):
+                 extra_files=None, exclude_regex='', file_type='raw',
+                 copy_yui_to=BUILD_DIR):
         """Create a new Builder.
 
         :param name: The name of the package we are building. This will
@@ -201,6 +200,8 @@
             file.  Possible values are 'raw', 'min', and 'debug'.  File types
             are identified by their basename suffix: foo.js, foo-min.js,
             foo-debug.js, etc.
+        :param copy_yui_to: The absolute path (as a string) to the place where
+            the YUI modules should be copied to. Defaults to BUILD_DIR.
         """
         self.name = name
         self.build_dir = build_dir
@@ -214,6 +215,7 @@
 
         self.exclusion_regex = exclude_regex
         self.file_type = file_type
+        self.copy_yui_to = copy_yui_to
 
         self.log("Using filter: " + self.file_type)
 
@@ -403,7 +405,17 @@
                 continue
             yield name, path
 
+    def copy_yui_package(self):
+        """Copy the contents of our 'yui' dir to self.copy_yui_to."""
+        yui_dirs = glob(os.path.join(SRC_DIR, 'yui') + '/*')
+        for dir in yui_dirs:
+            dir_name = os.path.split(dir)[-1]
+            dst_dir = os.path.join(self.copy_yui_to, dir_name)
+            if not os.path.isdir(dst_dir):
+                shutil.copytree(dir, dst_dir)
+
     def do_build(self):
+        self.copy_yui_package()
         for name, cpath in self.find_components():
             files_to_link = glob(os.path.join(cpath, '*.js'))
             if len(files_to_link) == 0:
@@ -445,6 +457,9 @@
         help=('Only bundle files in the source directory that match the '
               'specified file-type filter. Possible values are '
               '[min, raw, debug]. [default: %default]'))
+    parser.add_option(
+        '-c', '--copy-yui-to', dest='copy_yui_to', default=BUILD_DIR,
+        help=('Copy the YUI tree to the given directory before building'))
     return parser.parse_args()
 
 
@@ -456,5 +471,6 @@
        src_dir=options.src_dir,
        extra_files=extra,
        exclude_regex=options.exclude,
-       file_type=options.file_type
+       file_type=options.file_type,
+       copy_yui_to=options.copy_yui_to,
        ).do_build()

=== modified file 'src-py/lazr/js/meta.py'
--- src-py/lazr/js/meta.py	2009-11-23 18:55:48 +0000
+++ src-py/lazr/js/meta.py	2009-12-08 20:19:10 +0000
@@ -30,7 +30,7 @@
 class Builder:
 
     def __init__(self, name, src_dir=SRC_DIR, output=None,
-                 prefix="", exclude_regex=None, ext=True):
+                 prefix="", exclude_regex=None, ext=True, include_skin=True):
         """Create a new Builder.
 
         :param name: The name of the global variable name that will
@@ -43,12 +43,16 @@
             will still be built.
         :param ext: Default value for the 'ext' setting. Set to
             'False' to use modules with a local combo loader.
+        :param include_skin: If False, the generated metadata won't include
+            skin modules and all javascript modules will have skinnable=False.
+            Defaults to True.
         """
         self.name = name
         self.output = output
         self.prefix = prefix
         self.src_dir = src_dir
         self.exclude_regex = exclude_regex
+        self.include_skin = include_skin
         self.ext = ext
 
     def log(self, msg):
@@ -85,8 +89,10 @@
 
                 entry["type"] = "js"
                 entry["ext"] = self.ext
-                if entry.get("skinnable"):
+                if self.include_skin and entry.get("skinnable"):
                     self.generate_skin_modules(entry, metadata, root)
+                else:
+                    entry['skinnable'] = False
             metadata.extend(meta)
 
         modules = {}
@@ -224,6 +230,10 @@
         '-x', '--exclude', dest='exclude_regex',
         default=None, metavar='REGEX',
         help=('Exclude any files that match the given regular expressions.'))
+    parser.add_option(
+        '-k', '--no-skin', dest='no_skin', default=False, action="store_true",
+        help=('Do not include skin files in the list of modules and set '
+              'skinnable=False for all modules.'))
     return parser.parse_args()
 
 
@@ -236,4 +246,5 @@
        prefix=options.prefix,
        exclude_regex=options.exclude_regex,
        ext=options.ext,
+       include_skin=not options.no_skin,
        ).do_build()