Mojo JS Bindings: merge Application, Shell, ServiceProvider with Sky

sky/tools/skydb

 #!/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.
 
 import argparse
 import logging
 import os
 from skypy.paths import Paths
 import skypy.configuration as configuration
@@ skipping 53 matching lines @@
     def _in_chromoting(self):
         return os.environ.get('CHROME_REMOTE_DESKTOP_SESSION', False)
 
     def main(self):
         logging.basicConfig(level=logging.INFO)
 
         parser = argparse.ArgumentParser(description='Sky launcher/debugger')
         parser.add_argument('--gdb', action='store_true')
         parser.add_argument('--use-osmesa', action='store_true',
             default=self._in_chromoting())
+        parser.add_argument('--show_command', action='store_true',

[abarth-chromium, 2015/01/07 22:52:01]

--show_command -> --show-command (for consistency with --use-osmesa)

[hansmuller1, 2015/01/07 23:33:04]

Done.

+            help='Display the shell command and exit')
         parser.add_argument('url', nargs='?', type=str)
         configuration.add_arguments(parser)
         args = parser.parse_args()
 
         self.paths = Paths(os.path.join('out', args.configuration))
 
         content_handlers = ['%s,%s' % (mime_type, 'mojo:sky_viewer')
             for mime_type in SUPPORTED_MIME_TYPES]
         shell_command = [
             self.paths.mojo_shell_path,
             '--v=1',
             '--content-handlers=%s' % ','.join(content_handlers),
             '--url-mappings=mojo:window_manager=mojo:sky_debugger',
             'mojo:window_manager',
         ]
         if args.url:
             url = args.url
             if not urlparse.urlparse(url).scheme:
                 url = self._start_http_server_for_file(url, args.configuration)
 
             prompt_args = '--args-for=mojo:sky_debugger_prompt %s' % url
             shell_command.append(prompt_args)
         if args.use_osmesa:
             shell_command.append('--args-for=mojo:native_viewport_service --use-osmesa')
         if args.gdb:
             shell_command = ['gdb', '--args'] + shell_command
 
-        subprocess.check_call(shell_command)
+        if args.show_command:
+            print " ".join(shell_command)
+        else:
+            subprocess.check_call(shell_command)
 
     def shutdown(self):
         print "Quitting"
         if self._sky_server:
             self._sky_server.terminate()
 
 
 if __name__ == '__main__':
     skydb = SkyDebugger()
     try:
         skydb.main()
     except (KeyboardInterrupt, SystemExit):
         pass
     finally:
         skydb.shutdown()