Remove frog from the SDK and stop running it from the editor.

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)
 # ......dart.lib (import library for VM native extensions on Windows)
-# ......frogc.dart
+# ......dart2js
 # ......pub
 # ....include/
 # ......dart_api.h
 # ......dart_debugger_api.h
 # ....lib/
 # ......builtin/
 # ........builtin_runtime.dart
 # ......io/
 # ........io_runtime.dart
 # ........runtime/
+# ......compiler/
 # ......core/
 # ........core_{frog, runtime}.dart
 # ........{frog, runtime}/
 # ......coreimpl/
 # ........coreimpl_{frog, runtime}.dart
 # ........{frog, runtime}/
+# ......dart2js/
 # ......dartdoc/
 # ......isolate/
 # ........isolate_{frog, runtime}.dart
 # ........{frog, runtime}/
 # ......dom/
 # ........dom.dart
-# ......frog/
 # ......html/
 # ........html_frog.dart
 # ........html_dartium.dart
 # ......crypto/
 # ........crypto.dart
 # ........(implementation files)
 # ......json/
 # ........json_frog.dart
 #.........json.dart
 # ........{frog}/
@@ skipping 112 matching lines @@
 
   # 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, frogc and Windows dart VM link library
+  # Copy the Dart VM binary and the Windows Dart VM link library
   # into sdk/bin.
   #
   # TODO(dgrove) - deal with architectures that are not ia32.
   build_dir = os.path.dirname(argv[1])
   dart_file_extension = ''
   if utils.GuessOS() == 'win32':
     dart_file_extension = '.exe'
     dart_import_lib_src = join(HOME, build_dir, 'dart.lib')
     dart_import_lib_dest = join(BIN, 'dart.lib')
     copyfile(dart_import_lib_src, dart_import_lib_dest)
   dart_src_binary = join(HOME, build_dir, 'dart' + dart_file_extension)
   dart_dest_binary = join(BIN, 'dart' + dart_file_extension)
   copyfile(dart_src_binary, dart_dest_binary)
   copymode(dart_src_binary, dart_dest_binary)
 
-  frogc_src_binary = join(HOME, 'frog', 'scripts', 'bootstrap', 'frogc')
-  CopyShellScript(frogc_src_binary, BIN)
-
-  # 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(r"#import\('([^.])", r"#import('../lib/frog/\1", frogc_contents))
-  frogc_dest.close()
-
   # Create pub shell script.
   pub_src_script = join(HOME, 'utils', 'pub', 'sdk', 'pub')
   CopyShellScript(pub_src_script, BIN)
 
-  # TODO(dgrove): copy and fix up frog.dart, minfrogc.dart.
-
   #
   # 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'))
 
   #
   # 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, '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, 'frog'))
-  os.makedirs(join(coreimpl_dest_dir, 'frog', 'node'))
   os.makedirs(join(coreimpl_dest_dir, 'runtime'))
 
 
   #
   # Create and populate lib/builtin.
   #
   builtin_dest_dir = join(LIB, 'builtin')
   os.makedirs(builtin_dest_dir)
   assert len(builtin_runtime_sources) == 1
   assert builtin_runtime_sources[0] == 'builtin.dart'
@@ skipping 42 matching lines @@
   copytree(compiler_src_dir, compiler_dest_dir, ignore=ignore_patterns('.svn'))
 
   # Remap imports in lib/compiler/* .
   for (dirpath, subdirs, filenames) in os.walk(compiler_dest_dir):
     for filename in filenames:
       if filename.endswith('.dart'):
         filename = join(dirpath, filename)
         file_contents = open(filename).read()
         file = open(filename, 'w')
         file_contents = re.sub(r"\.\./lib", "..", file_contents)
-        file_contents = re.sub(r"\.\./frog/", "frog/", file_contents)
         file.write(file_contents)
         file.close()
 
   #
-  # Create and populate lib/frog.
-  #
-  # TODO(dgrove): Frog is not a dart library and should not live in lib.
-  #
-  frog_dest_dir = join(LIB, 'frog')
-  os.makedirs(frog_dest_dir)
-
-  for filename in os.listdir(frog_src_dir):
-    if filename == 'frog_options.dart':
-      # change config from 'dev' to 'sdk' in frog_options.dart
-      frog_options_contents = open(join(frog_src_dir, filename)).read()
-      frog_options_dest = open(join(frog_dest_dir, filename), 'w')
-      frog_options_dest.write(re.sub("final config = \'dev\';",
-                                     "final config = \'sdk\';",
-                                     frog_options_contents))
-      frog_options_dest.close()
-    elif filename.endswith('.dart'):
-      copyfile(join(frog_src_dir, filename), join(frog_dest_dir, filename))
-
-
-  copytree(join(frog_src_dir, 'server'), join(frog_dest_dir, 'server'),
-           ignore=ignore_patterns('.svn'))
-
-  # Remap imports in frog/... .
-  for (dirpath, subdirs, filenames) in os.walk(frog_dest_dir):
-    for filename in filenames:
-      if filename.endswith('.dart'):
-        file_contents = open(join(dirpath, filename)).read()
-        file = open(join(dirpath, filename), 'w')
-        file.write(re.sub(r"\.\./lib/", "../", file_contents))
-        file.close()
-
-  #
   # Create and populate lib/html.
   #
   html_src_dir = join(HOME, 'lib', 'html')
   html_dest_dir = join(LIB, 'html')
   os.makedirs(html_dest_dir)
 
   copyfile(join(html_src_dir, 'frog', 'html_frog.dart'),
            join(html_dest_dir, 'html_frog.dart'))
   copyfile(join(html_src_dir, 'dartium', 'html_dartium.dart'),
            join(html_dest_dir, 'html_dartium.dart'))
