Fix the SDK build after frog/leg rename.

dart/tools/create_sdk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 #
 # A script which will be invoked from gyp to create an SDK.
 #
 # Usage: create_sdk.py sdk_directory
 #
@@ skipping 39 matching lines @@
 # ......(more will come here)
 
 
 
 import os
 import re
 import sys
 import tempfile
 import utils
 
+# TODO(dgrove): Only import modules following Google style guide.
 from os.path import dirname, join, realpath, exists, isdir
+
+# TODO(dgrove): Only import modules following Google style guide.
 from shutil import copyfile, copymode, copytree, ignore_patterns, rmtree, move
 
 def ReplaceInFiles(paths, subs):
   '''Reads a series of files, applies a series of substitutions to each, and
      saves them back out. subs should by a list of (pattern, replace) tuples.'''
   for path in paths:
     contents = open(path).read()
     for pattern, replace in subs:
       contents = re.sub(pattern, replace, contents)
 
@@ skipping 53 matching lines @@
   copyfile(frogc_src_binary, frogc_dest_binary)
   copymode(frogc_src_binary, frogc_dest_binary)
 
   # Create sdk/bin/frogc.dart, and hack as needed.
   frog_src_dir = join(HOME, 'frog')
 
   # Convert frogc.dart's imports from import('*') -> import('frog/*').
   frogc_contents = open(join(frog_src_dir, 'frogc.dart')).read()
   frogc_dest = open(join(BIN, 'frogc.dart'), 'w')
   frogc_dest.write(
-    re.sub("#import\('", "#import('../lib/frog/", frogc_contents))
+    re.sub(r"#import\('([^.])", r"#import('../lib/frog/\1", frogc_contents))
   frogc_dest.close()
 
   # TODO(dgrove): copy and fix up frog.dart, minfrogc.dart.
 
   #
   # Create and populate sdk/lib.
   #
 
   LIB = join(SDK_tmp, 'lib')
   os.makedirs(LIB)
@@ skipping 45 matching lines @@
 
   # Construct lib/io/io_runtime.dart from whole cloth.
   dest_file = open(join(io_dest_dir, 'io_runtime.dart'), 'a')
   for filename in io_runtime_sources:
     assert filename.endswith('.dart')
     if filename == 'io.dart':
       continue
     dest_file.write('#source("runtime/' + filename + '");\n')
   dest_file.close()
 
+  #
+  # Create and populate lib/compiler.
+  #
+  compiler_src_dir = join(HOME, 'lib', 'compiler')
+  compiler_dest_dir = join(LIB, 'compiler')
+
+  copytree(compiler_src_dir, compiler_dest_dir, ignore=ignore_patterns('.svn'))
+
+  # Remap imports in lib/compiler/* .
+  for (dirpath, subdirs, filenames) in os.walk(compiler_dest_dir):
+    for filename in filenames:
+      if filename.endswith('.dart'):
+        filename = join(dirpath, filename)
+        file_contents = open(filename).read()
+        file = open(filename, 'w')
+        file_contents = re.sub(r"\.\./lib", "..", file_contents)
+        file_contents = re.sub(r"\.\./frog/", "frog/", file_contents)
+        file.write(file_contents)
+        file.close()
 
   #
   # Create and populate lib/frog.
   #
+  # TODO(dgrove): Frog is not a dart library and should not live in lib.
+  #
   frog_dest_dir = join(LIB, 'frog')
   os.makedirs(frog_dest_dir)
 
   for filename in os.listdir(frog_src_dir):
     if filename == 'frog_options.dart':
       # change config from 'dev' to 'sdk' in frog_options.dart
       frog_options_contents = open(join(frog_src_dir, filename)).read()
       frog_options_dest = open(join(frog_dest_dir, filename), 'w')
       frog_options_dest.write(re.sub("final config = \'dev\';",
                                      "final config = \'sdk\';",
                                      frog_options_contents))
       frog_options_dest.close()
     elif filename.endswith('.dart'):
       copyfile(join(frog_src_dir, filename), join(frog_dest_dir, filename))
 
-  leg_dest_dir = join(frog_dest_dir, 'leg')
-  copytree(join(frog_src_dir, 'leg'), leg_dest_dir,
-           ignore=ignore_patterns('.svn'))
-
-  # Remap imports in frog/leg/* .
-  for filename in os.listdir(leg_dest_dir):
-    if filename.endswith('.dart'):
-      file_contents = open(join(leg_dest_dir, filename)).read()
-      file = open(join(leg_dest_dir, filename), 'w')
-      file.write(re.sub("../../lib", "../..", file_contents))
-      file.close()
 
   copytree(join(frog_src_dir, 'server'), join(frog_dest_dir, 'server'),
            ignore=ignore_patterns('.svn'))
 
   # Remap imports in frog/... .
-  for (dirpath, subdirs, _) in os.walk(frog_dest_dir):
-    for subdir in subdirs:
-      for filename in os.listdir(join(dirpath, subdir)):
-        if filename.endswith('.dart'):
-          file_contents = open(join(dirpath, subdir, filename)).read()
-          file = open(join(dirpath, subdir, filename), 'w')
-          file.write(re.sub("../lib/", "../", file_contents))
-          file.close()
+  for (dirpath, subdirs, filenames) in os.walk(frog_dest_dir):
+    for filename in filenames:
+      if filename.endswith('.dart'):
+        file_contents = open(join(dirpath, filename)).read()
+        file = open(join(dirpath, filename), 'w')
+        file.write(re.sub(r"\.\./lib/", "../", file_contents))
+        file.close()
 
   #
   # Create and populate lib/html.
   #
   html_src_dir = join(HOME, 'lib', 'html')
   html_dest_dir = join(LIB, 'html')
   os.makedirs(html_dest_dir)
 
   copyfile(join(html_src_dir, 'frog', 'html_frog.dart'),
            join(html_dest_dir, 'html_frog.dart'))
@@ skipping 139 matching lines @@
 
   # Create and copy tools.
 
   UTIL = join(SDK_tmp, 'util')
   os.makedirs(UTIL)
 
   move(SDK_tmp, SDK)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))