Switch pkg packages, pub, and dartdoc to use package: imports.

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 20 matching lines @@
 # ......html/
 # ......io/
 # ......isolate/
 # ......json/
 # ......math/
 # ......mirrors/
 # ......uri/
 # ......utf/
 # ......scalarlist/
 # ......typeddata/
-# ....pkg/
+# ....packages/

[Bob Nystrom, 2013/03/26 01:55:44]

Can you run this by Dan too? I'm going to guess he'd prefer this be
lib/_internal/packages.

[nweiz, 2013/03/26 02:09:53]

He's already a reviewer.

 # ......args/
 # ......intl/
 # ......logging/
 # ......meta/
 # ......serialization
 # ......unittest/
 # ......(more will come here)
 # ....util/
 # ......analyzer/
 # ........dart_analyzer.jar
@@ skipping 156 matching lines @@
                   join('indexed_db', 'dart2js'), join('indexed_db', 'dartium'),
                   'json', 'math', 'mirrors', 'scalarlist', 'typeddata',
                   join('svg', 'dart2js'), join('svg', 'dartium'),
                   'uri', 'utf',
                   join('web_audio', 'dart2js'), join('web_audio', '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'))
 
 
-  # Create and copy pkg.
-  PKG = join(SDK_tmp, 'pkg')
-  os.makedirs(PKG)
+  # Create and copy packages.
+  PACKAGES = join(SDK_tmp, 'packages')
+  os.makedirs(PACKAGES)
 
   #
-  # Create and populate pkg/{args, intl, logging, meta, unittest, ...}
+  # Create and populate packages/{args, intl, logging, meta, unittest, ...}
   #
 
   for library in ['args', 'http', 'intl', 'logging', 'meta', 'oauth2', 'pathos',
                   'serialization', 'unittest', 'yaml']:
 
-    copytree(join(HOME, 'pkg', library), join(PKG, library),
-             ignore=ignore_patterns('*.svn', 'doc', 'docs',
-                                    '*.py', '*.gypi', '*.sh', 'packages'))
+    copytree(join(HOME, 'pkg', library, 'lib'), join(PACKAGES, library))
 
   # Create and copy tools.
   UTIL = join(SDK_tmp, 'util')
   os.makedirs(UTIL)
 
   # Create and copy Analyzer library into 'util'
   ANALYZER_DEST = join(UTIL, 'analyzer')
   os.makedirs(ANALYZER_DEST)
 
   analyzer_src_jar = join(ANALYZER_HOME, 'util', 'analyzer',
@@ skipping 33 matching lines @@
   # Copy dart2js/dartdoc/pub.
   CopyDartScripts(HOME, build_dir, SDK_tmp, version)
 
   # Fix up dartdoc.
   # TODO(dgrove): Remove this once issue 6619 is fixed.
   ReplaceInFiles([join(SDK_tmp, 'lib', '_internal', 'dartdoc',
                        'bin', 'dartdoc.dart'),
                   join(SDK_tmp, 'lib', '_internal', 'dartdoc',
                        'lib', 'universe_serializer.dart')], [
                   ("../../../../../pkg/args/lib/args.dart",
-                   "../../../../pkg/args/lib/args.dart"),
+                   "package:args/args.dart"),
                   ("../../../../../pkg/pathos/lib/path.dart",
-                   "../../../../pkg/pathos/lib/path.dart"),
+                   "package:pathos/path.dart"),

[Bob Nystrom, 2013/03/26 01:55:44]

Are these even still necessary?

[nweiz, 2013/03/26 02:09:53]

Good point, they are not.

                  ])
 
   # Write the 'version' file
   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))