Move pub into sdk/lib/_internal.

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 35 matching lines @@
 # ......meta/
 # ......serialization
 # ......unittest/
 # ......(more will come here)
 # ....util/
 # ......analyzer/
 # ........dart_analyzer.jar
 # ......dartanalyzer/
 # ........dartanalyzer.jar
 # ........(third-party libraries for dart_analyzer)
-# ......pub/
 # ......(more will come here)
 
 
 import glob
 import optparse
 import os
 import re
 import sys
 import subprocess
 import tempfile
@@ skipping 41 matching lines @@
   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 CopyDartScripts(home, sdk_root):
-  # TODO(dgrove) - add pub once issue 6619 is fixed
-  for executable in ['dart2js', 'dartanalyzer', 'dartdoc']:
+  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 Main(argv):
   # Pull in all of the gypi files which will be munged into the sdk.
@@ skipping 47 matching lines @@
 
   # Copy analyzer into sdk/bin
   ANALYZER_HOME = join(HOME, build_dir, 'analyzer')
   dart_analyzer_src_binary = join(ANALYZER_HOME, 'bin',
       'dart_analyzer' + analyzer_file_extension)
   dart_analyzer_dest_binary = join(BIN,
       'dart_analyzer' + analyzer_file_extension)
   copyfile(dart_analyzer_src_binary, dart_analyzer_dest_binary)
   copymode(dart_analyzer_src_binary, dart_analyzer_dest_binary)
 
-  # Create pub shell script.
-  # TODO(dgrove) - delete this once issue 6619 is fixed
-  pub_src_script = join(HOME, 'utils', 'pub', 'sdk', 'pub')
-  CopyShellScript(pub_src_script, BIN)
-
   #
   # Create and populate sdk/include.
   #
   INCLUDE = join(SDK_tmp, 'include')
   os.makedirs(INCLUDE)
   copyfile(join(HOME, 'runtime', 'include', 'dart_api.h'),
            join(INCLUDE, 'dart_api.h'))
   copyfile(join(HOME, 'runtime', 'include', 'dart_debugger_api.h'),
            join(INCLUDE, 'dart_debugger_api.h'))
 
@@ skipping 66 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)))
   
-  # Create and populate util/pub.
-  copytree(join(HOME, 'utils', 'pub'), join(UTIL, 'pub'),
-           ignore=ignore_patterns('.svn', 'sdk'))
+  PUB_DEST = join(SDK_tmp, 'lib', '_internal', 'pub')
+
 
   # Copy in 7zip for Windows.
   if HOST_OS == 'win32':
     copytree(join(HOME, 'third_party', '7zip'),
-             join(join(UTIL, 'pub'), '7zip'),
+             join(PUB_DEST, 'resource', '7zip'),
              ignore=ignore_patterns('.svn'))
 
   ReplaceInFiles([
-      join(UTIL, 'pub', 'io.dart'),
+      join(PUB_DEST, 'lib', 'src', 'io.dart'),
     ], [
-      ("../../third_party/7zip/7za.exe",
-       "7zip/7za.exe"),
+      ("../../../../third_party/7zip/7za.exe",
+       "resource/7zip/7za.exe"),
     ])
 
   # Copy dart2js/dartdoc/pub.
   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))