Index: compiler/scripts/dart_analyzer.sh |
diff --git a/compiler/scripts/dartc.sh b/compiler/scripts/dart_analyzer.sh |
similarity index 54% |
rename from compiler/scripts/dartc.sh |
rename to compiler/scripts/dart_analyzer.sh |
index dc866fc58c98ba49d674984a2e524dc9054d8409..5f10f5fc0c6d80e950bcc32ef54c1fdecfd6a343 100755 |
--- a/compiler/scripts/dartc.sh |
+++ b/compiler/scripts/dart_analyzer.sh |
@@ -1,14 +1,44 @@ |
#!/bin/bash --posix |
-# Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
+# 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. |
set -e |
SCRIPT_DIR=$(dirname $0) |
-DARTC_HOME=$(dirname $SCRIPT_DIR) |
-DARTC_LIBS=$DARTC_HOME/lib |
-DARTC_SDK=$(dirname $DARTC_HOME)/dart-sdk |
+DART_ANALYZER_HOME=$(dirname $SCRIPT_DIR) |
+ |
+FOUND_BATCH=0 |
+FOUND_SDK=0 |
+for ARG in "$@" |
+do |
+ case $ARG in |
+ -batch|--batch) |
+ FOUND_BATCH=1 |
+ ;; |
+ --dart-sdk) |
+ FOUND_SDK=1 |
+ ;; |
+ *) |
+ ;; |
+ esac |
+done |
+ |
+DART_SDK="" |
+if [ $FOUND_SDK = 0 ] ; then |
+ if [ -f $DART_ANALYZER_HOME/lib/core/core_runtime.dart ] ; then |
+ DART_SDK="--dart-sdk $DART_ANALYZER_HOME" |
+ else |
+ DART_ANALYZER_HOME=$(dirname $DART_ANALYZER_HOME)/dart-sdk |
+ if [ -d $DART_ANALYZER_HOME ] ; then |
+ DART_SDK="--dart-sdk $DART_ANALYZER_HOME" |
+ else |
+ echo "Couldn't find Dart SDK. Specify with --dart-sdk cmdline argument" |
+ fi |
+ fi |
+fi |
+ |
+DART_ANALYZER_LIBS=$DART_ANALYZER_HOME/util/analyzer |
if [ -x /usr/libexec/java_home ]; then |
export JAVA_HOME=$(/usr/libexec/java_home -v '1.6+') |
@@ -26,21 +56,10 @@ else |
# On other architectures |
# -batch invocations will do better with a server vm |
# invocations for analyzing a single file do better with a client vm |
- FOUND_BATCH=0 |
- for ARG in "$@" |
- do |
- case $ARG in |
- -batch|--batch) |
- FOUND_BATCH=1 |
- ;; |
- *) |
- ;; |
- esac |
- done |
if [ $FOUND_BATCH = 0 ] ; then |
EXTRA_JVMARGS+=" -client " |
fi |
fi |
exec java $EXTRA_JVMARGS $DART_JVMARGS -ea -classpath "@CLASSPATH@" \ |
- com.google.dart.compiler.DartCompiler --dart-sdk ${DARTC_SDK} $@ |
+ com.google.dart.compiler.DartCompiler ${DART_SDK} $@ |