Fix the dart:builtin and dart:io parts of the SDK.

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
 #
 # The SDK will be used either from the command-line or from the editor. 
 # Top structure is
-# 
+#
 # ..dart-sdk/
 # ....bin/
 # ......dart or dart.exe (executable)
 # ......frogc.dart
 # ......frogsh (coming later)
 # ....lib/
 # ......builtin/
 # ........builtin_runtime.dart
+# ......io/
+# ........io_runtime.dart
 # ........runtime/
 # ......core/
 # ........core_{frog, runtime}.dart
 # ........{frog, runtime}/ 
 # ......coreimpl/
 # ........coreimpl_{frog, runtime}.dart
 # ........{frog, runtime}/ 
 # ......dom/
 # ........dom.dart
 # ......frog/
@@ skipping 16 matching lines @@
 import tempfile
 import utils
 
 from os.path import dirname, join, realpath, exists, isdir
 from shutil import copyfile, copymode, copytree, ignore_patterns, rmtree, move
 
 def Main(argv):
   # Pull in all of the gpyi files which will be munged into the sdk.
   builtin_runtime_sources = \
     (eval(open("runtime/bin/builtin_sources.gypi").read()))['sources']
+  io_runtime_sources = \
+    (eval(open("runtime/bin/io_sources.gypi").read()))['sources']
   corelib_sources = \
     (eval(open("corelib/src/corelib_sources.gypi").read()))['sources']
   corelib_frog_sources = \
     (eval(open("frog/lib/frog_corelib_sources.gypi").read()))['sources']
   corelib_runtime_sources = \
     (eval(open("runtime/lib/lib_sources.gypi").read()))['sources']
   coreimpl_sources = \
     (eval(open("corelib/src/implementation/corelib_impl_sources.gypi").read()))\
     ['sources']
   coreimpl_frog_sources = \
@@ skipping 58 matching lines @@
   os.makedirs(join(corelib_dest_dir, 'runtime'))
 
   coreimpl_dest_dir = join(LIB, 'coreimpl')
   os.makedirs(coreimpl_dest_dir)
   os.makedirs(join(coreimpl_dest_dir, 'frog'))
   os.makedirs(join(coreimpl_dest_dir, 'frog', 'node'))
   os.makedirs(join(coreimpl_dest_dir, 'runtime'))
 
 
   #
-  # Create and populate lib/runtime.
+  # Create and populate lib/builtin.
   #
   builtin_dest_dir = join(LIB, 'builtin')
   os.makedirs(builtin_dest_dir)
-  os.makedirs(join(builtin_dest_dir, 'runtime'))
-  for filename in builtin_runtime_sources:
-    if filename.endswith('.dart'):
-      copyfile(join(HOME, 'runtime', 'bin', filename), 
-               join(builtin_dest_dir, 'runtime', filename))
+  assert len(builtin_runtime_sources) == 1
+  assert builtin_runtime_sources[0] == 'builtin.dart'
+  copyfile(join(HOME, 'runtime', 'bin', 'builtin.dart'),
+           join(builtin_dest_dir, 'builtin_runtime.dart'))
 
-  # Construct lib/builtin/builtin_runtime.dart from whole cloth.
-  dest_file = open(join(builtin_dest_dir, 'builtin_runtime.dart'), 'w')
-  dest_file.write('#library("dart:builtin");\n')
-  for filename in builtin_runtime_sources:
-    if filename.endswith('.dart'):
-      dest_file.write('#source("runtime/' + filename + '");\n')
+
+  #
+  # Create and populate lib/io.
+  #
+  io_dest_dir = join(LIB, 'io')
+  os.makedirs(io_dest_dir)
+  os.makedirs(join(io_dest_dir, 'runtime'))
+  for filename in io_runtime_sources:
+    assert filename.endswith('.dart')
+    if filename == 'io.dart':
+      copyfile(join(HOME, 'runtime', 'bin', filename),
+               join(io_dest_dir, 'io_runtime.dart'))
+    else:
+      copyfile(join(HOME, 'runtime', 'bin', filename),
+               join(io_dest_dir, 'runtime', filename))
+
+  # 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/frog.
   #
   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()
@@ skipping 148 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))