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

[infra] Download checked in SDKs from CIPD

Browse source 
#33659

Change-Id: I94fccf4bbce2f0140bf0d6efa953d44b290df856
Reviewed-on: https://dart-review.googlesource.com/62840
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
Reviewed-by: Zach Anderson <zra@google.com>
This commit is contained in:
Alexander Thomas 2018-06-28 16:08:14 +00:00 committed by commit-bot@chromium.org
parent 4552beb514
commit 66c9109caf
13 changed files with 70 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
DEPS
View file

@ -8,6 +8,7 @@
allowed_hosts = [
'boringssl.googlesource.com',
'chrome-infra-packages.appspot.com',
'chromium.googlesource.com',
'dart.googlesource.com',
'fuchsia.googlesource.com',
@ -67,7 +68,7 @@ vars = {
# Note: updates to dart_style have to be coordinated carefully with
# the infrastructure-team so that the internal formatter in
# `sdk/tools/sdks/*/dart-sdk/bin/dartfmt` matches the version here.
# `sdk/tools/sdks/dart-sdk/bin/dartfmt` matches the version here.
#
# Please follow this process to make updates:
# * file an issue with area-infrastructure requesting a roll for this
@ -152,10 +153,20 @@ deps = {
Var("chromium_git") + "/chromium/llvm-project/cfe/tools/clang-format.git" +
"@" + Var("clang_format_scripts_rev"),
Var("dart_root") + "/tools/sdks": {
"packages": [
{
"package": "dart/dart-sdk/${{platform}}",
"version": "version:2.0.0-dev.65.0",
},
],
"dep_type": "cipd",
},
Var("dart_root") + "/tests/co19/src":
Var("dart_git") + "co19.git" + "@" + Var("co19_rev"),
Var("dart_root") + "/tests/co19_2/src":
Var("dart_root") + "/tests/co19_2/src":
Var("chromium_git") + "/external/github.com/dart-lang/co19.git" +
"@" + Var("co19_2_rev"),
@ -373,22 +384,6 @@ hooks = [
Var('dart_root') + '/third_party/d8',
],
},
{
"name": "checked_in_dart_sdks",
"pattern": ".",
"action": [
"download_from_google_storage",
"--no_auth",
"--no_resume",
"--bucket",
"dart-dependencies",
"--recursive",
"--auto_platform",
"--extract",
"--directory",
Var('dart_root') + "/tools/sdks",
],
},
{
"name": "firefox_jsshell",
"pattern": ".",

4
build/dart/dart_action.gni
View file

@ -227,9 +227,9 @@ template("prebuilt_dart_action") {
dfe = "$prebuilt_dart_sdk/bin/snapshots/kernel-service.dart.snapshot"
} else {
binary =
"$_dart_root/tools/sdks/$host_os/dart-sdk/bin/dart$executable_suffix"
"$_dart_root/tools/sdks/dart-sdk/bin/dart$executable_suffix"
dfe =
"$_dart_root/tools/sdks/$host_os/dart-sdk/bin/snapshots/kernel-service.dart.snapshot"
"$_dart_root/tools/sdks/dart-sdk/bin/snapshots/kernel-service.dart.snapshot"
}
target = "$_dart_root/runtime/bin:dart_bootstrap"
}

2
build/dart/prebuilt_dart_sdk.gni
View file

@ -7,7 +7,7 @@ import("../executable_suffix.gni")
_dart_root = rebase_path("../..")
_prebuilt_dart_exe =
"$_dart_root/tools/sdks/$host_os/dart-sdk/bin/dart$executable_suffix"
"$_dart_root/tools/sdks/dart-sdk/bin/dart$executable_suffix"
# When the first argument is "exec_script", gn_run_binary.py always exits with
# status 0, but gives non-empty output when the command it is given fails.

8
pkg/testing/lib/src/test_dart.dart
View file

@ -43,12 +43,10 @@ class TestDart extends Suite {
void writeRunCommandOn(StringSink sink) {
Uri dartVm;
if (Platform.isMacOS) {
dartVm = Uri.base.resolve("tools/sdks/mac/dart-sdk/bin/dart");
if (Platform.isMacOS || Platform.isLinux) {
dartVm = Uri.base.resolve("tools/sdks/dart-sdk/bin/dart");
} else if (Platform.isWindows) {
dartVm = Uri.base.resolve("tools/sdks/win/dart-sdk/bin/dart.exe");
} else if (Platform.isLinux) {
dartVm = Uri.base.resolve("tools/sdks/linux/dart-sdk/bin/dart");
dartVm = Uri.base.resolve("tools/sdks/dart-sdk/bin/dart.exe");
} else {
throw "Operating system not supported: ${Platform.operatingSystem}";
}

4
pkg/vm/tool/gen_kernel
View file

@ -28,10 +28,10 @@ SDK_DIR="$CUR_DIR/../../.."
# TODO(kustermann): For windows as well as for hosts running on arm, our
# checked-in dart binaries must be adjusted.
if [[ `uname` == 'Darwin' ]]; then
DART="$SDK_DIR/tools/sdks/mac/dart-sdk/bin/dart"
DART="$SDK_DIR/tools/sdks/dart-sdk/bin/dart"
OUT_DIR="$SDK_DIR/xcodebuild"
else
DART="$SDK_DIR/tools/sdks/linux/dart-sdk/bin/dart"
DART="$SDK_DIR/tools/sdks/dart-sdk/bin/dart"
OUT_DIR="$SDK_DIR/out"
fi

2
pkg/vm/tool/gen_kernel.bat
View file

@ -13,6 +13,6 @@ if %SCRIPTPATH:~-1%==\ set SCRIPTPATH=%SCRIPTPATH:~0,-1%
set SDK_DIR=%SCRIPTPATH%/../../../
set DART=%SDK_DIR%/tools/sdks/win/dart-sdk/bin/dart.exe
set DART=%SDK_DIR%/tools/sdks/dart-sdk/bin/dart.exe
"%DART%" %DART_VM_OPTIONS% "%SDK_DIR%/pkg/vm/bin/gen_kernel.dart" %*

4
tools/download_latest_dev_sdk.py
View file

@ -5,7 +5,7 @@
# This script downloads the latest dev SDK from
# http://gsdview.appspot.com/dart-archive/channels/dev/raw/latest/sdk/
# into tools/sdks/$HOST_OS/. It is intended to be invoked from Jiri hooks in
# into tools/sdks/. It is intended to be invoked from Jiri hooks in
# a Fuchsia checkout.
import os
@ -49,7 +49,7 @@ def main(argv):
host_os = host_os_for_sdk(HOST_OS)
zip_file = ('dartsdk-%s-x64-release.zip' % HOST_OS)
sha_file = zip_file + '.sha256sum'
sdk_path = os.path.join(DART_ROOT, 'tools', 'sdks', host_os)
sdk_path = os.path.join(DART_ROOT, 'tools', 'sdks')
local_sha_path = os.path.join(sdk_path, sha_file)
remote_sha_path = os.path.join(sdk_path, sha_file + '.remote')
zip_path = os.path.join(sdk_path, zip_file)

13
tools/sdks/.gitignore vendored
View file

@ -1,12 +1 @@
/linux/dart-sdk
/linux/dart-sdk.tar.gz
/linux/dartsdk-linux-x64-release.zip
/linux/dartsdk-linux-x64-release.zip.sha256sum
/win/dart-sdk
/win/dart-sdk.tar.gz
/win/dartsdk-windows-x64-release.zip
/win/dartsdk-windows-x64-release.zip.sha256sum
/mac/dart-sdk
/mac/dart-sdk.tar.gz
/mac/dartsdk-macos-x64-release.zip
/mac/dartsdk-macos-x64-release.zip.sha256sum
/dart-sdk

1
tools/sdks/linux/dart-sdk.tar.gz.sha1
View file

@ -1 +0,0 @@
739732637a9d7a2cbd04beb36c4d117d615fd22c

1
tools/sdks/mac/dart-sdk.tar.gz.sha1
View file

@ -1 +0,0 @@
80c81b7d814e5897b8350b6f2a3b60353080ca45

72
tools/sdks/update.sh
View file

@ -1,5 +1,5 @@
#!/usr/bin/env bash
# Updates the checked in SDKs
# Uploads a new version of the checked in SDK CIPD packages
set -e
set -x
@ -21,35 +21,53 @@ trap cleanup EXIT HUP INT QUIT TERM PIPE
pushd "$tmpdir"
gsutil cp "gs://dart-archive/channels/$channel/release/$1/sdk/dartsdk-linux-x64-release.zip" .
unzip -q dartsdk-linux-x64-release.zip -d sdk
cipd create \
-name dart/dart-sdk/linux-amd64 \
-in sdk \
-install-mode copy \
-tag version:$1 \
-ref $channel
rm -rf sdk
gsutil cp "gs://dart-archive/channels/$channel/release/$1/sdk/dartsdk-linux-arm-release.zip" .
unzip -q dartsdk-linux-arm-release.zip -d sdk
cipd create \
-name dart/dart-sdk/linux-armv6l \
-in sdk \
-install-mode copy \
-tag version:$1 \
-ref $channel
rm -rf sdk
gsutil cp "gs://dart-archive/channels/$channel/release/$1/sdk/dartsdk-linux-arm64-release.zip" .
unzip -q dartsdk-linux-arm64-release.zip -d sdk
cipd create \
-name dart/dart-sdk/linux-arm64 \
-in sdk \
-install-mode copy \
-tag version:$1 \
-ref $channel
rm -rf sdk
gsutil cp "gs://dart-archive/channels/$channel/release/$1/sdk/dartsdk-macos-x64-release.zip" .
unzip -q dartsdk-macos-x64-release.zip -d sdk
cipd create \
-name dart/dart-sdk/mac-amd64 \
-in sdk \
-install-mode copy \
-tag version:$1 \
-ref $channel
rm -rf sdk
gsutil cp "gs://dart-archive/channels/$channel/release/$1/sdk/dartsdk-windows-ia32-release.zip" .
unzip -q dartsdk-linux-arm-release.zip dart-sdk/bin/dart
mv dart-sdk/bin/dart dart-sdk/bin/dart-arm
unzip -q dartsdk-linux-arm64-release.zip dart-sdk/bin/dart
mv dart-sdk/bin/dart dart-sdk/bin/dart-arm64
unzip -q dartsdk-linux-x64-release.zip
tar -czf dart-sdk.tar.gz dart-sdk
upload_to_google_storage.py -b dart-dependencies dart-sdk.tar.gz
mv dart-sdk.tar.gz.sha1 dart-sdk.tar.gz.sha1-linux
rm -rf dart-sdk
unzip -q dartsdk-macos-x64-release.zip
tar -czf dart-sdk.tar.gz dart-sdk
upload_to_google_storage.py -b dart-dependencies dart-sdk.tar.gz
mv dart-sdk.tar.gz.sha1 dart-sdk.tar.gz.sha1-mac
rm -rf dart-sdk
unzip -q dartsdk-windows-ia32-release.zip
tar -czf dart-sdk.tar.gz dart-sdk
upload_to_google_storage.py -b dart-dependencies dart-sdk.tar.gz
mv dart-sdk.tar.gz.sha1 dart-sdk.tar.gz.sha1-win
rm -rf dart-sdk
unzip -q dartsdk-windows-ia32-release.zip -d sdk
cipd create \
-name dart/dart-sdk/windows-amd64 \
-in sdk \
-install-mode copy \
-tag version:$1 \
-ref $channel
rm -rf sdk
popd
mv $tmpdir/dart-sdk.tar.gz.sha1-linux linux/dart-sdk.tar.gz.sha1
mv $tmpdir/dart-sdk.tar.gz.sha1-mac mac/dart-sdk.tar.gz.sha1
mv $tmpdir/dart-sdk.tar.gz.sha1-win win/dart-sdk.tar.gz.sha1

1
tools/sdks/win/dart-sdk.tar.gz.sha1
View file

@ -1 +0,0 @@
5dbee047c7824357eb7e6581cd69687a623449ab

1
tools/utils.py
View file

@ -676,7 +676,6 @@ def CheckedInSdkPath():
tools_dir = os.path.dirname(os.path.realpath(__file__))
return os.path.join(tools_dir,
'sdks',
osname,
'dart-sdk')