Use patching for dart:io.

tools/create_sdk.py

Index: tools/create_sdk.py
diff --git a/tools/create_sdk.py b/tools/create_sdk.py
index f9f3cdf89f37dc134017f27c84335aa4604f8dab..857ba0e12be71020d4e7fa740e1d9fb03009409b 100755
--- a/tools/create_sdk.py
+++ b/tools/create_sdk.py
@@ -149,9 +149,6 @@ def CopyDart2Js(build_dir, sdk_root, version):
 
 def Main(argv):
   # Pull in all of the gpyi files which will be munged into the sdk.
-  io_runtime_sources = \
-    (eval(open("runtime/bin/io_sources.gypi").read()))['sources']
-
   HOME = dirname(dirname(realpath(__file__)))
 
   SDK = argv[1]
@@ -222,35 +219,11 @@ def Main(argv):
   os.makedirs(LIB)
 
   #
-  # 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/{core, crypto, isolate, json, uri, utf, ...}.
   #
 
   os.makedirs(join(LIB, 'html'))
-  for library in ['_internal', 'collection', 'core', 'coreimpl', 'crypto',
+  for library in ['_internal', 'collection', 'core', 'coreimpl', 'crypto', 'io',

[Søren Gjesse, 2012/10/30 09:28:32]

Nice!

[Mads Ager (google), 2012/10/30 11:12:40]

Yes! :)

                   'isolate', join('html', 'dart2js'), join('html', 'dartium'),
                   'json', 'math', 'mirrors', 'scalarlist', 'uri', 'utf']:
     copytree(join(HOME, 'lib', library), join(LIB, library),
@@ -279,10 +252,6 @@ def Main(argv):
         [join(LIB, '_internal', 'libraries.dart')],
         [('"compiler/', '"../pkg/compiler/')])
 
-  ReplaceInFiles(
-        [join(PKG, 'compiler', 'implementation', 'lib', 'io.dart')],
-        [('../../runtime/bin', '../../lib/io/runtime')])
-
   # Fixup dartdoc
   # TODO(dgrove): Remove this once issue 4788 is addressed.
   ReplaceInFiles([