Revert revision 23575.

This is causing failures in the test of dartdoc (on the editor bot)

The reason seems to be that we are generating a temporary nav.dart
file relative to the dartdocPath in sdk/lib/_internal/dartdoc/lib/
which we claim to be part of in
sdk/lib/_internal/dartdoc/lib/src/client/client-static.dart. 

This will not work since actual code has been snapshot.

Review URL: https://codereview.chromium.org//16357003

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@23583 260f80e4-7a28-3924-810f-c04153c831b5

sdk/bin/dartdoc

@@ -18,17 +18,9 @@ if test -t 1; then
 fi
 
 unset SNAPSHOT
-
-SNAPSHOT="$BIN_DIR/snapshots/utils_wrapper.dart.snapshot"
-
-if test -f $SNAPSHOT; then
+if test -f "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot"; then
   # TODO(ahe): Remove the following line when we are relatively sure it works.
-  echo Using snapshot $SNAPSHOT 1>&2
-  exec "$BIN_DIR"/dart --heap_growth_rate=32 \
-      "--package-root=$BIN_DIR/../packages/" $SNAPSHOT dartdoc $COLORS \
-      "--package-root=$BIN_DIR/../packages/" "--library-root=$BIN_DIR/.." "$@"
-else
-  exec "$BIN_DIR"/dart --heap_growth_rate=32 \
-      "--package-root=$BIN_DIR/../packages/" \
-      "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart" $COLORS "$@"
+  echo Using snapshot "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot" 1>&2
+  SNAPSHOT="--use-script-snapshot=$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart.snapshot"
 fi
+exec "$BIN_DIR"/dart --heap_growth_rate=32 "--package-root=$BIN_DIR/../packages/" $SNAPSHOT "$BIN_DIR/../lib/_internal/dartdoc/bin/dartdoc.dart" "--package-root=$BIN_DIR/../packages/" $COLORS "$@"

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

@@ -29,18 +29,10 @@ 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) {
   // Need this because ArgParser.getUsage doesn't show command invocation.
   final USAGE = 'Usage dartdoc [options] <entrypoint(s)>\n[options] include:';
 
-  final args = options.arguments;
+  final args = new Options().arguments;
 
   final dartdoc = new Dartdoc();
 
@@ -248,8 +240,8 @@ mainWithOptions(Options options) {
     // 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(libPath.append('lib/_internal/dartdoc/static'),
-                               dartdoc.outputDir))
+    .then((_) => copyDirectory(scriptDir.append('../static'),
+          dartdoc.outputDir))
     .then((_) {
       print(dartdoc.status);
       if (dartdoc.totals == 0) {

utils/compiler/compiler.gyp

@@ -19,8 +19,7 @@
           'inputs': [
             '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
             '../../sdk/lib/_internal/libraries.dart',
-            '<!@(["python", "../../tools/list_files.py", "\\.dart$", "../../sdk/lib/_internal/compiler", "../../runtime/lib", "../../sdk/lib/_internal/dartdoc"])',
-            'create_snapshot.dart',
+            '<!@(["python", "../../tools/list_files.py", "\\.dart$", "../../sdk/lib/_internal/compiler", "../../runtime/lib"])',
           ],
           'outputs': [
             '<(SHARED_INTERMEDIATE_DIR)/utils_wrapper.dart.snapshot',
@@ -30,8 +29,6 @@
             'create_snapshot.dart',
             '--output_dir=<(SHARED_INTERMEDIATE_DIR)',
             '--dart2js_main=sdk/lib/_internal/compiler/implementation/dart2js.dart',
-            '--dartdoc_main=sdk/lib/_internal/dartdoc/bin/dartdoc.dart',
-            '--package_root=<(PRODUCT_DIR)/packages/',
           ],
         },
       ],

utils/compiler/create_snapshot.dart

@@ -22,13 +22,11 @@ Future<String> getVersion(var options, var rootPath) {
 
 Future<String> getSnapshotGenerationFile(var options, var args, var rootPath) {
   var dart2js = rootPath.append(args["dart2js_main"]);
-  var dartdoc = rootPath.append(args["dartdoc_main"]);
 
   return getVersion(options, rootPath).then((version) {
     var snapshotGenerationText =
 """
 import '${dart2js}' as dart2jsMain;
-import '${dartdoc}' as dartdocMain;
 import 'dart:io';
 
 void main() {
@@ -38,8 +36,6 @@ void main() {
   if (tool == "dart2js") {
     dart2jsMain.BUILD_ID = "$version";
     dart2jsMain.mainWithErrorHandler(options);
-  } else if (tool == "dartdoc") {
-    dartdocMain.mainWithOptions(options);
   }
 }
 
@@ -55,10 +51,9 @@ void writeSnapshotFile(var path, var content) {
     writer.close();
 }
 
-Future createSnapshot(var options, var dart_file, var packageRoot) {
+Future createSnapshot(var options, var dart_file) {
   return Process.run(options.executable,
-                     ["--package-root=$packageRoot",
-                      "--generate-script-snapshot=$dart_file.snapshot",
+                     ["--generate-script-snapshot=$dart_file.snapshot",
                       dart_file])
       .then((result) {
         if (result.exitCode != 0) {
@@ -74,8 +69,7 @@ Future createSnapshot(var options, var dart_file, var packageRoot) {
  */
 void main() {
   Options options = new Options();
-  var validArguments = ["--output_dir", "--dart2js_main", "--dartdoc_main",
-                        "--package_root"];
+  var validArguments = ["--output_dir", "--dart2js_main"];
   var args = {};
   for (var argument in options.arguments) {
     var argumentSplit = argument.split("=");
@@ -86,9 +80,7 @@ void main() {
     args[argumentSplit[0].substring(2)] = argumentSplit[1];
   }
   if (!args.containsKey("dart2js_main")) throw "Please specify dart2js_main";
-  if (!args.containsKey("dartdoc_main")) throw "Please specify dartdoc_main";
   if (!args.containsKey("output_dir")) throw "Please specify output_dir";
-  if (!args.containsKey("package_root")) throw "Please specify package_root";
 
   var scriptFile = new File(new File(options.script).fullPathSync());
   var path = new Path(scriptFile.directory.path);
@@ -96,6 +88,6 @@ void main() {
   getSnapshotGenerationFile(options, args, rootPath).then((result) {
     var wrapper = "${args['output_dir']}/utils_wrapper.dart";
     writeSnapshotFile(wrapper, result);
-    createSnapshot(options, wrapper, args["package_root"]);
+    createSnapshot(options, wrapper);
   });
 }