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

Side by Side Diff: sdk/bin/dartfmt

Issue 950483002: Switch dartfmt in the SDK to run dart_style. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Fix copy/paste error. Created 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | sdk/bin/dartfmt.bat » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 #!/bin/bash 1 #!/bin/bash
2 # Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 2 # Copyright (c) 2013, 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 # Run dartfmt.dart on the Dart VM. This script assumes the Dart SDK's directory 6 # Run dart_style/bin/format.dart on the Dart VM. This script assumes the Dart
7 # structure. 7 # repo's directory structure.
8 8
9 function follow_links() { 9 function follow_links() {
10 file="$1" 10 file="$1"
11 while [ -h "$file" ]; do 11 while [ -h "$file" ]; do
12 # On Mac OS, readlink -f doesn't work. 12 # On Mac OS, readlink -f doesn't work.
13 file="$(readlink "$file")" 13 file="$(readlink "$file")"
14 done 14 done
15 echo "$file" 15 echo "$file"
16 } 16 }
17 17
18 # Unlike $0, $BASH_SOURCE points to the absolute path of this file. 18 # Unlike $0, $BASH_SOURCE points to the absolute path of this file.
19 PROG_NAME="$(follow_links "$BASH_SOURCE")" 19 PROG_NAME="$(follow_links "$BASH_SOURCE")"
20 20
21 # Handle the case where dart-sdk/bin has been symlinked to. 21 # Handle the case where dart-sdk/bin has been symlinked to.
22 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)" 22 BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
23
24 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)" 23 SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
25 24
26 SNAPSHOT="$BIN_DIR/snapshots/dartfmt.dart.snapshot" 25 DART="$BIN_DIR/dart"
27 26
28 if test -f "$SNAPSHOT"; then 27 DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
29 # We are running the snapshot in the built SDK. 28
30 DART="$BIN_DIR/dart" 29 DARTFMT="$DART_ROOT/third_party/pkg/dart_style/bin/format.dart"
31 exec "$DART" "$SNAPSHOT" "$@" 30
31 if [ -z "$DART_CONFIGURATION" ];
32 then
33 DART_CONFIGURATION="ReleaseIA32"
34 fi
35
36 if [[ `uname` == 'Darwin' ]]; then
37 BUILD_DIR="$DART_ROOT/xcodebuild/$DART_CONFIGURATION"
32 else 38 else
33 # We are running dartfmt from source in the development repo. 39 BUILD_DIR="$DART_ROOT/out/$DART_CONFIGURATION"
34 if [ -z "$DART_CONFIGURATION" ]; 40 fi
35 then
36 DART_CONFIGURATION="ReleaseIA32"
37 fi
38 41
39 # TODO(pquitslund): this bit seems wrong, but was cribbed verbatim from pub 42 PACKAGE_ROOT="$BUILD_DIR/packages/"
40 # Need to revisit and fix
41 if [[ `uname` == 'Darwin' ]];
42 then
43 BUILD_DIR="$SDK_DIR/../xcodebuild/$DART_CONFIGURATION"
44 else
45 BUILD_DIR="$SDK_DIR/../out/$DART_CONFIGURATION"
46 fi
47 43
48 DART="$BUILD_DIR/dart-sdk/bin/dart" 44 exec "$DART" "--package-root=$PACKAGE_ROOT" "$DARTFMT" "$@"
49 PKG_DIR="$BUILD_DIR/packages"
50 DARTFMT="$SDK_DIR/../pkg/analyzer/bin/formatter.dart"
51
52 exec "$DART" "--package-root=$PKG_DIR" "$DARTFMT" "$@"
53 fi
OLDNEW
« no previous file with comments | « no previous file | sdk/bin/dartfmt.bat » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698