Skip to content

Commit

Permalink
Start pulling pub from its own repo.
Browse files Browse the repository at this point in the history
Pub now lives in third_party/pkg/pub (it's in pkg to make it possible to import
using "package:" imports).

R=ricow@google.com, rnystrom@google.com

Review URL: https://codereview.chromium.org//1165473002
  • Loading branch information
nex3 committed May 29, 2015
1 parent 8f1506e commit 3d8c06c
Show file tree
Hide file tree
Showing 584 changed files with 26 additions and 46,883 deletions.
3 changes: 3 additions & 0 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ vars = {
"ply_rev": "@604b32590ffad5cbb82e4afef1d305512d06ae93",
"plugin_tag": "@0.1.0",
"pool_rev": "@22e12aeb16ad0b626900dbe79e4a25391ddfb28c",
"pub_rev": "@6f2a1b90b8210a85a38aab1af479c047681c29e6",
"pub_semver_tag": "@1.2.1",
"scheduled_test_tag": "@0.11.8+1",
"shelf_rev": "@1e87b79b21ac5e6fa2f93576d6c06eaa65285ef4",
Expand Down Expand Up @@ -238,6 +239,8 @@ deps = {
(Var("github_mirror") % "pool") + Var("pool_rev"),
Var("dart_root") + "/third_party/pkg/pub_semver":
(Var("github_mirror") % "pub_semver") + Var("pub_semver_tag"),
Var("dart_root") + "/third_party/pkg_tested/pub":
("https://github.com/dart-lang/pub.git") + Var("pub_rev"),
Var("dart_root") + "/third_party/pkg/scheduled_test":
(Var("github_mirror") % "scheduled_test") +
Var("scheduled_test_tag"),
Expand Down
3 changes: 3 additions & 0 deletions pkg/pkg.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
'--timestamp_file=<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
'<(PRODUCT_DIR)/packages',
'<@(_inputs)',
# Pub imports dart2js as compiler_unsupported so it can work outside
# the SDK. Map that to the compiler package.
'compiler/lib:compiler_unsupported'
],
},
],
Expand Down
2 changes: 1 addition & 1 deletion sdk/bin/pub
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,5 @@ DART="$BUILD_DIR/dart-sdk/bin/dart"
PACKAGES_DIR="$BUILD_DIR/packages/"

# Run pub.
PUB="$SDK_DIR/lib/_internal/pub/bin/pub.dart"
PUB="$SDK_DIR/../third_party/pkg_tested/pub/bin/pub.dart"
exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@"
2 changes: 1 addition & 1 deletion sdk/bin/pub.bat
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ set PACKAGES_DIR=%BUILD_DIR%\packages
set DART=%BUILD_DIR%\dart-sdk\bin\dart

rem Run pub.
set PUB="%SDK_DIR%\lib\_internal\pub\bin\pub.dart"
set PUB="%SDK_DIR%\..\third_party\pkg_tested\pub\bin\pub.dart"
"%DART%" %VM_OPTIONS% --package-root="%PACKAGES_DIR%" "%PUB%" %*

endlocal
Expand Down
90 changes: 0 additions & 90 deletions sdk/lib/_internal/pub/README.md

This file was deleted.

184 changes: 0 additions & 184 deletions sdk/lib/_internal/pub/asset/dart/serialize.dart

This file was deleted.

Loading

0 comments on commit 3d8c06c

Please sign in to comment.