Put a snapshot of pub in the SDK.

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/
 # ........utils_wrapper.dart.snapshot
+# ........pub.dart.snapshot
 # ....include/
 # ......dart_api.h
 # ......dart_debugger_api.h
 # ....lib/
 # ......_internal/
 # ......async/
 # ......collection/
 # ......_collection_dev/
 # ......core/
 # ......crypto/
@@ skipping 38 matching lines @@
 from os.path import basename, dirname, join, realpath, exists, isdir
 
 # TODO(dgrove): Only import modules following Google style guide.
 from shutil import copyfile, copymode, copytree, ignore_patterns, rmtree, move
 
 
 def GetOptions():
   options = optparse.OptionParser(usage='usage: %prog [options]')
   options.add_option("--sdk_output_dir",
       help='Where to output the sdk')
-  options.add_option("--utils_snapshot_location",
-      help='Location of the utils snapshot.')
+  options.add_option("--snapshot_location",
+      help='Location of the snapshots.')
   return options.parse_args()
 
 
 def ReplaceInFiles(paths, subs):
   '''Reads a series of files, applies a series of substitutions to each, and
      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)
@@ skipping 19 matching lines @@
   dest = join(dest_dir, basename(src_file) + file_extension)
   Copy(src, dest)
 
 
 def CopyDartScripts(home, sdk_root):
   for executable in ['dart2js', 'dartanalyzer', 'dartdoc', 'pub']:
     CopyShellScript(os.path.join(home, 'sdk', 'bin', executable),
                     os.path.join(sdk_root, 'bin'))
 
 
-def CopySnapshots(snapshot, sdk_root):
-  copyfile(snapshot, join(sdk_root, 'bin', 'snapshots', basename(snapshot)))
+def CopySnapshots(snapshots, sdk_root):
+  for snapshot in ['utils_wrapper', 'pub']:
+    snapshot += '.dart.snapshot'
+    copyfile(join(snapshots, snapshot),
+             join(sdk_root, 'bin', 'snapshots', snapshot))
 
 
 def Main(argv):
   # Pull in all of the gypi files which will be munged into the sdk.
   HOME = dirname(dirname(realpath(__file__)))
 
   (options, args) = GetOptions()
 
   SDK = options.sdk_output_dir
   SDK_tmp = '%s.tmp' % SDK
 
-  SNAPSHOT = options.utils_snapshot_location
+  SNAPSHOT = options.snapshot_location
 
   # 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)
@@ skipping 52 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',
+  for library in [join('_internal', 'compiler'), join('_internal', 'dartdoc'),

[Bob Nystrom, 2013/04/24 16:31:36]

Nit, but I would put each join() on its own line.

[nweiz, 2013/04/24 20:00:46]

Done.

[nweiz, 2013/04/24 20:00:46]

Done.

+                  join('_internal', 'pub', 'resource'),
                   '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', 'typed_data',
                   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'))
+             ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh',
+                                    '.gitignore'))
+
+  # Copy lib/_internal/libraries.dart.
+  copyfile(join(HOME, 'sdk', 'lib', '_internal', 'libraries.dart'),
+           join(LIB, '_internal', 'libraries.dart'))

[Bob Nystrom, 2013/04/24 16:31:36]

What's this about? Is this related to the pub change?

[nweiz, 2013/04/24 20:00:46]

The for loop above used to put everything under _internal into the SDK
automatically. Now it does it on a case-by-case basis, since it needs to exclude
the pub source. copytree won't work on a single file, so we need to explicitly
copy this file in here.

 
   # 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 28 matching lines @@
   # Create and copy dartanalyzer into 'util'
   DARTANALYZER_SRC = join(HOME, build_dir, 'dartanalyzer')
   DARTANALYZER_DEST = join(UTIL, 'dartanalyzer')
   os.makedirs(DARTANALYZER_DEST)
   
   jarFiles = glob.glob(join(DARTANALYZER_SRC, '*.jar'))
   
   for jarFile in jarFiles:
     copyfile(jarFile, join(DARTANALYZER_DEST, os.path.basename(jarFile)))
   
-  PUB_DEST = join(SDK_tmp, 'lib', '_internal', 'pub')
-
-
   # Copy in 7zip for Windows.
   if HOST_OS == 'win32':
     copytree(join(HOME, 'third_party', '7zip'),
-             join(PUB_DEST, 'resource', '7zip'),
+             join(SDK_tmp, 'lib', '_internal', 'pub', 'resource', '7zip'),
              ignore=ignore_patterns('.svn'))
 
-  ReplaceInFiles([
-      join(PUB_DEST, 'lib', 'src', 'io.dart'),
-    ], [
-      ("../../../../third_party/7zip/7za.exe",
-       "resource/7zip/7za.exe"),
-    ])
-
-  # Copy dart2js/dartdoc/pub.
+  # Copy dart2js/dartdoc.

[Bob Nystrom, 2013/04/24 16:31:36]

Update comment.

[nweiz, 2013/04/24 20:00:46]

Done.

   CopyDartScripts(HOME, SDK_tmp)
   CopySnapshots(SNAPSHOT, SDK_tmp)
 
   # Write the 'version' file
   version = utils.GetVersion()
   versionFile = open(os.path.join(SDK_tmp, 'version'), 'w')
   versionFile.write(version + '\n')
   versionFile.close()
 
   # 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()
 
   Copy(join(HOME, 'README.dart-sdk'), join(SDK_tmp, 'README'))
 
   move(SDK_tmp, SDK)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))