Version 1.2.0-dev.5.2

dart/sdk/bin/docgen

Index: dart/sdk/bin/docgen
===================================================================
--- dart/sdk/bin/docgen	(revision 32643)
+++ dart/sdk/bin/docgen	(working copy)
@@ -18,17 +18,18 @@
 # Handle the case where dart-sdk/bin has been symlinked to.
 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
 
+SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
+
 unset SNAPSHOT
 
 SNAPSHOT="$BIN_DIR/snapshots/utils_wrapper.dart.snapshot"
 
 if test -f $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 \
-      "--package-root=$BIN_DIR/../packages/" $SNAPSHOT docgen "$@"
+      "--package-root=$BIN_DIR/../packages/" $SNAPSHOT \
+      docgen "--sdk=$SDK_DIR" "$@"
 else
   exec "$BIN_DIR"/dart \
       "--package-root=$BIN_DIR/../packages/" \
-      "$BIN_DIR/../pkg/docgen/bin/docgen.dart" "$@"
+      "$BIN_DIR/../../pkg/docgen/bin/docgen.dart" "--sdk=$SDK_DIR" "$@"
 fi