Shoehorn dart2js into the SDK.

dart/tools/create_sdk.py

Index: dart/tools/create_sdk.py
diff --git a/dart/tools/create_sdk.py b/dart/tools/create_sdk.py
index 4c573d80acf0c17927ef188f95957b2f3f22f0bc..a219a548bb6e9595a0adf5393943b711ffe55867 100755
--- a/dart/tools/create_sdk.py
+++ b/dart/tools/create_sdk.py
@@ -74,6 +74,33 @@ def ReplaceInFiles(paths, subs):
     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 = \
@@ -424,6 +451,8 @@ def Main(argv):
     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: