languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 14:53:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert revision 23438.

Browse source 
Revision 23438 is disabling the ability to run dart2js from the repo without building the sdk.
Lets discuss how we fix this for pub without having to build the sdk.

R=kasperl@google.com

Review URL: https://codereview.chromium.org//16322002

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart@23523 260f80e4-7a28-3924-810f-c04153c831b5
This commit is contained in:
ricow@google.com 2013-06-03 07:30:20 +00:00
parent 7e4902c886
commit 38668d12a1
2 changed files with 12 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sdk/bin/dart
View file

@ -12,11 +12,11 @@ then
DART_CONFIGURATION="ReleaseIA32"
fi
if [[ `uname` == 'Darwin' ]];
if [[ `uname` == 'Darwin' ]];
then
BIN_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION/dart-sdk/bin
BIN_DIR="$CUR_DIR"/../../xcodebuild/$DART_CONFIGURATION
else
BIN_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION/dart-sdk/bin
fi
BIN_DIR="$CUR_DIR"/../../out/$DART_CONFIGURATION
fi
exec "$BIN_DIR"/dart "$@"

51
sdk/bin/pub
View file

@ -1,46 +1,11 @@
#!/bin/bash
# Copyright (c) 2013, 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.
# Run pub.dart on the Dart VM. This script assumes the Dart SDK's directory
# structure.
function follow_links() {
while [ -h "$1" ]; do
# On Mac OS, readlink -f doesn't work.
1="$(readlink "$1")"
done
echo "$1"
}
# Setting BIN_DIR this way is ugly, but is needed to handle the case where
# dart-sdk/bin has been symlinked to. On MacOS, readlink doesn't work
# with this case.
BIN_DIR="$(cd "${0%/*}" ; pwd -P)"
DART_SDK="$(cd "${BIN_DIR%/*}" ; pwd -P)"
# Unlike $0, $BASH_SOURCE points to the absolute path of this file.
PROG_NAME="$(follow_links "$BASH_SOURCE")"
# Handle the case where dart-sdk/bin has been symlinked to.
BIN_DIR="$(follow_links "$(cd "${PROG_NAME%/*}" ; pwd -P)")"
SDK_DIR="$(cd "${BIN_DIR}/.." ; pwd -P)"
DART="$BIN_DIR/dart"
SNAPSHOT="$BIN_DIR/snapshots/pub.dart.snapshot"
if test -f "$SNAPSHOT"; then
# We are running the snapshot in the built SDK.
exec "$DART" "--checked" "$SNAPSHOT" "$@"
else
# We are running pub from source in the development repo.
if [ -z "$DART_CONFIGURATION" ];
then
DART_CONFIGURATION="ReleaseIA32"
fi
if [[ `uname` == 'Darwin' ]];
then
PACKAGES_DIR="$SDK_DIR"/../xcodebuild/$DART_CONFIGURATION/packages/
else
PACKAGES_DIR="$SDK_DIR"/../out/$DART_CONFIGURATION/packages/
fi
PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart"
exec "$DART" "--checked" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
fi
exec "$BIN_DIR"/dart "$DART_SDK"/bin/snapshots/pub.dart.snapshot $@