Fixed sdk/bin/dart2analyzer to use package-root

sdk/bin/dart2analyzer

Index: sdk/bin/dart2analyzer
diff --git a/sdk/bin/dart2analyzer b/sdk/bin/dart2analyzer
index 4c1767198e6431e2663766e7a882c361178168ca..b10731222475886ed6d1782f3cda951dd81d2363 100755
--- a/sdk/bin/dart2analyzer
+++ b/sdk/bin/dart2analyzer
@@ -3,21 +3,34 @@
 # 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.
 
+# NOTE: This file is not supposed to be included in the SDK.

[ricow1, 2013/06/11 10:35:34]

So why don't we move it?

[kustermann, 2013/06/11 10:38:29]

Sure. Where should we move it to?

[scheglov, 2013/06/11 20:07:53]

For now yes, this file should not be included in the SDK.
However plan is that it will replace dartanalyzer script in some not-so-far
future.
So, if it does not cause problem with packaging the SDK, I'd like to keep it
here.

[ricow1, 2013/06/12 07:54:22]

OK - for future reference please only place stuff in here that is actually
shipping in the SDK. It will not interfere with the sdk packaging, but we should
try to keep the two as close as possible. There is no (at least I don't see any)
reason for having it here.

[scheglov, 2013/06/12 08:47:43]

  OK, agree.
  Lets move it to the appropriate place until it will be actually part of the
SDK.

+# It is currently only used by test.dart for testing pkg/analyzer_experimental.
+
 set -e
 
-BIN_DIR="$(cd "${BASH_SOURCE%/*}" ; pwd -P)"
-SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
-DART="$BIN_DIR/dart"
-PKG_ANALYZER="$BIN_DIR/../packages/analyzer_experimental/bin/analyzer.dart"
+CUR_DIR="$(cd "${BASH_SOURCE%/*}" ; pwd -P)"
+
+if [ -z "$DART_CONFIGURATION" ];
+then
+  DART_CONFIGURATION="ReleaseIA32"
+fi
+
+if [[ `uname` == 'Darwin' ]];
+then
+  BUILD_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION
+else
+  BUILD_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION
+fi
+
+DART_ROOT="$(cd "${CUR_DIR}/../.." ; pwd -P)"
+SDK_DIR="$(cd "${DART_ROOT}/sdk" ; pwd -P)"
+PKG_ANALYZER="$DART_ROOT/pkg/analyzer_experimental/bin/analyzer.dart"
+PACKAGE_ROOT="$DART_ROOT/out/$DART_CONFIGURATION/packages/"
 
-FOUND_BATCH=0
 FOUND_SDK=0
 for ARG in "$@"
 do
   case $ARG in
-    -batch|--batch)
-      FOUND_BATCH=1
-      ;;
     --dart-sdk)
       FOUND_SDK=1
       ;;
@@ -27,7 +40,7 @@ do
 done
 
 if [ $FOUND_SDK = 0 ] ; then
-  exec "$DART" "${PKG_ANALYZER}" --dart-sdk "${SDK_DIR}" "$@"

[kustermann, 2013/06/11 10:28:15]

Which script passes a boolean '--dart-sdk' flag to sdk/bin/dart2analyer?
In case this is not used, we should remove it.

[scheglov, 2013/06/11 20:07:53]

In general, this is script which users may call to do analysis.
So, users may use --dart-sdk.

It seems that with there changes we make this script good for running on the
bot, but not when it will eventually become part of the SDK.

May be worth to keep this script unchanged and apply instead this content to the
dart2analyzer_developer.

[ricow1, 2013/06/12 07:54:22]

What does that flag do?
When it becomes part of the sdk we need to change this completely. We will
snapshot the analyzer and add only the snapshot and small wrapper script that
will start it. Take a look at how we do dart2js, dartdoc and pub
That will work for getting this on the buildbot, but as I noted above this file
needs to be changed anyway when we make it part of the SDK. 

[scheglov, 2013/06/12 08:47:43]

  It allows to analyze against different SDK than SDK where this script is
located.
  This is how dartc and the new Java based analyzer was done.
  I don't have strong opinion if this is useful or now.
  Yes, I understand.
  OK

+  exec "$BUILD_DIR/dart" "--package-root=$PACKAGE_ROOT" "${PKG_ANALYZER}" --dart-sdk "${SDK_DIR}" "$@"
 else
-  exec "$DART" "${PKG_ANALYZER}" "$@"
+  exec "$BUILD_DIR/dart" "--package-root=$PACKAGE_ROOT" "${PKG_ANALYZER}" "$@"

[kustermann, 2013/06/11 10:28:15]

I have no idea how worked without '--package-root'?

[ricow1, 2013/06/11 10:35:34]

Did it?

[kustermann, 2013/06/11 10:38:29]

It didn't work on my machine. But I expected that the people who made the script
tested it?!

[ricow1, 2013/06/12 07:54:22]

Konstantin: how are you setting the package root without this change?

[scheglov, 2013/06/12 08:47:43]

  It seems that it worked only on my machine :-(
  I've had a link sdk/packages to repo/pkg folder.

 fi