Changed pkg option to package-root.

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 21 matching lines @@
   final USAGE = 'Usage dartdoc [options] <entrypoint(s)>\n[options] include:';
 
   final args = new Options().arguments;
 
   final dartdoc = new Dartdoc();
 
   final argParser = new ArgParser();
 
   final Path libPath = scriptDir.append('../../../../');
 
-  Path pkgPath;
+  Path packageRoot;
 
   argParser.addFlag('no-code',
       help: 'Do not include source code in the documentation.',
       defaultsTo: false, negatable: false,
       callback: (noCode) => dartdoc.includeSource = !noCode);
 
   argParser.addOption('mode', abbr: 'm',
       help: 'Define how HTML pages are generated.',
       allowed: ['static', 'live-nav'], allowedHelp: {
         'static': 'Generates completely static HTML containing\n'
@@ skipping 100 matching lines @@
           for(final lst in excLibs) {
             var someLibs = lst.split(',');
             for(final lib in someLibs) {
               allLibs.add(lib);
             }
           }
           dartdoc.excludedLibraries = allLibs;
         }
       }, allowMultiple: true);
 
-  argParser.addOption('pkg',
+  argParser.addOption('package-root',
       help: 'Sets the package directory to the specified directory.\n'
-        'If omitted the package directory is the SDK pkg/ dir',
-      callback: (pkgDir) {
-        if(pkgDir != null) {
-          pkgPath = new Path(pkgDir);
+        'If omitted the package directory is the closest packages directory to'
+        ' the entrypoint.',
+      callback: (packageDir) {
+        if(packageDir != null) {
+          packageRoot = new Path(packageDir);
         }
       });
 
+  // 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 = new Path(packageDir);
+        }
+      });
+
   dartdoc.dartdocPath = libPath.append('lib/_internal/dartdoc');
 
   if (args.isEmpty) {
     print('No arguments provided.');
     print(USAGE);
     print(argParser.getUsage());
     exit(1);
   }
 
   final entrypoints = <Path>[];
@@ skipping 21 matching lines @@
     print(argParser.getUsage());
     exit(1);
   }
 
   if (entrypoints.isEmpty) {
     print('No entrypoints provided.');
     print(argParser.getUsage());
     exit(1);
   }
 
-  if (pkgPath == null) {
+  if (packageRoot == null) {
     // Check if there's a `packages` directory in the entry point directory.
     var script = path.normalize(path.absolute(entrypoints[0].toNativePath()));
     var dir = path.join(path.dirname(script), 'packages/');
     if (new Directory(dir).existsSync()) {
       // TODO(amouravski): convert all of dartdoc to use pathos.
-      pkgPath = new Path(dir);
+      packageRoot = 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)),
+        packageRoot = new Path(path.join(path.joinAll(parts.take(libDir)),
               'packages'));
       }
     }
   }
 
   cleanOutputDirectory(dartdoc.outputDir);
 
   // Start the analysis and documentation.
-  dartdoc.documentLibraries(entrypoints, libPath, pkgPath)
+  dartdoc.documentLibraries(entrypoints, libPath, packageRoot)
     .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);
       }
     })
     .catchError((e) {
         print('Error: generation failed: ${e.error}');
         exit(1);
     })
     .whenComplete(() => dartdoc.cleanup());
 }