Revert "Fix build so we can make a Windows SDK!" (tbr)

tools/create_sdk.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2011, 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)
 # ......frogc.dart
 # ......frogsh (coming later)
 # ....lib/
 # ......builtin/
 # ........builtin_runtime.dart
 # ........runtime/
 # ......core/
-# ........core_{frog, runtime}.dart
-# ........{frog, runtime}/ 
+# ........core_{compiler, frog, runtime}.dart
+# ........{compiler, frog, runtime}/ 
 # ......coreimpl/
-# ........coreimpl_{frog, runtime}.dart
-# ........{frog, runtime}/ 
+# ........coreimpl_{compiler, frog, runtime}.dart
+# ........{compiler, frog, runtime}/ 
 # ......dom/
 # ........dom.dart
 # ......frog/
 # ......html/ 
 # ........html.dart
 # ......htmlimpl/ 
 # ........htmlimpl.dart
 # ......json/
-# ........json_{frog}.dart
-# ........{frog}/
+# ........json_{compiler, frog}.dart
+# ........{compiler, frog}/
 # ......(more will come here - io, etc)
 # ....util/
 # ......dartdoc/
 # ......(more will come here)
 
 
 
 import os
 import re
 import sys
 import tempfile
 import utils
 
 from os.path import dirname, join, realpath, exists, isdir
 from shutil import copyfile, copymode, copytree, ignore_patterns, rmtree, move
 
 def Main(argv):
   # Pull in all of the gpyi files which will be munged into the sdk.
   builtin_runtime_sources = \
     (eval(open("runtime/bin/builtin_sources.gypi").read()))['sources']
   corelib_sources = \
     (eval(open("corelib/src/corelib_sources.gypi").read()))['sources']
   corelib_frog_sources = \
     (eval(open("frog/lib/frog_corelib_sources.gypi").read()))['sources']
   corelib_runtime_sources = \
     (eval(open("runtime/lib/lib_sources.gypi").read()))['sources']
+  corelib_compiler_sources =  \
+    (eval(open("compiler/compiler_corelib_sources.gypi").read())) \
+    ['variables']['compiler_corelib_resources']
   coreimpl_sources = \
     (eval(open("corelib/src/implementation/corelib_impl_sources.gypi").read()))\
     ['sources']
   coreimpl_frog_sources = \
     (eval(open("frog/lib/frog_coreimpl_sources.gypi").read()))['sources']
   coreimpl_runtime_sources = \
     (eval(open("runtime/lib/lib_impl_sources.gypi").read()))['sources']
+  json_compiler_sources = \
+    (eval(open("compiler/jsonlib_sources.gypi").read())) \
+    ['variables']['jsonlib_resources']
   json_frog_sources = \
     (eval(open("frog/lib/frog_json_sources.gypi").read()))['sources']
 
   HOME = dirname(dirname(realpath(__file__)))
 
   SDK_tmp = tempfile.mkdtemp()
   SDK = argv[1]
 
   # TODO(dgrove) - deal with architectures that are not ia32.
 
   if exists(SDK):
     rmtree(SDK)
 
   # Create and populate sdk/bin.
   BIN = join(SDK_tmp, 'bin')
   os.makedirs(BIN)
 
   # Copy the Dart VM binary into sdk/bin.
   # TODO(dgrove) - deal with architectures that are not ia32.
   build_dir = os.path.dirname(argv[1])
-  frogc_file_extension = ''
-  dart_file_extension = ''
+  frogc_src_binary = join(HOME, 'frog', 'frogc')
+  frogc_dest_binary = join(BIN, 'frogc')
   if utils.GuessOS() == 'win32':
