Remove pkg from apidoc.

utils/apidoc/apidoc.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.
 
 /**
  * This generates the reference documentation for the core libraries that come
  * with dart. It is built on top of dartdoc, which is a general-purpose library
  * for generating docs from any Dart code. This library extends that to include
  * additional information and styling specific to our standard library.
  *
@@ skipping 90 matching lines @@
   // TODO(johnniwinther): Libraries for the compilation seem to be more like
   // URIs. Perhaps Path should have a toURI() method.
   // Add all of the core libraries.
   final apidocLibraries = <Path>[];
   LIBRARIES.forEach((String name, LibraryInfo info) {
     if (info.documented) {
       apidocLibraries.add(new Path('dart:$name'));
     }
   });
 
-  var lister = new Directory.fromPath(doc.scriptDir.append('../../pkg')).list();
-  lister.listen(
-      (entity) {
-        if (entity is Directory) {
-          var path = new Path(entity.path);
-          var libName = path.filename;
+  print('Generating docs...');
+  final apidoc = new Apidoc(mdn, outputDir, mode, generateAppCache,
+                            excludedLibraries, version);
+  apidoc.dartdocPath =
+      doc.scriptDir.append('../../sdk/lib/_internal/dartdoc/');
+  // Select the libraries to include in the produced documentation:
+  apidoc.includeApi = true;
+  apidoc.includedLibraries = includedLibraries;
 
-          // Ignore hidden directories (like .svn) as well as pkg.xcodeproj.
-          if (libName.startsWith('.') || libName.endsWith('.xcodeproj')) {
-            return;
-          }
+  Future.wait([copiedStatic, copiedApiDocStatic, htmlDiff]).then((_) {
+    Future<bool> documented =
+        apidoc.documentLibraries(apidocLibraries, libPath, pkgPath);
 
-          // TODO(rnystrom): Get rid of oldStylePath support when all
-          // packages are using new layout. See #5106.
-          var oldStylePath = path.append('${libName}.dart');
-          var newStylePath = path.append('lib/${libName}.dart');
+    documented.then((_) {
+      final compiled = doc.compileScript(mode, outputDir, libPath);
 
-          if (new File.fromPath(oldStylePath).existsSync()) {
-            apidocLibraries.add(oldStylePath);
-            includedLibraries.add(libName);
-          } else if (new File.fromPath(newStylePath).existsSync()) {
-            apidocLibraries.add(newStylePath);
-            includedLibraries.add(libName);
-          } else {
-            print('Warning: could not find package at $path');
-          }
-        }
-      },
-      onDone: () {
-        print('Generating docs...');
-        final apidoc = new Apidoc(mdn, outputDir, mode, generateAppCache,
-                                  excludedLibraries, version);
-        apidoc.dartdocPath =
-            doc.scriptDir.append('../../sdk/lib/_internal/dartdoc/');
-        // Select the libraries to include in the produced documentation:
-        apidoc.includeApi = true;
-        apidoc.includedLibraries = includedLibraries;
-
-        Future.wait([copiedStatic, copiedApiDocStatic, htmlDiff]).then((_) {
-          Future<bool> documented =
-              apidoc.documentLibraries(apidocLibraries, libPath, pkgPath);
-
-          documented.then((_) {
-            final compiled = doc.compileScript(mode, outputDir, libPath);
-
-            Future.wait([compiled]).then((_) {
-              apidoc.cleanup();
-            });
-          }, onError: (AsyncError asyncError) {
-            print('Generation failed: ${asyncError.error}');
-            apidoc.cleanup();
-          });
-        });
+      Future.wait([compiled]).then((_) {
+        apidoc.cleanup();
       });
+    }, onError: (AsyncError asyncError) {
+      print('Generation failed: ${asyncError.error}');
+      apidoc.cleanup();
+    });
+  });
 }
 
 class Apidoc extends doc.Dartdoc {
   /** Big ball of JSON containing the scraped MDN documentation. */
   final Map mdn;
 
 
   // A set of type names (TypeMirror.simpleName values) to ignore while
   // looking up information from MDN data.  TODO(eub, jacobr): fix up the MDN
   // import scripts so they run correctly and generate data that doesn't have
@@ skipping 270 matching lines @@
     final typeName = member.owner.simpleName;
     var memberName = '$typeName.${member.simpleName}';
     if (member is MethodMirror && (member.isConstructor || member.isFactory)) {
       final separator = member.constructorName == '' ? '' : '.';
       memberName = 'new $typeName$separator${member.constructorName}';
     }
 
     return a(memberUrl(member), memberName);
   }
 }