sdk/bin/dart - Issue 15949005: Make bin/pub script work when run from the repo.

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: sdk/bin/dart

Issue 15949005: Make bin/pub script work when run from the repo. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart

Patch Set: Run dart binary from built SDK. Created 7 years, 6 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/bash	1 #!/bin/bash

2 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file	2 # Copyright (c) 2012, 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

6 # Setting CUR_DIR this way is ugly, but is needed to handle the case where	6 # Setting CUR_DIR this way is ugly, but is needed to handle the case where

7 # sdk/bin has been symlinked to. On MacOS, readlink doesn't work with this case.	7 # sdk/bin has been symlinked to. On MacOS, readlink doesn't work with this case.

8 CUR_DIR="$(cd "${0%/*}" ; pwd -P)"	8 CUR_DIR="$(cd "${0%/*}" ; pwd -P)"

9	9

10 if [ -z "$DART_CONFIGURATION" ];	10 if [ -z "$DART_CONFIGURATION" ];

11 then	11 then

12 DART_CONFIGURATION="ReleaseIA32"	12 DART_CONFIGURATION="ReleaseIA32"

13 fi	13 fi

14	14

15 if [[ `uname` == 'Darwin' ]];	15 if [[ `uname` == 'Darwin' ]];

16 then	16 then

17 BIN_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION	17 BIN_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION/dart-sdk/bin

18 else	18 else

19 BIN_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION	19 BIN_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION/dart-sdk/bin
	dgrove 2013/05/30 17:52:56 I think this will work. I talked with the VM team, I think this will work. I talked with the VM team, and none of them sound like they'd be impacted by this change. ahe 2013/06/03 07:50:10 This won't work. The original idea was as follows: Show quoted text On 2013/05/30 17:52:56, dgrove wrote: > I think this will work. I talked with the VM team, and none of them sound like > they'd be impacted by this change. This won't work. The original idea was as follows: You run stuff from dart/sdk/bin to avoid building the SDK. You run stuff from PRODUCT_DIR/dart-sdk/bin if you want to test the SDK (including snapshots). The advantage to this setup is that there is no build step required to test incremental changes to dart2js, I assume pub would benefit from this as well.
20 fi	20 fi

21	21

22 exec "$BIN_DIR"/dart "$@"	22 exec "$BIN_DIR"/dart "$@"

OLD	NEW

« no previous file with comments | « no previous file | sdk/bin/pub » ('j') | no next file with comments »