-    dart_file_extension = '.exe'
-    frogc_file_extension = '.bat'
-  dart_src_binary = join(HOME, build_dir, 'dart' + dart_file_extension)
-  dart_dest_binary = join(BIN, 'dart' + dart_file_extension)
-  frogc_src_binary = join(HOME, 'frog', 'frogc' + frogc_file_extension)
-  frogc_dest_binary = join(BIN, 'frogc' + frogc_file_extension)
+    # TODO(dgrove) - deal with frogc.bat
+    dart_src_binary = join(HOME, build_dir, 'dart.exe')
+    dart_dest_binary = join(BIN, 'dart.exe')
+  else:
+    dart_src_binary = join(HOME, build_dir, 'dart')
+    dart_dest_binary = join(BIN, 'dart')
   copyfile(dart_src_binary, dart_dest_binary)
   copymode(dart_src_binary, dart_dest_binary)
   copyfile(frogc_src_binary, frogc_dest_binary)
   copymode(frogc_src_binary, frogc_dest_binary)
 
   # Create sdk/bin/frogc.dart, and hack as needed.
   frog_src_dir = join(HOME, 'frog')
 
   # Convert frogc.dart's imports from import('*') -> import('frog/*').
   frogc_contents = open(join(frog_src_dir, 'frogc.dart')).read()
   frogc_dest = open(join(BIN, 'frogc.dart'), 'w')
   frogc_dest.write(
     re.sub("#import\('", "#import('../lib/frog/", frogc_contents))
   frogc_dest.close()
 
   # TODO(dgrove): copy and fix up frog.dart, minfrogc.dart.
 
   #
   # Create and populate sdk/lib.
   #
 
   LIB = join(SDK_tmp, 'lib')
   os.makedirs(LIB)
   corelib_dest_dir = join(LIB, 'core')
   os.makedirs(corelib_dest_dir)
+  os.makedirs(join(corelib_dest_dir, 'compiler'))
   os.makedirs(join(corelib_dest_dir, 'frog'))
   os.makedirs(join(corelib_dest_dir, 'runtime'))
 
   coreimpl_dest_dir = join(LIB, 'coreimpl')
   os.makedirs(coreimpl_dest_dir)
+  os.makedirs(join(coreimpl_dest_dir, 'compiler'))
   os.makedirs(join(coreimpl_dest_dir, 'frog'))
   os.makedirs(join(coreimpl_dest_dir, 'frog', 'node'))
   os.makedirs(join(coreimpl_dest_dir, 'runtime'))
 
 
   #
   # Create and populate lib/runtime.
   #
   builtin_dest_dir = join(LIB, 'builtin')
   os.makedirs(builtin_dest_dir)
@@ skipping 54 matching lines @@
     copytree(join(html_src_dir, 'src'), join(target_dir, 'src'),
              ignore=ignore_patterns('.svn'))
     copytree(join(html_src_dir, 'generated'), join(target_dir, 'generated'),
              ignore=ignore_patterns('.svn'))
 
 
   #
   # Create and populate lib/json.
   #
   json_dest_dir = join(LIB, 'json')
+  json_compiler_dest_dir = join(LIB, 'json', 'compiler')
   os.makedirs(json_dest_dir)
+  os.makedirs(json_compiler_dest_dir)
 
   for filename in json_frog_sources:
     copyfile(join(HOME, 'frog', 'lib', filename), 
              join(json_dest_dir, filename))
- 
+
+  for filename in json_compiler_sources:
+    copyfile(join(HOME, 'compiler', filename),
+             join(json_compiler_dest_dir, os.path.basename(filename)))
+
+  # Create json_compiler.dart from whole cloth.
+  dest_file = open(join(LIB, 'json', 'json_compiler.dart'), 'w')
+  dest_file.write('#library("dart:json");\n')
+  dest_file.write('#import("compiler/json.dart");\n')
+  dest_file.close()
+      
   #
   # Create and populate lib/dom.
   #
   dom_src_dir = join(HOME, 'client', 'dom')
   dom_dest_dir = join(LIB, 'dom')
   os.makedirs(dom_dest_dir)
 
   for filename in os.listdir(dom_src_dir):
     src_file = join(dom_src_dir, filename)
     dest_file = join(dom_dest_dir, filename)
     if filename.endswith('.dart') or filename.endswith('.js'):
       copyfile(src_file, dest_file)
     elif isdir(src_file):
       if filename not in ['benchmarks', 'idl', 'scripts', 'snippets', '.svn']:
         copytree(src_file, dest_file, 
                  ignore=ignore_patterns('.svn', 'interface', 'wrapping', 
                                         '*monkey*'))
 
   #
   # Create and populate lib/core.
   #
 
-  # First, copy corelib/* to lib/{frog, runtime}
+  # First, copy corelib/* to lib/{compiler, frog, runtime}
   for filename in corelib_sources:
-    for target_dir in ['frog', 'runtime']:
+    for target_dir in ['compiler', 'frog', 'runtime']:
       copyfile(join('corelib', 'src', filename), 
                join(corelib_dest_dir, target_dir, filename))
 
