compiler/scripts/dartc.sh - Issue 9158011: Fix dartc.sh script to use /bin/bash (issue dart:1104)

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: compiler/scripts/dartc.sh

Issue 9158011: Fix dartc.sh script to use /bin/bash (issue dart:1104) (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 #!/bin/sh	1 #!/bin/bash
	Bill Hesse 2012/01/10 13:09:10 Remove this change? Remove this change? ahe 2012/01/10 13:55:03 I was thinking the same. Show quoted text On 2012/01/10 13:09:10, Bill Hesse wrote: > Remove this change? I was thinking the same. Bill Hesse 2012/01/10 14:13:52 Changing to /bin/bash --posix to agree with the ot Changing to /bin/bash --posix to agree with the other scripts in this directory. On 2012/01/10 13:55:03, ahe wrote: Show quoted text > On 2012/01/10 13:09:10, Bill Hesse wrote: > > Remove this change? > > I was thinking the same. Actually, this is the change that fixes the problem. /bin/sh does not point to bash on the buildbot slaves. So this change is the fix.
2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file	2 # Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file

3 # for details. All rights reserved. Use of this source code is governed by a	3 # for details. All rights reserved. Use of this source code is governed by a

4 # BSD-style license that can be found in the LICENSE file.	4 # BSD-style license that can be found in the LICENSE file.

5	5 set -e
	zundel 2012/01/10 14:04:53 if this is going to stay in for more than just a f if this is going to stay in for more than just a few commits, I'd prefer it be surrounded with a test of a command line flag or environment variable. Otherwise, I'm OK with it as a way to quickly diagnose a problem with the build. Bill Hesse 2012/01/10 14:13:52 We are taking this out. We fixed it. Show quoted text On 2012/01/10 14:04:53, zundel wrote: > if this is going to stay in for more than just a few commits, I'd prefer it be > surrounded with a test of a command line flag or environment variable. We are taking this out. We fixed it. Show quoted text > Otherwise, I'm OK with it as a way to quickly diagnose a problem with the build.
	6 set -x

6 SCRIPT_DIR=$(dirname $0)	7 SCRIPT_DIR=$(dirname $0)

7 DARTC_HOME=$(dirname $SCRIPT_DIR)	8 DARTC_HOME=$(dirname $SCRIPT_DIR)

8 DARTC_LIBS=$DARTC_HOME/lib	9 DARTC_LIBS=$DARTC_HOME/lib

9	10

10 if [ -x /usr/libexec/java_home ]; then	11 if [ -x /usr/libexec/java_home ]; then

11 export JAVA_HOME=$(/usr/libexec/java_home -v '1.6+')	12 export JAVA_HOME=$(/usr/libexec/java_home -v '1.6+')

12 fi	13 fi

13	14

14 EXTRA_JVMARGS="-Xss2M "	15 EXTRA_JVMARGS="-Xss2M "

15 OS=`uname \| tr [A-Z] [a-z]`	16 OS=`uname \| tr [A-Z] [a-z]`

16 if [ "$OS" == "darwin" ] ; then	17 if [ "$OS" == "darwin" ] ; then

17 # Bump up the heap on Mac VMs, some of which default to 128M or less.	18 # Bump up the heap on Mac VMs, some of which default to 128M or less.

18 # Users can specify DART_JVMARGS in the environment to override	19 # Users can specify DART_JVMARGS in the environment to override

19 # this setting.	20 # this setting.

20 EXTRA_JVMARGS+="-Xmx256M"	21 EXTRA_JVMARGS+="-Xmx256M"

21 fi	22 fi

22	23

23 exec java $EXTRA_JVMARGS $DART_JVMARGS -ea -classpath "@CLASSPATH@" \	24 exec java $EXTRA_JVMARGS $DART_JVMARGS -ea -classpath "@CLASSPATH@" \

24 com.google.dart.compiler.DartCompiler $@	25 com.google.dart.compiler.DartCompiler $@

OLD	NEW

« no previous file with comments | « no previous file | tools/testing/dart/test_runner.dart » ('j') | tools/testing/dart/test_runner.dart » ('J')