Use patching for dart:io.

tools/create_sdk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2012, 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 131 matching lines @@
                      '--script_snapshot=%s' %
                      os.path.join(sdk_root, 'pkg', 'compiler',
                                   'implementation', 'dart2js.dart.snapshot'),
                      os.path.join(sdk_root, 'pkg', 'compiler',
                                   'implementation', 'dart2js.dart')])
 
 
 
 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]
   SDK_tmp = '%s.tmp' % SDK
 
   # TODO(dgrove) - deal with architectures that are not ia32.
 
   if exists(SDK):
     rmtree(SDK)
 
@@ skipping 50 matching lines @@
            join(INCLUDE, 'dart_debugger_api.h'))
 
   #
   # Create and populate sdk/lib.
   #
 
   LIB = join(SDK_tmp, 'lib')
   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),
              ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh'))
 
 
   # Create and copy pkg.
   PKG = join(SDK_tmp, 'pkg')
   os.makedirs(PKG)
 
   #
   # Create and populate pkg/{args, intl, logging, meta, unittest}
   #
 
   for library in ['args', 'htmlescape', 'dartdoc', 'intl', 'logging',
                   'meta', 'unittest']:
     copytree(join(HOME, 'pkg', library), join(PKG, library),
              ignore=ignore_patterns('*.svn', 'doc', 'docs',
                                     '*.py', '*.gypi', '*.sh'))
 
   # TODO(dgrove): Remove this once issue 4788 is addressed.
   copytree(join(HOME, 'lib', 'compiler'), join(PKG, 'compiler'),
              ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh'))
 
   ReplaceInFiles(
         [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([
       join(PKG, 'dartdoc', 'lib', 'src', 'mirrors', 'dart2js_mirror.dart'),
       join(PKG, 'dartdoc', 'lib', 'mirrors_util.dart'),
       join(PKG, 'dartdoc', 'lib', 'classify.dart'),
       join(PKG, 'dartdoc', 'lib', 'src', 'client', 'client-live-nav.dart'),
       join(PKG, 'dartdoc', 'lib', 'src', 'client', 'client-static.dart'),
       join(PKG, 'dartdoc', 'lib', 'dartdoc.dart'),
     ], [
@@ skipping 59 matching lines @@
     with open(os.path.join(SDK_tmp, 'revision'), 'w') as f:
       f.write(revision + '\n')
       f.close()
 
   Copy(join(HOME, 'README.dart-sdk'), join(SDK_tmp, 'README'))
 
   move(SDK_tmp, SDK)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))