+  # Next, copy the compiler sources on top of {core,coreimpl}/compiler
+  for filename in corelib_compiler_sources:
+    if filename.endswith('.dart'):
+      filename = re.sub('lib/','', filename)
+      if (not filename.startswith('implementation/') and
+          not filename.startswith('corelib')):
+        copyfile(join('compiler', 'lib', filename), 
+                 join(corelib_dest_dir, 'compiler', filename))
+
   # Next, copy the frog library source on top of core/frog
   # TOOD(dgrove): move json to top-level
   for filename in corelib_frog_sources:
     copyfile(join('frog', 'lib', filename), 
              join(corelib_dest_dir, 'frog', filename))
 
   # Next, copy the runtime library source on top of core/runtime
   for filename in corelib_runtime_sources:
     if filename.endswith('.dart'):
       copyfile(join('runtime', 'lib', filename), 
@@ skipping 15 matching lines @@
   dest_file = open(join(corelib_dest_dir, 'core_runtime.dart'), 'w')
   dest_file.write('#library("dart:core");\n')
   dest_file.write('#import("dart:coreimpl");\n')
   for filename in corelib_sources:
     dest_file.write('#source("runtime/' + filename + '");\n')
   for filename in corelib_runtime_sources:
     if filename.endswith('.dart'):
       dest_file.write('#source("runtime/' + filename + '");\n')
   dest_file.close()
 
+  # construct lib/core_compiler.dart from whole cloth.
+  dest_file = open(join(corelib_dest_dir, 'core_compiler.dart'), 'w')
+  dest_file.write('#library("dart:core");\n')
+  dest_file.write('#import("dart:coreimpl");\n')
+  for filename in os.listdir(join(corelib_dest_dir, 'compiler')):
+    dest_file.write('#import("compiler/' + filename + '");\n')
+  dest_file.close()
+
   #
   # Create and populate lib/coreimpl.
   #
 
-  # First, copy corelib/src/implementation to corelib/{frog, runtime}.
+  # First, copy corelib/src/implementation to corelib/{compiler, frog, runtime}.
   for filename in coreimpl_sources:
-    for target_dir in ['frog', 'runtime']:
+    for target_dir in ['compiler', 'frog', 'runtime']:
       copyfile(join('corelib', 'src', 'implementation', filename), 
                join(coreimpl_dest_dir, target_dir, filename))
 
+  # Next, copy {compiler, frog, runtime}-specific implementations.
+  for filename in corelib_compiler_sources:
+    if (filename.endswith(".dart")):
+      if filename.startswith("lib/implementation/"):
+        filename = os.path.basename(filename)
+        copyfile(join('compiler', 'lib', 'implementation', filename), 
+                 join(coreimpl_dest_dir, 'compiler', filename))
+
   for filename in coreimpl_frog_sources:
     copyfile(join('frog', 'lib', filename), 
              join(coreimpl_dest_dir, 'frog', filename))
 
   for filename in coreimpl_runtime_sources:
     if filename.endswith('.dart'):
       copyfile(join('runtime', 'lib', filename), 
                join(coreimpl_dest_dir, 'runtime', filename))
 
   
@@ skipping 10 matching lines @@
   # Construct lib/coreimpl/coreimpl_runtime.dart from whole cloth.
   dest_file = open(join(coreimpl_dest_dir, 'coreimpl_runtime.dart'), 'w')
   dest_file.write('#library("dart:coreimpl");\n')
   for filename in coreimpl_sources:
     dest_file.write('#source("runtime/' + filename + '");\n')
   for filename in coreimpl_runtime_sources:
     if filename.endswith('.dart'):
       dest_file.write('#source("runtime/' + filename + '");\n')
   dest_file.close()
 
+  # construct lib/coreimpl_compiler.dart from whole cloth.
+  dest_file = open(join(coreimpl_dest_dir, 'coreimpl_compiler.dart'), 'w')
+  dest_file.write('#library("dart:coreimpl");\n')
+  for filename in os.listdir(join(coreimpl_dest_dir, 'compiler')):
+    dest_file.write('#import("compiler/' + filename + '");\n')
+  dest_file.close()
+
   # Create and copy tools.
 
   UTIL = join(SDK_tmp, 'util')
   os.makedirs(UTIL)
 
   copytree(join(HOME, 'utils', 'dartdoc'), join(UTIL, 'dartdoc'), 
            ignore=ignore_patterns('.svn'))
 
   move(SDK_tmp, SDK)
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))