Move lib/compiler to pkg/compiler in SDK

tools/create_sdk.py

Index: tools/create_sdk.py
===================================================================
--- tools/create_sdk.py	(revision 11985)
+++ tools/create_sdk.py	(working copy)
@@ -23,7 +23,6 @@
 # ......dart_debugger_api.h
 # ....lib/
 # ......_internal/
-# ......compiler/
 # ......core/
 # ......coreimpl/
 # ......crypto/
@@ -38,6 +37,7 @@
 # ......web/
 # ....pkg/
 # ......args/
+# ......compiler/
 # ......dartdoc/
 # ......intl/
 # ......logging/
@@ -102,7 +102,7 @@
 
 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)])
@@ -111,7 +111,7 @@
     Copy(os.path.join(build_dir, 'dart2js.bat'), dart2js)
     ReplaceInFiles([dart2js],
                    [(r'%SCRIPTPATH%\.\.\\lib',
-                     r'%SCRIPTPATH%..\lib')])
+                     r'%SCRIPTPATH%..\pkg')])
     dartdoc = os.path.join(sdk_root, 'bin', 'dartdoc.bat')
     Copy(os.path.join(build_dir, 'dartdoc.bat'), dartdoc)
   else:
@@ -119,7 +119,7 @@
     Copy(os.path.join(build_dir, 'dart2js'), dart2js)
     ReplaceInFiles([dart2js],
                    [(r'\$BIN_DIR/\.\./\.\./lib',
-                     r'$BIN_DIR/../lib')])
+                     r'$BIN_DIR/../pkg')])
     dartdoc = os.path.join(sdk_root, 'bin', 'dartdoc')
     Copy(os.path.join(build_dir, 'dartdoc'), dartdoc)
 
@@ -219,16 +219,12 @@
   # 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',
                   'web']:
     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')
@@ -243,6 +239,18 @@
              ignore=ignore_patterns('*.svn', 'doc', 'docs',
                                     '*.py', '*.gypi', '*.sh'))
 
+  # TODO(dgrove): fix this really ugly hack.
+  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/')])

[danrubel, 2012/09/06 21:49:42]

If its not in the "lib" directory then it should not be in the "libraries.dart"
file

+
+  ReplaceInFiles(
+        [join(PKG, 'compiler', 'implementation', 'lib', 'io.dart')],
+        [('../../runtime/bin', '../../lib/io/runtime')])
+
   # Fixup dartdoc
   ReplaceInFiles([
       join(PKG, 'dartdoc', 'dartdoc.dart'),