From df4af0cefb7119a7a01b89e4874867b334c04275 Mon Sep 17 00:00:00 2001 From: Collin Jackson Date: Fri, 7 Aug 2015 09:29:19 -0700 Subject: [PATCH] Use the new virtual directory flag for sky_server instead of a symlink --- engine/src/flutter/sky/packages/workbench/sky | 1 - engine/src/flutter/sky/tools/skypy/skyserver.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 120000 engine/src/flutter/sky/packages/workbench/sky diff --git a/engine/src/flutter/sky/packages/workbench/sky b/engine/src/flutter/sky/packages/workbench/sky deleted file mode 120000 index c25bddb6dd4..00000000000 --- a/engine/src/flutter/sky/packages/workbench/sky +++ /dev/null @@ -1 +0,0 @@ -../.. \ No newline at end of file diff --git a/engine/src/flutter/sky/tools/skypy/skyserver.py b/engine/src/flutter/sky/tools/skypy/skyserver.py index 4db563d5e25..03ad1efaba6 100644 --- a/engine/src/flutter/sky/tools/skypy/skyserver.py +++ b/engine/src/flutter/sky/tools/skypy/skyserver.py @@ -14,6 +14,7 @@ WORKBENCH_ROOT = os.path.join(SRC_ROOT, 'sky', 'packages', 'workbench') DART_SDK = os.path.join(SRC_ROOT, 'third_party', 'dart-sdk', 'dart-sdk', 'bin') PUB = os.path.join(DART_SDK, 'pub') PUB_CACHE = os.path.join(SRC_ROOT, "dart-pub-cache") +SKY_ROOT = os.path.join(SRC_ROOT, 'sky') class SkyServer(object): def __init__(self, port, root, package_root): @@ -36,7 +37,7 @@ class SkyServer(object): env = os.environ.copy() env["PUB_CACHE"] = PUB_CACHE - args = [PUB, 'run', 'sky_tools:sky_server', str(self.port)] + args = [PUB, 'run', 'sky_tools:sky_server', '--route=/sky,%s' % SKY_ROOT, str(self.port)] self.server = subprocess.Popen(args, cwd=WORKBENCH_ROOT, env=env) return self.server.pid