@@ skipping 21 matching lines @@
 
     for filename in os.listdir(src_dir):
       if filename.endswith('.dart'):
         copyfile(join(src_dir, filename), join(dest_dir, filename))
 
   # Create and populate lib/dartdoc
   dartdoc_src_dir = join(HOME, 'lib', 'dartdoc')
   dartdoc_dest_dir = join(LIB, 'dartdoc')
   copytree(dartdoc_src_dir, dartdoc_dest_dir,
            ignore=ignore_patterns('.svn', 'docs'))
-  ReplaceInFiles([
+
+  # Copy frog into lib/dartdoc and fixup dependencies.
+  # TODO(johnniwinther): This should not be necessary long term.
+  frog_src_dir = join(HOME, 'frog')
+  frog_dest_dir = join(dartdoc_dest_dir, 'frog')
+  os.makedirs(frog_dest_dir)
+  for filename in os.listdir(frog_src_dir):
+    if filename == 'frog_options.dart':
+      # Change config from 'dev' to 'sdk' in frog_options.dart.
+      frog_options_contents = open(join(frog_src_dir, filename)).read()
+      frog_options_dest = open(join(frog_dest_dir, filename), 'w')
+      frog_options_dest.write(re.sub("final config = \'dev\';",
+                                     "final config = \'sdk\';",
+                                     frog_options_contents))
+      frog_options_dest.close()
+    elif filename.endswith('.dart'):
+      dest = join(frog_dest_dir, filename)
+      copyfile(join(frog_src_dir, filename), dest)
+      ReplaceInFiles([dest], [("../lib/", "../../")])
+    ReplaceInFiles([
       join(LIB, 'dartdoc', 'dartdoc.dart')
     ], [
-      ("#import\('../../frog", "#import('../frog"),
+      ("#import\('../../frog",
+          "#import('frog"),
       ("joinPaths\(scriptDir, '../../frog/'\)",
-          "joinPaths(scriptDir, '../frog/')"),
-      ("joinPaths\(frogPath, 'lib'\)", "joinPaths(frogPath, '..')"),
+          "joinPaths(scriptDir, 'frog/')"),
+      ("joinPaths\(frogPath, 'lib'\)",
+          "joinPaths(scriptDir, '../')"),
       ("joinPaths\(frogPath, 'minfrog'\)",
-          "joinPaths(scriptDir, '../../bin/frogc')")
+          "joinPaths(scriptDir, '../../bin/dart2js')"),
     ])
   ReplaceInFiles([
       join(LIB, 'dartdoc', 'classify.dart'),
       join(LIB, 'dartdoc', 'client-live-nav.dart'),
       join(LIB, 'dartdoc', 'client-static.dart')
     ], [
-      ("#import\('../../frog", "#import('../frog")
+      ("#import\('../../frog", "#import('frog")
     ])
 
   # Create and populate lib/isolate
   copytree(join(HOME, 'lib', 'isolate'), join(LIB, 'isolate'),
            ignore=ignore_patterns('.svn'))
 
   isolate_runtime_dir = join(LIB, 'isolate', 'runtime')
   # path seems to exist when run locally, but not on builder
   if not exists(isolate_runtime_dir):
     os.makedirs(isolate_runtime_dir)
@@ skipping 83 matching lines @@
   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()
 
   # Create and copy tools.
-
   UTIL = join(SDK_tmp, 'util')
   os.makedirs(UTIL)
 
-  # Create and populate util/pub
+  # Create and populate util/pub.
   pub_src_dir = join(HOME, 'utils', 'pub')
   pub_dst_dir = join(UTIL, 'pub')
   copytree(pub_src_dir, pub_dst_dir,
            ignore=ignore_patterns('.svn', 'sdk'))
 
-  # Copy import maps
-  PLATFORMS = ['any', 'vm', 'dartium', 'dart2js', 'frog' ]
+  # Copy import maps.
+  PLATFORMS = ['any', 'vm', 'dartium', 'dart2js' ]
   os.makedirs(join(LIB, 'config'))
   for platform in PLATFORMS:
     import_src = join(HOME, 'lib', 'config', 'import_' + platform + '.config')
     import_dst = join(LIB, 'config', 'import_' + platform + '.config')
     copyfile(import_src, import_dst);
 
+  # Copy dart2js.
   CopyDart2Js(build_dir, SDK_tmp)
 
   # 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()
 
   move(SDK_tmp, SDK)
   utils.Touch(os.path.join(SDK, 'create.stamp'))
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))