Move lib/compiler to pkg/compiler in 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
 # ....include/
 # ......dart_api.h
 # ......dart_debugger_api.h
 # ....lib/
 # ......_internal/
-# ......compiler/
 # ......core/
 # ......coreimpl/
 # ......crypto/
 # ......html/
 # ......io/
 # ......isolate/
 # ......json/
 # ......math/
 # ......mirrors/
 # ......uri/
 # ......utf/
 # ....pkg/
 # ......args/
+# ......compiler/
 # ......dartdoc/
 #.......htmlescape/
 # ......intl/
 # ......logging/
 # ......unittest/
 # ......(more will come here)
 # ....util/
 # ......analyzer/
 # ........dart_analyzer.jar
 # ........(third-party libraries for dart_analyzer)
@@ skipping 45 matching lines @@
   if utils.GuessOS() == 'win32':
     file_extension = '.bat'
 
   src = src_file + file_extension
   dest = join(dest_dir, basename(src_file) + file_extension)
   Copy(src, dest)
 
 
 def CopyDart2Js(build_dir, sdk_root, revision):
   if revision:
-    ReplaceInFiles([os.path.join(sdk_root, 'lib', 'compiler',
+    ReplaceInFiles([os.path.join(sdk_root, 'pkg', 'compiler', 
                                  'implementation', 'compiler.dart')],
                    [(r"BUILD_ID = 'build number could not be determined'",
                      r"BUILD_ID = '%s'" % revision)])
   if utils.GuessOS() == 'win32':
     dart2js = os.path.join(sdk_root, 'bin', 'dart2js.bat')
     Copy(os.path.join(build_dir, 'dart2js.bat'), dart2js)
     dartdoc = os.path.join(sdk_root, 'bin', 'dartdoc.bat')
     Copy(os.path.join(build_dir, 'dartdoc.bat'), dartdoc)
   else:
     dart2js = os.path.join(sdk_root, 'bin', 'dart2js')
     Copy(os.path.join(build_dir, 'dart2js'), dart2js)
     dartdoc = os.path.join(sdk_root, 'bin', 'dartdoc')
     Copy(os.path.join(build_dir, 'dartdoc'), dartdoc)
-    ReplaceInFiles([dart2js, dartdoc],
-                   [(r'\$BIN_DIR/\.\./\.\.', r'$BIN_DIR/..')])
+
+    # TODO(dgrove) - fix this once issue 4788 is addressed.
+    ReplaceInFiles([dart2js],
+                   [(r'\$BIN_DIR/../../lib', r'$BIN_DIR/../pkg')])
+    ReplaceInFiles([dartdoc],
+                   [(r'\$BIN_DIR/../..', r'$BIN_DIR/..')])
 
 
 def Main(argv):
   # Pull in all of the gpyi files which will be munged into the sdk.
   io_runtime_sources = \
     (eval(open("runtime/bin/io_sources.gypi").read()))['sources']
 
   HOME = dirname(dirname(realpath(__file__)))
 
   SDK_tmp = tempfile.mkdtemp()
@@ skipping 77 matching lines @@
     assert filename.endswith('.dart')
     if filename == 'io.dart':
       continue
     dest_file.write('#source("runtime/' + filename + '");\n')
   dest_file.close()
 
   #
   # Create and populate lib/{core, crypto, isolate, json, uri, utf, ...}.
   #
 
-  for library in ['_internal', 'compiler', 'html', 'core', 'coreimpl',
+  for library in ['_internal', 'html', 'core', 'coreimpl',
                   'crypto', 'isolate', 'json', 'math', 'mirrors', 'uri', 'utf']:
     copytree(join(HOME, 'lib', library), join(LIB, library),
              ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh'))
 
-  # TODO(dgrove): fix this really ugly hack
-  ReplaceInFiles(
-        [join(LIB, 'compiler', 'implementation', 'lib', 'io.dart')],
-        [('../../runtime/bin', '../io/runtime')])
 
   # Create and copy pkg.
   PKG = join(SDK_tmp, 'pkg')
   os.makedirs(PKG)
 
   #
   # Create and populate pkg/{args, intl, logging, unittest}
   #
 
   for library in ['args', 'htmlescape', 'dartdoc', 'intl', 'logging', 
                   'unittest']:
     copytree(join(HOME, 'pkg', library), join(PKG, library),
              ignore=ignore_patterns('*.svn', 'doc', 'docs',
                                     '*.py', '*.gypi', '*.sh'))
 
+  # TODO(dgrove): Remove this once issue 4788 is addressed.
+  copytree(join(HOME, 'lib', 'compiler'), join(PKG, 'compiler'),
+             ignore=ignore_patterns('*.svn', 'doc', '*.py', '*.gypi', '*.sh'))
+
+  ReplaceInFiles(
+        [join(LIB, '_internal', 'libraries.dart')],
+        [('"compiler/', '"../pkg/compiler/')])
+
+  ReplaceInFiles(
+        [join(PKG, 'compiler', 'implementation', 'lib', 'io.dart')],
+        [('../../runtime/bin', '../../lib/io/runtime')])
+
   # Fixup dartdoc
   ReplaceInFiles([
       join(PKG, 'dartdoc', 'dartdoc.dart'),
     ], [
       ("final bool IN_SDK = false;",
        "final bool IN_SDK = true;"),
+    ]) 
+
+  # TODO(dgrove): Remove this once issue 4788 is addressed.
+  ReplaceInFiles([
+      join(PKG, 'dartdoc', 'mirrors', 'dart2js_mirror.dart'),
+      join(PKG, 'dartdoc', 'mirrors', 'mirrors_util.dart'),
+      join(PKG, 'dartdoc', 'classify.dart'),
+      join(PKG, 'dartdoc', 'client-live-nav.dart'),
+      join(PKG, 'dartdoc', 'client-static.dart'),
+      join(PKG, 'dartdoc', 'dartdoc.dart'),
+    ], [
+      ("../../lib/compiler",
+       "../../pkg/compiler"),
     ])
 
-
   # Create and copy tools.
   UTIL = join(SDK_tmp, 'util')
   os.makedirs(UTIL)
 
   if ShouldCopyAnalyzer():
     # 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 24 matching lines @@
   if revision is not None:
     with open(os.path.join(SDK_tmp, 'revision'), 'w') as f:
       f.write(revision + '\n')
       f.close()
 
   move(SDK_tmp, SDK)
   utils.Touch(os.path.join(SDK, 'create.stamp'))
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))