DevTools: Make compile_frontend.py check code from all applications

Source/devtools/scripts/modular_build.py

 #!/usr/bin/env python
 #
 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 Utilities for the modular DevTools build.
 """
 
@@ skipping 26 matching lines @@
     for file_name in file_names:
         output.write('/* %s */\n' % file_name)
         file_path = path.join(module_dir, file_name)
         if not path.isfile(file_path):
             file_path = path.join(output_dir, path.basename(module_dir), file_name)
         output.write(read_file(file_path))
         output.write(';')
 
 
 class Descriptors:
-    def __init__(self, application_dir, application_descriptor, module_descriptors, application_json):
+    def __init__(self, application_dir, application_descriptor, module_descriptors):
         self.application_dir = application_dir
         self.application = application_descriptor
         self.modules = module_descriptors
-        self.application_json = application_json
         self._cached_sorted_modules = None
 
+    def application_json(self):
+        return json.dumps(self.application.values())
+
     def all_compiled_files(self):
         files = {}
         for name in self.modules:
             module = self.modules[name]
             skipped_files = set(module.get('skip_compilation', []))
             for script in module.get('scripts', []):
                 if script not in skipped_files:
                     files[path.normpath(path.join(self.application_dir, name, script))] = True
         return files.keys()
 
     def module_compiled_files(self, name):
         files = []
-        module = self.modules[name]
+        module = self.modules.get(name)
         skipped_files = set(module.get('skip_compilation', []))
         for script in module.get('scripts', []):
             if script not in skipped_files:
                 files.append(script)
         return files
 
     def module_stylesheets(self, name):
         return [name + '/' + css for css in self.modules[name].get('stylesheets', [])]
 
     def sorted_modules(self):
@@ skipping 49 matching lines @@
             return result
 
         return sorted_deps_for_module(module_name)
 
 
 class DescriptorLoader:
     def __init__(self, application_dir):
         self.application_dir = application_dir
 
     def load_application(self, application_descriptor_name):
-        application_descriptor_filename = path.join(self.application_dir, application_descriptor_name)
-        application_descriptor_json = read_file(application_descriptor_filename)
-        application_descriptor = {desc['name']: desc for desc in json.loads(application_descriptor_json)}
+        return self.load_applications([application_descriptor_name])
 
-        module_descriptors = {}
-        for (module_name, module) in application_descriptor.items():
-            if module_descriptors.get(module_name):
-                bail_error('Duplicate definition of module "%s" in %s' % (module_name, application_descriptor_filename))
-            module_json_filename = path.join(self.application_dir, module_name, 'module.json')
-            module_descriptors[module_name] = self._read_module_descriptor(module_name, application_descriptor_filename)
+    def load_applications(self, application_descriptor_names):
+        merged_application_descriptor = {}
+        all_module_descriptors = {}
+        for application_descriptor_name in application_descriptor_names:
+            module_descriptors = {}
+            application_descriptor_filename = path.join(self.application_dir, application_descriptor_name)
+            application_descriptor_json = read_file(application_descriptor_filename)
+            application_descriptor = {desc['name']: desc for desc in json.loads(application_descriptor_json)}
+            for name in application_descriptor:
+                merged_application_descriptor[name] = application_descriptor[name]
 
-        for module in module_descriptors.values():
-            deps = module.get('dependencies', [])
-            for dep in deps:
-                if dep not in application_descriptor:
-                    bail_error('Module "%s" (dependency of "%s") not listed in application descriptor %s' % (dep, module['name'], application_descriptor_filename))
-        return Descriptors(self.application_dir, application_descriptor, module_descriptors, application_descriptor_json)
+            for (module_name, module) in application_descriptor.items():
+                if module_descriptors.get(module_name):
+                    bail_error('Duplicate definition of module "%s" in %s' % (module_name, application_descriptor_filename))
+                module_descriptors[module_name] = self._read_module_descriptor(module_name, application_descriptor_filename)

[dgozman, 2014/10/22 12:48:24]

Let's not load the same module twice?
if not all_module_descriptors.get(module_name):
    module_descriptors[module_name] = ....
    all_module_descriptors[module_name] = module_descriptors[module_name]

[apavlov, 2014/10/22 13:14:20]

Done.

+                all_module_descriptors[module_name] = module_descriptors[module_name]
+
+            for module in module_descriptors.values():
+                deps = module.get('dependencies', [])
+                for dep in deps:
+                    if dep not in application_descriptor:
+                        bail_error('Module "%s" (dependency of "%s") not listed in application descriptor %s' % (dep, module['name'], application_descriptor_filename))
+
+        return Descriptors(self.application_dir, merged_application_descriptor, all_module_descriptors)
 
     def _read_module_descriptor(self, module_name, application_descriptor_filename):
         json_filename = path.join(self.application_dir, module_name, 'module.json')
         if not path.exists(json_filename):
             bail_error('Module descriptor %s referenced in %s is missing' % (json_filename, application_descriptor_filename))
         module_json = json.loads(read_file(json_filename))
         module_json['name'] = module_name
         return module_json