| 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 # Run pub.dart on the Dart VM. This script is only used when running pub from | 6 # Run pub.dart on the Dart VM. This script is only used when running pub from |
| 7 # within the Dart source repo. The shipped SDK instead uses "pub_sdk", which is | 7 # within the Dart source repo. The shipped SDK instead uses "pub_sdk", which is |
| 8 # renamed to "pub" when the SDK is built. | 8 # renamed to "pub" when the SDK is built. |
| 9 | 9 |
| 10 function follow_links() { | 10 function follow_links() { |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 fi | 52 fi |
| 53 | 53 |
| 54 # Use the Dart binary in the built SDK so pub can find the version file next | 54 # Use the Dart binary in the built SDK so pub can find the version file next |
| 55 # to it. | 55 # to it. |
| 56 DART="$BUILD_DIR/dart-sdk/bin/dart" | 56 DART="$BUILD_DIR/dart-sdk/bin/dart" |
| 57 PACKAGES_DIR="$BUILD_DIR/pub_packages/" | 57 PACKAGES_DIR="$BUILD_DIR/pub_packages/" |
| 58 | 58 |
| 59 # Compile async/await down to vanilla Dart. | 59 # Compile async/await down to vanilla Dart. |
| 60 # TODO(rnystrom): Remove this when #104 is fixed. | 60 # TODO(rnystrom): Remove this when #104 is fixed. |
| 61 ASYNC_COMPILER="$SDK_DIR/lib/_internal/pub/bin/async_compile.dart" | 61 ASYNC_COMPILER="$SDK_DIR/lib/_internal/pub/bin/async_compile.dart" |
| 62 "$DART" "--package-root=$PACKAGES_DIR" "$ASYNC_COMPILER" "$BUILD_DIR" --silent | 62 "$DART" "--package-root=$PACKAGES_DIR" "$ASYNC_COMPILER" "$BUILD_DIR" |
| 63 | 63 |
| 64 # Run the async/await compiled pub. | 64 # Run the async/await compiled pub. |
| 65 PUB="$BUILD_DIR/pub_async/bin/pub.dart" | 65 PUB="$SDK_DIR/lib/_internal/pub_generated/bin/pub.dart" |
| 66 exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@" | 66 exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@" |
| OLD | NEW |