Shoehorn dart2js into the SDK.

dart/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 56 matching lines @@
      saves them back out. subs should by a list of (pattern, replace) tuples.'''
   for path in paths:
     contents = open(path).read()
     for pattern, replace in subs:
       contents = re.sub(pattern, replace, contents)
 
     dest = open(path, 'w')
     dest.write(contents)
     dest.close()
 
+
+def Copy(src, dest):
+  copyfile(src, dest)
+  copymode(src, dest)
+
+
+def CopyDart2Js(build_dir, sdk_root):

[kasperl, 2012/05/01 05:51:07]

Maybe add a comment that explains what you're copying. It looks like you're
(temporarily?) copying too much to make it easier to deal with?

[ahe, 2012/05/02 10:32:17]

Done.

+  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'))

[dgrove, 2012/05/01 06:54:58]

This approach generally looks orthogonal to the way things are arranged in the
SDK today.  Even if we're going to clean up the SDK over time, it would be
better to have these fit in with the SDK as it stands to (e.g.,
lib/core/dart2js/...) 

[dgrove, 2012/05/01 06:54:58]

What are you doing about the html and isolate libraries?
 

[ahe, 2012/05/02 10:32:17]

I'm copying dart/lib to PRODUCT_DIR/dart-sdk/lib/dart2js/lib.

[ahe, 2012/05/02 10:32:17]

I thought the plan was to shuffle directories around in our repository so we can
use the same layout in both SDK and source repository. I'm not aware of which
direction we're going in, but I strongly prefer to not have to temporarily move
files around and rewrite URIs.

+  dart2js = os.path.join(sdk_root, 'bin', 'dart2js')

[kasperl, 2012/05/01 05:51:07]

Shouldn't this be different on Windows? Don't you need to copy the .bat file
instead there? Adding a TODO would probably be fine unless this breaks our
testing on Windows.

[ahe, 2012/05/02 10:32:17]

I think I'll break Windows if I don't create the BAT file as well.

+  Copy(os.path.join(build_dir, 'dart2js'), dart2js)
+
+  ReplaceInFiles([dart2js],
+                 [(r'\$BIN_DIR/\.\./\.\./lib',
+                   r'$BIN_DIR/../lib/dart2js/lib')])
+
+
+
 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']
@@ skipping 330 matching lines @@
 
 
   # Copy import maps
   PLATFORMS = ['any', 'vm', 'dartium', 'dart2js', 'frog' ]
   os.makedirs(join(LIB, 'config'))
   for platform in PLATFORMS:
     import_src = join(HOME, 'lib', 'config', 'import_' + platform + '.config')
     import_dst = join(LIB, 'config', 'import_' + platform + '.config')
     copyfile(import_src, import_dst);
 
+  CopyDart2Js(build_dir, SDK_tmp)
+
   # Write the 'revision' file
   revision = utils.GetSVNRevision()
   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))