Move core and coreimpl from corelib/ to lib/core and lib/coreimpl.

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 115 matching lines @@
 
   Currently, we copy too much stuff to this location, but the SDK's
   layout matches the the layout of the part of the repository we're
   dealing with here which frees us from rewriting files. The long term
   plan is to align the layout of the repository and the SDK, at which
   point we should be able to simplify Main below and share the dart
   files between the various components to minimize SDK download size.
   '''
   copytree('lib', os.path.join(sdk_root, 'lib', 'dart2js', 'lib'),
            ignore=ignore_patterns('.svn'))
-  copytree(os.path.join('corelib', 'src'),
-           os.path.join(sdk_root, 'lib', 'dart2js', 'corelib', 'src'),
-           ignore=ignore_patterns('.svn'))
   copytree(os.path.join('runtime', 'lib'),
            os.path.join(sdk_root, 'lib', 'dart2js', 'runtime', 'lib'),
            ignore=ignore_patterns('.svn'))
   copytree(os.path.join('runtime', 'bin'),
            os.path.join(sdk_root, 'lib', 'dart2js', 'runtime', 'bin'),
            ignore=ignore_patterns('.svn'))
   if utils.GuessOS() == 'win32':
     dart2js = os.path.join(sdk_root, 'bin', 'dart2js.bat')
     Copy(os.path.join(build_dir, 'dart2js.bat'), dart2js)
     ReplaceInFiles([dart2js],
                    [(r'%SCRIPTPATH%\.\.\\lib',
                      r'%SCRIPTPATH%..\lib\dart2js\lib')])
     dartdoc = os.path.join(sdk_root, 'bin', 'dartdoc.bat')
     Copy(os.path.join(build_dir, 'dartdoc.bat'), dartdoc)
   else:
     dart2js = os.path.join(sdk_root, 'bin', 'dart2js')
     Copy(os.path.join(build_dir, 'dart2js'), dart2js)
     ReplaceInFiles([dart2js],
                    [(r'\$BIN_DIR/\.\./\.\./lib',
                      r'$BIN_DIR/../lib/dart2js/lib')])
     dartdoc = os.path.join(sdk_root, 'bin', 'dartdoc')
     Copy(os.path.join(build_dir, 'dartdoc'), dartdoc)
 
 
 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_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_runtime_sources = \
-    (eval(open("runtime/lib/lib_impl_sources.gypi").read()))['sources']
 
   HOME = dirname(dirname(realpath(__file__)))
 
   SDK_tmp = tempfile.mkdtemp()
   SDK = argv[1]
 
   # TODO(dgrove) - deal with architectures that are not ia32.
 
   if exists(SDK):
     rmtree(SDK)
@@ skipping 42 matching lines @@
            join(INCLUDE, 'dart_api.h'))
   copyfile(join(HOME, 'runtime', 'include', 'dart_debugger_api.h'),
            join(INCLUDE, 'dart_debugger_api.h'))
 
   #
   # Create and populate sdk/lib.
   #
 
   LIB = join(SDK_tmp, 'lib')
   os.makedirs(LIB)
-  corelib_dest_dir = join(LIB, 'core')
-  os.makedirs(corelib_dest_dir)
-  os.makedirs(join(corelib_dest_dir, 'runtime'))
-
-  coreimpl_dest_dir = join(LIB, 'coreimpl')
-  os.makedirs(coreimpl_dest_dir)
-  os.makedirs(join(coreimpl_dest_dir, 'runtime'))
-
-
-  #
-  # Create and populate lib/builtin.
-  #
-  builtin_dest_dir = join(LIB, 'builtin')
-  os.makedirs(builtin_dest_dir)
-  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'))
-  #
-  # rename the print function in dart:builtin
-  # so that it does not conflict with the print function in dart:core
-  #
-  ReplaceInFiles([
-      join(builtin_dest_dir, 'builtin_runtime.dart')
-    ], [
-      ('void print\(', 'void builtinPrint(')
-    ])
 
   #
   # 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':
@@ skipping 49 matching lines @@
   # Create and populate lib/dom.
   #
   dom_src_dir = join(HOME, 'lib', 'dom')
   dom_dest_dir = join(LIB, 'dom')
   os.makedirs(dom_dest_dir)
 
   copyfile(join(dom_src_dir, 'dart2js', 'dom_dart2js.dart'),
            join(dom_dest_dir, 'dom_dart2js.dart'))
 
   #
-  # Create and populate lib/{crypto, json, uri, utf, ...}.
+  # Create and populate lib/{core, crypto, isolate, json, uri, utf, ...}.
   #
 
-  for library in ['_internal', 'crypto', 'json', 'math', 'mirrors', 'uri',
-                  'utf', 'web']:
+  for library in ['_internal', 'core', 'coreimpl', 'crypto', 'isolate', 'json',
+                  'math', 'mirrors', 'uri', 'utf', 'web']:
     src_dir = join(HOME, 'lib', library)
     dest_dir = join(LIB, library)
     os.makedirs(dest_dir)
 
     for filename in os.listdir(src_dir):
       if filename.endswith('.dart'):
         copyfile(join(src_dir, filename), join(dest_dir, filename))
 
-  # Create and populate lib/isolate
-  copytree(join(HOME, 'lib', 'isolate'), join(LIB, 'isolate'),
-           ignore=ignore_patterns('.svn'))
-
-  #
-  # Create and populate lib/core.
-  #
-
-  # First, copy corelib/* to lib/runtime
-  for filename in corelib_sources:
-    for target_dir in ['runtime']:
-      copyfile(join('corelib', 'src', filename),
-               join(corelib_dest_dir, target_dir, filename))
-
-  # Next, copy the runtime library source on top of core/runtime
-  for filename in corelib_runtime_sources:
-    if filename.endswith('.dart'):
-      copyfile(join('runtime', 'lib', filename),
-               join(corelib_dest_dir, 'runtime', filename))
-
-  #
-  # At this point, it's time to create lib/core/core*dart .
-  #
-  # construct lib/core_runtime.dart from whole cloth.
-  dest_file = open(join(corelib_dest_dir, 'core_runtime.dart'), 'w')
-  dest_file.write('#library("dart:core");\n')
-  dest_file.write('#import("dart:coreimpl");\n')
-  dest_file.write('#import("dart:math");\n')
-  for filename in corelib_sources:
-    dest_file.write('#source("runtime/' + filename + '");\n')
-  for filename in corelib_runtime_sources:
-    if filename.endswith('.dart'):
-      dest_file.write('#source("runtime/' + filename + '");\n')
-  # include the missing print function
-  dest_file.write('void print(Object arg) { /* native */ }\n')
-  dest_file.close()
-
-  #
-  # Create and populate lib/coreimpl.
-  #
-
-  # First, copy corelib/src/implementation to corelib/runtime.
-  for filename in coreimpl_sources:
-    for target_dir in ['runtime']:
-      copyfile(join('corelib', 'src', 'implementation', filename),
-               join(coreimpl_dest_dir, target_dir, filename))
-
-  for filename in coreimpl_runtime_sources:
-    if filename.endswith('.dart') and not filename.endswith('_patch.dart'):
-      copyfile(join('runtime', 'lib', filename),
-               join(coreimpl_dest_dir, 'runtime', filename))
-
-  # Construct lib/coreimpl/coreimpl_runtime.dart from whole cloth.
-  dest_file = open(join(coreimpl_dest_dir, 'coreimpl_runtime.dart'), 'w')
-  dest_file.write('#library("dart:coreimpl");\n')
-  dest_file.write('#import("dart:math");\n')
-  for filename in coreimpl_sources:
-    dest_file.write('#source("runtime/' + filename + '");\n')
-  for filename in coreimpl_runtime_sources:
-    if filename.endswith('.dart') and not filename.endswith('_patch.dart'):
-      dest_file.write('#source("runtime/' + filename + '");\n')
-  dest_file.close()
-
-
   # Create and copy pkg.
   PKG = join(SDK_tmp, 'pkg')
   os.makedirs(PKG)
 
   #
   # Create and populate pkg/{args, intl, logging, unittest}
   #
 
   for library in ['args', 'intl', 'logging', 'unittest']:
     src_dir = join(HOME, 'pkg', library)
@@ skipping 68 matching lines @@
   if revision is not None:
     with open(os.path.join(SDK_tmp, 'revision'), 'w') as f:
       f.write(revision + '\n')
       f.close()
 
   move(SDK_tmp, SDK)
   utils.Touch(os.path.join(SDK, 'create.stamp'))
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))