Move the dart2js snapshot into bin directory of sdk root.

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
 #
 # The SDK will be used either from the command-line or from the editor.
 # Top structure is
 #
 # ..dart-sdk/
 # ....bin/
 # ......dart or dart.exe (executable)
 # ......dart.lib (import library for VM native extensions on Windows)
 # ......dart2js
 # ......dart_analyzer
 # ......pub
+# ......snapshots/
+# ........dart2js.dart.snapshot
 # ....include/
 # ......dart_api.h
 # ......dart_debugger_api.h
 # ....lib/
 # ......_internal/
 # ......async/
 # ......collection/
 # ......_collection_dev/
 # ......core/
 # ......crypto/
@@ skipping 61 matching lines @@
      using the appropriate platform-specific file extension.'''
   file_extension = ''
   if HOST_OS == 'win32':
     file_extension = '.bat'
 
   src = src_file + file_extension
   dest = join(dest_dir, basename(src_file) + file_extension)
   Copy(src, dest)
 
 
+def CreateSnapshots(build_dir, sdk_root, internal_build_dir):
+  snapshots = [os.path.join(internal_build_dir, 'compiler',
+                            'implementation', 'dart2js.dart')]
+  for snapshot in snapshots:
+    snapshot_name = os.path.join(sdk_root, 'bin', 'snapshots', 
+                                 basename(snapshot) + '.snapshot')
+    subprocess.call([os.path.join(build_dir, 'dart'),

[kustermann, 2013/04/09 15:02:28]

Does this work on windows as well (or do we need to use 'dart.exe' there?

[ricow1, 2013/04/09 15:26:59]

This is using this existing code on with other arguments

+                     '--generate-script-snapshot=%s' %
+                     snapshot_name,

[kustermann, 2013/04/09 15:02:28]

You could move this a line up.

+                     snapshot])
+
+
 def CopyDartScripts(home, build_dir, sdk_root, version):
+  # We create a copy internal that we can use to create the snapshot
+  # with the right version from
+  internal_build_dir = os.path.join(sdk_root, '_internal')
+  if exists(internal_build_dir):
+    rmtree(internal_build_dir);
+  copytree(os.path.join(home, 'sdk', 'lib', '_internal'),
+           internal_build_dir)

[ahe, 2013/04/09 14:37:21]

Did you test that this works?  The relative references in dart2js will be off
when you do this.

I'd rather set the BUILD_ID using a wrapper script around dart2js.  If the
compiler sources are not included in the SDK, they don't need to be patched.  I
think this can simplify this step greatly, and allow us to use the snapshot we
build in dart/utils/compiler/compiler.gyp.

[ricow1, 2013/04/09 15:26:59]

As discussed offline I will change this to a wrapper script, regarding if it
works, remember that this internal_build_dir is _only_ used for creating the
snapshot, the internal references will be relative to the path I give in the
shell script 

+
   if version:
-    ReplaceInFiles([os.path.join(sdk_root, 'lib', '_internal', 'compiler',
+    ReplaceInFiles([os.path.join(internal_build_dir, 'compiler',
                                  'implementation', 'compiler.dart')],
                    [(r"BUILD_ID = 'build number could not be determined'",
                      r"BUILD_ID = '%s'" % version)])
   # TODO(dgrove) - add pub once issue 6619 is fixed
   for executable in ['dart2js', 'dartdoc']:
     CopyShellScript(os.path.join(home, 'sdk', 'bin', executable),
                     os.path.join(sdk_root, 'bin'))
 
-  subprocess.call([os.path.join(build_dir, 'dart'),
-                   '--generate-script-snapshot=%s' %
-                   os.path.join(sdk_root, 'lib', '_internal', 'compiler',
-                                'implementation', 'dart2js.dart.snapshot'),
-                   os.path.join(sdk_root, 'lib', '_internal', 'compiler',
-                                'implementation', 'dart2js.dart')])
-
+  CreateSnapshots(build_dir, sdk_root, internal_build_dir)
+  rmtree(internal_build_dir)
 
 
 def Main(argv):
   # Pull in all of the gpyi files which will be munged into the sdk.

[kustermann, 2013/04/09 15:02:28]

gpyi -> gypi

[ricow1, 2013/04/09 15:26:59]

Done.

   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)
 
   if exists(SDK_tmp):
     rmtree(SDK_tmp)
 
   os.makedirs(SDK_tmp)
 
   # Create and populate sdk/bin.
   BIN = join(SDK_tmp, 'bin')
   os.makedirs(BIN)
+  SNAPSHOTS = join(BIN, 'snapshots')
+  os.makedirs(SNAPSHOTS)
 
   # Copy the Dart VM binary and the Windows Dart VM link library
   # into sdk/bin.
   #
   # TODO(dgrove) - deal with architectures that are not ia32.
   build_dir = os.path.dirname(argv[1])
   dart_file_extension = ''
   analyzer_file_extension = ''
   if HOST_OS == 'win32':
     dart_file_extension = '.exe'
@@ skipping 40 matching lines @@
   #
 
   LIB = join(SDK_tmp, 'lib')
   os.makedirs(LIB)
 
   #
   # Create and populate lib/{core, crypto, isolate, json, uri, utf, ...}.
   #
 
   os.makedirs(join(LIB, 'html'))
-  for library in ['_internal', 'async', 'collection', '_collection_dev', 'core',
+
+  # Remove _internal/compiler/implementation/lib when we can add that
+  # as part of the dart2js snapshot.
+  for library in ['_internal/compiler/implementation/lib',
+                  'async', 'collection', '_collection_dev', 'core',
                   'crypto', 'io', 'isolate',
                   join('chrome', 'dart2js'), join('chrome', 'dartium'),
                   join('html', 'dart2js'), join('html', 'dartium'),
                   join('html', 'html_common'),
                   join('indexed_db', 'dart2js'), join('indexed_db', 'dartium'),
                   'json', 'math', 'mirrors', 'typeddata',
                   join('svg', 'dart2js'), join('svg', 'dartium'),
                   'uri', 'utf',
                   join('web_audio', 'dart2js'), join('web_audio', 'dartium'),
                   join('web_gl', 'dart2js'), join('web_gl', 'dartium'),
                   join('web_sql', 'dart2js'), join('web_sql', 'dartium')]:
     copytree(join(HOME, 'sdk', 'lib', library), join(LIB, library),
              ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh'))
 
+  # Remove this once we can add it as part of the dart2js snapshot.

[ahe, 2013/04/09 14:37:21]

The Editor will still need it.

+  copyfile(join(HOME, 'sdk', 'lib', '_internal', 'libraries.dart'),
+           join(LIB, '_internal', 'libraries.dart'))
 
   # Create and copy packages.
   PACKAGES = join(SDK_tmp, 'packages')
   os.makedirs(PACKAGES)
 
   #
   # Create and populate packages/{args, intl, logging, meta, unittest, ...}
   #
 
   for library in ['args', 'http', 'intl', 'logging', 'meta', 'oauth2', 'pathos',
@@ 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))