From e71cc7d2b3a74281da10186fd2316bdfb9f8698a Mon Sep 17 00:00:00 2001
From: Adam Barth <abarth@chromium.org>
Date: Thu, 20 Nov 2014 14:39:55 -0800
Subject: [PATCH] Teach skydb about --release and --debug

Previously, skydb could be used only for Debug builds. As part of working on
graphics performance, I'd like to use it for release builds as well. This CL
teaches it to use the same configuration arguments as sky_server, test_sky, and
test_perf.

The downside of this CL is that you'll need to supply --debug in the common
case of working with a debug build.

R=eseidel@chromium.org

Review URL: https://codereview.chromium.org/746473003
---
 engine/src/flutter/tools/skydb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/engine/src/flutter/tools/skydb b/engine/src/flutter/tools/skydb
index e834f68289..24d66f379d 100755
--- a/engine/src/flutter/tools/skydb
+++ b/engine/src/flutter/tools/skydb
@@ -7,6 +7,7 @@ import argparse
 import logging
 import os
 from skypy.paths import Paths
+import skypy.configuration as configuration
 import socket;
 import subprocess
 import sys
@@ -23,14 +24,14 @@ SUPPORTED_MIME_TYPES = [
 class SkyDebugger(object):
     def __init__(self):
         self._sky_server = None
-        self.paths = Paths(os.path.join('out', 'Debug'))
+        self.paths = None
 
     @staticmethod
     def _port_in_use(port):
         sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         return sock.connect_ex(('localhost', port)) == 0
 
-    def _start_http_server_for_file(self, path):
+    def _start_http_server_for_file(self, path, configuration):
         HTTP_PORT = 9999
 
 
@@ -51,7 +52,7 @@ class SkyDebugger(object):
         else:
             server_command = [
                 os.path.join(self.paths.sky_tools_directory, 'sky_server'),
-                '--debug',
+                '-t', configuration,
                 server_root,
                 str(HTTP_PORT),
             ]
@@ -69,8 +70,11 @@ class SkyDebugger(object):
         parser.add_argument('--use-osmesa', action='store_true',
             default=self._in_chromoting())
         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 = [
@@ -83,7 +87,7 @@ class SkyDebugger(object):
         if args.url:
             url = args.url
             if not urlparse.urlparse(url).scheme:
-                url = self._start_http_server_for_file(url)
+                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)