Move utils/{uri, utf8} to lib/{uri, utf8} .

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 22 matching lines @@
 # ......frog/
 # ......html/ 
 # ........html.dart
 # ......htmlimpl/ 
 # ........htmlimpl.dart
 # ......json/
 # ........json_{frog}.dart
 # ........{frog}/
 # ......uri/
 # ........uri.dart
-# ......(more will come here - io, etc)
+# ......utf8/
+# ........utf8.dart
+# ......(more will come here)
 # ....util/
 # ......(more will come here)
 
 
 
 import os
 import re
 import sys
 import tempfile
 import utils
@@ skipping 131 matching lines @@
       # 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))
 
-  copytree(join(frog_src_dir, 'leg'), join(frog_dest_dir, 'leg'), 
+  leg_dest_dir = join(frog_dest_dir, 'leg')
+  copytree(join(frog_src_dir, 'leg'), leg_dest_dir,
            ignore=ignore_patterns('.svn'))
 
-  frog_leg_contents = \
-    open(join(frog_src_dir, 'leg', 'frog_leg.dart')).read()
-  frog_leg_dest = open(join(frog_dest_dir, 'leg', 'frog_leg.dart'), 'w')
-  frog_leg_dest.write( \
-    re.sub("../../utils/uri", "../../uri", frog_leg_contents))
-  frog_leg_dest.close()
+  # 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()
 
-  leg_contents = \
-    open(join(frog_src_dir, 'leg', 'leg.dart')).read()
-  leg_dest = open(join(frog_dest_dir, 'leg', 'leg.dart'), 'w')
-  leg_dest.write( \
-    re.sub("../../utils/uri", "../../uri", leg_contents))
-  leg_dest.close()
-
+  # Remap imports in frog/leg/*/* .
+  for (_, subdirs, _) in os.walk(leg_dest_dir):
+    for subdir in subdirs:
+      for filename in os.listdir(join(leg_dest_dir, subdir)):
+        if filename.endswith('.dart'):
+          file_contents = open(join(leg_dest_dir, subdir, filename)).read()
+          file = open(join(leg_dest_dir, subdir, 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'))
 
   #
   # Create and populate lib/html and lib/htmlimpl.
   #
   html_src_dir = join(HOME, 'client', 'html')
   html_dest_dir = join(LIB, 'html')
   os.makedirs(html_dest_dir)
@@ skipping 35 matching lines @@
     dest_file = join(dom_dest_dir, filename)
     if filename.endswith('.dart') or filename.endswith('.js'):
       copyfile(src_file, dest_file)
     elif isdir(src_file):
       if filename not in ['benchmarks', 'idl', 'scripts', 'snippets', '.svn']:
         copytree(src_file, dest_file, 
                  ignore=ignore_patterns('.svn', 'interface', 'wrapping', 
                                         '*monkey*'))
 
   # 
-  # Create and populate lib/uri.
+  # Create and populate lib/{uri, utf8} .
   #
 
-  uri_src_dir = join(HOME, 'utils', 'uri')
-  uri_dest_dir = join(LIB, 'uri')
-  os.makedirs(uri_dest_dir)
+  for library in ['uri', 'utf8']:
+    src_dir = join(HOME, 'lib', library)
+    dest_dir = join(LIB, library)
+    os.makedirs(dest_dir)
 
-  for filename in os.listdir(uri_src_dir):
-    if filename.endswith('.dart'):
-      copyfile(join(uri_src_dir, filename), join(uri_dest_dir, filename))
+    for filename in os.listdir(src_dir):
+      if filename.endswith('.dart'):
+        copyfile(join(src_dir, filename), join(dest_dir, filename))
 
   #
   # Create and populate lib/core.
   #
 
   # First, copy corelib/* to lib/{frog, runtime}
   for filename in corelib_sources:
     for target_dir in ['frog', 'runtime']:
       copyfile(join('corelib', 'src', filename), 
                join(corelib_dest_dir, target_dir, filename))
@@ skipping 75 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))