Index: sdk/lib/_internal/dartdoc/bin/dartdoc.dart |
=================================================================== |
--- sdk/lib/_internal/dartdoc/bin/dartdoc.dart (revision 23522) |
+++ sdk/lib/_internal/dartdoc/bin/dartdoc.dart (working copy) |
@@ -25,14 +25,19 @@ |
import 'package:args/args.dart'; |
import 'package:pathos/path.dart' as path; |
+ |
+main() { |
+ mainWithOptions(new Options()); |
+} |
+ |
/** |
* Run this from the `lib/_internal/dartdoc` directory. |
*/ |
-main() { |
+mainWithOptions(Options 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(); |
@@ -235,13 +240,15 @@ |
cleanOutputDirectory(dartdoc.outputDir); |
// Start the analysis and documentation. |
+ var staticPath = |
kustermann
2013/06/03 11:58:56
What is this 'var staticPath =' doing here?
ricow1
2013/06/03 12:08:19
Removed, leftover
|
+ |
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'), |
+ dartdoc.outputDir)) |
.then((_) { |
print(dartdoc.status); |
if (dartdoc.totals == 0) { |