Add dartdoc to the generated utils snapshot

utils/compiler/create_snapshot.dart

Index: utils/compiler/create_snapshot.dart
===================================================================
--- utils/compiler/create_snapshot.dart	(revision 21414)
+++ utils/compiler/create_snapshot.dart	(working copy)
@@ -18,11 +18,13 @@
 
 Future<String> getSnapshotGenerationFile(var options, var args, var rootPath) {
   var dart2js = rootPath.append(args["dart2js_main"]);
+  var dartdoc = rootPath.append(args["dartdoc_main"]);
 
   return getVersion(options, rootPath).then((version) {
     var snapshotGenerationText = 
 """
 import '${dart2js}' as dart2jsMain;
+import '${dartdoc}' as dartdocMain;
 import 'dart:io';
 
 void main() {
@@ -32,6 +34,8 @@
   if (tool == "dart2js") {
     dart2jsMain.BUILD_ID = "$version";
     dart2jsMain.mainWithErrorHandler(options);
+  } else if (tool == "dartdoc") {
+    dartdocMain.mainWithOptions(options);

[Andrei Mouravski, 2013/04/16 20:19:09]

Why not call this as a process?

[ricow1, 2013/04/17 06:58:49]

I guess I was not clear about this in the cl since this is just adding dartdoc.

We are creating a snapshot using the code we produce here and the code will not
be available!

The reason for this small wrapper is that (just guessing) 95% of the code
between dart2js and dartdoc is shared - so having just one snapshot makes sense.

We want to move code out of sdk/lib/_internal and (for now) just retain the bare
minimum (something like _internal/libraries.dart,
_internal/compiler/implementation/lib and _internal/dartdoc/static)

   }
 }
 
@@ -47,9 +51,10 @@
     writer.close();
 }
 
-Future createSnapshot(var options, var dart_file) {
+Future createSnapshot(var options, var dart_file, var packageRoot) {
   return Process.run(options.executable,
-                     ["--generate-script-snapshot=$dart_file.snapshot",
+                     ["--package-root=$packageRoot",
+                      "--generate-script-snapshot=$dart_file.snapshot",
                       dart_file])
       .then((result) {
         if (result.exitCode != 0) {
@@ -65,7 +70,8 @@
  */
 void main() { 
   Options options = new Options();
-  var validArguments = ["--output_dir", "--dart2js_main"];
+  var validArguments = ["--output_dir", "--dart2js_main", "--dartdoc_main",
+                        "--package_root"];
   var args = {};
   for (var argument in options.arguments) {
     var argumentSplit = argument.split("=");
@@ -76,7 +82,9 @@
     args[argumentSplit[0].substring(2)] = argumentSplit[1];
   }
   if (!args.containsKey("dart2js_main")) throw "Please specify dart2js_main";
+  if (!args.containsKey("dartdoc_main")) throw "Please specify dartdoc_main";
   if (!args.containsKey("output_dir")) throw "Please specify output_dir";
+  if (!args.containsKey("package_root")) throw "Please specify package_root";
 
   var scriptFile = new File(options.script);
   var path = new Path(scriptFile.directorySync().path); 
@@ -85,6 +93,6 @@
   getSnapshotGenerationFile(options, args, rootPath).then((result) {
     var wrapper = "${args['output_dir']}/utils_wrapper.dart";
     writeSnapshotFile(wrapper, result);
-    createSnapshot(options, wrapper);
+    createSnapshot(options, wrapper, args["package_root"]);
   });
 }