Add dartdoc to the generated utils snapshot.

sdk/lib/_internal/dartdoc/bin/dartdoc.dart

 // 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.
 
 /**
  * To generate docs for a library, run this script with the path to an
  * entrypoint .dart file, like:
  *
  *     $ dart dartdoc.dart foo.dart
  *
@@ skipping 11 matching lines @@
 // TODO(rnystrom): Use "package:" URL (#4968).
 import '../lib/dartdoc.dart';
 import '../lib/src/dartdoc/utils.dart';
 import 'package:args/args.dart';
 import 'package:pathos/path.dart' as path;
 
 /**
  * Run this from the `lib/_internal/dartdoc` directory.
  */
 main() {
+  mainWithOptions(new Options());
+}
+
+/**
+ * We use this to include dartdoc in a single snapshot with dart2js.
+ * (They share 90% of the code)
+ */
+mainWithOptions(Options options) {

[nweiz, 2013/06/04 22:54:00]

Why not just have the snapshot call main()? "new Options()" will still get the
right value.

[Andrei Mouravski, 2013/06/05 00:18:49]

Because the snapshot actually calls this with different options.

   // Need this because ArgParser.getUsage doesn't show command invocation.
   final USAGE = 'Usage dartdoc [options] <entrypoint(s)>\n[options] include:';
 
-  final args = new Options().arguments;
+  final args = options.arguments;
 
   final dartdoc = new Dartdoc();
 
   final argParser = new ArgParser();
 
   Path libPath = scriptDir.append('../../../../');
 
   String packageRoot;
 
   argParser.addFlag('no-code',
@@ skipping 135 matching lines @@
 
   // TODO(amouravski): This method is deprecated. Remove on April 22.
   argParser.addOption('pkg',
       help: 'Deprecated: same as --package-root.',
       callback: (packageDir) {
         if(packageDir != null) {
           packageRoot = packageDir;
         }
       });
 
   dartdoc.dartdocPath = libPath.append('lib/_internal/dartdoc');

[nweiz, 2013/06/04 22:54:00]

It's weird that this is separate from what's essentially the same operation
below.

[Andrei Mouravski, 2013/06/05 00:18:49]

Yes, but I don't want to try and unstuck this. That'll come in a new CL.

 
   if (args.isEmpty) {
     print('No arguments provided.');
     print(USAGE);
     print(argParser.getUsage());
     exit(1);
   }
 
   final entrypoints = <Uri>[];
   try {
@@ skipping 31 matching lines @@
   if (packageRoot == null) packageRoot = _getPackageRoot(entrypoints);
 
   cleanOutputDirectory(dartdoc.outputDir);
 
   // Start the analysis and documentation.
   dartdoc.documentLibraries(entrypoints, libPath, packageRoot)
     // Prepare the dart2js script code and copy static resources.
     // TODO(amouravski): move compileScript out and pre-generate the client
     // scripts. This takes a long time and the js hardly ever changes.
     .then((_) => compileScript(dartdoc.mode, dartdoc.outputDir, libPath))
-    .then((_) => copyDirectory(scriptDir.append('../static'),
-          dartdoc.outputDir))
+    .then((_) => copyDirectory(libPath.append('lib/_internal/dartdoc/static'),

[nweiz, 2013/06/04 22:54:00]

libPath and scriptPath seem very brittle. It's not clear from reading the code
where libPath will point, let alone that it will correctly point to that
location when run from the repo vs the sdk.

At the very least, scriptDir and libPath both need documentation that describes
their locations when run from the repo or from the sdk. If possible, use a
single variable that refers to a well-defined path from which the relative paths
work in both the SDK and the repo.

[Andrei Mouravski, 2013/06/05 00:18:49]

I agree, and this will be fixed in a new CL.

+                               dartdoc.outputDir))
     .then((_) {
       print(dartdoc.status);
       if (dartdoc.totals == 0) {
         exit(1);
       }
     })
     .catchError((e) {
       print('Error: generation failed: ${e}');
       var trace = getAttachedStackTrace(e);
       if (trace != null) print("StackTrace: $trace");
@@ skipping 17 matching lines @@
   // If there is not, then check if the entrypoint is somewhere in a `lib`
   // directory.
   var parts = path.split(path.dirname(script));
   var libDir = parts.lastIndexOf('lib');
   if (libDir > 0) {
     return path.join(path.joinAll(parts.take(libDir)), 'packages');
   } else {
     return null;
   }
 }