Lots of little changes for dartdoc/apidoc.

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
  *
  * This will create a "docs" directory with the docs for your libraries. To
  * create these beautiful docs, dartdoc parses your library and every library
  * it imports (recursively). From each library, it parses all classes and
  * members, finds the associated doc comments and builds crosslinked docs from
  * them.
  */
 library dartdoc;
 
+import 'dart:async';
 import 'dart:io';
-import 'dart:async';
+
+import '../lib/dartdoc.dart';
 
 // TODO(rnystrom): Use "package:" URL (#4968).
-import '../lib/dartdoc.dart';
+import '../../../../../pkg/args/lib/args.dart';
 import '../../../../../pkg/pathos/lib/path.dart' as path;
-import '../../../../../pkg/args/lib/args.dart';
 
 /**
  * Run this from the `lib/_internal/dartdoc` directory.
  */
 main() {
   // 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;
 
@@ skipping 181 matching lines @@
     if (new Directory(dir).existsSync()) {
       // TODO(amouravski): convert all of dartdoc to use pathos.
       pkgPath = new Path(dir);
     } else {
       // If there is not, then check if the entrypoint is somewhere in a `lib`
       // directory.
       dir = path.dirname(script);
       var parts = path.split(dir);
       var libDir = parts.lastIndexOf('lib');
       if (libDir > 0) {
-        pkgPath = new Path(path.join(path.joinAll(parts.take(libDir - 1)),
+        pkgPath = new Path(path.join(path.joinAll(parts.take(libDir)),
               'packages'));
       }
     }
   }
 
   cleanOutputDirectory(dartdoc.outputDir);
 
-  print('Analyzing sources');
-  Future documented = dartdoc.documentLibraries(entrypoints, libPath, pkgPath);
-
-  documented.then((_) {
-    Future compiled = compileScript(dartdoc.mode, dartdoc.outputDir, libPath);
-    Future filesCopied = copyDirectory(scriptDir.append('../static'),
-                                       dartdoc.outputDir);
-
-    Future.wait([compiled, filesCopied]).then((_) {
-      dartdoc.cleanup();
-      if (dartdoc.totalLibraries + dartdoc.totalTypes +
-          dartdoc.totalMembers == 0) {
-        print('Nothing was documented!');
+  // Start the analysis and documentation.
+  dartdoc.documentLibraries(entrypoints, libPath, pkgPath)
+    .then((_) {
+      print('Copying static files...');
+      Future.wait([
+        // 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.
+        compileScript(dartdoc.mode, dartdoc.outputDir, libPath),
+        copyDirectory(scriptDir.append('../static'), dartdoc.outputDir)
+      ]);
+    })
+    .then((_) {
+      print(dartdoc.status);
+      if (dartdoc.totals == 0) {
         exit(1);
-      } else {
-        print('Documented ${dartdoc.totalLibraries} libraries, '
-              '${dartdoc.totalTypes} types, and ${dartdoc.totalMembers} '
-              'members.');
       }
-    });
-  }, onError: (AsyncError asyncError) {
-    print('Generation failed: ${asyncError.error}');
-    dartdoc.cleanup();
-    exit(1);
-  });
+    })
+    .catchError((e) {
+        print('Error: generation failed: ${e.error}');
+        exit(1);
+    })
+    .whenComplete(() => dartdoc.cleanup());
 }