Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: compiler/scripts/dartc.sh

Issue 9950043: Revert "Renamed the 'dartc' launch script to 'dart_analyzer' and adds it to dart-sdk" (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « compiler/scripts/dart_analyzer.sh ('k') | compiler/scripts/dartc_build_wrapper.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: compiler/scripts/dartc.sh
diff --git a/compiler/scripts/dart_analyzer.sh b/compiler/scripts/dartc.sh
similarity index 55%
rename from compiler/scripts/dart_analyzer.sh
rename to compiler/scripts/dartc.sh
index 3f4b517fae69a803d4f2999b299a5ad56fa027b7..dc866fc58c98ba49d674984a2e524dc9054d8409 100755
--- a/compiler/scripts/dart_analyzer.sh
+++ b/compiler/scripts/dartc.sh
@@ -1,45 +1,14 @@
#!/bin/bash --posix
-# Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
+# Copyright (c) 2011, 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)
-DART_ANALYZER_HOME=$(dirname $SCRIPT_DIR)
-DART_ANALYZER_LIBS=$DART_ANALYZER_HOME/util/analyzer
-
-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
- DEV_SDKDIR=$(dirname $DART_ANALYZER_HOME)/dart-sdk
- if [ -d $DEV_SDKDIR ] ; then
- DART_SDK="--dart-sdk $DEV_SDKDIR"
- else
- echo "Couldn't find Dart SDK. Specify with --dart-sdk cmdline argument"
- fi
- fi
-fi
-
-
+DARTC_HOME=$(dirname $SCRIPT_DIR)
+DARTC_LIBS=$DARTC_HOME/lib
+DARTC_SDK=$(dirname $DARTC_HOME)/dart-sdk
if [ -x /usr/libexec/java_home ]; then
export JAVA_HOME=$(/usr/libexec/java_home -v '1.6+')
@@ -57,10 +26,21 @@ 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} $@
+ com.google.dart.compiler.DartCompiler --dart-sdk ${DARTC_SDK} $@
« no previous file with comments | « compiler/scripts/dart_analyzer.sh ('k') | compiler/scripts/dartc_build_wrapper.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698