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

Revert "Use checked-in .package file for building and testing"

Browse source 
This reverts commit 5d3e356ca7.

BUG=
R=eernst@google.com

Review URL: https://codereview.chromium.org/2340813004 .
This commit is contained in:
William Hesse 2016-09-15 15:46:49 +02:00
parent 5d3e356ca7
commit 6d238ba197
26 changed files with 225 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -50,6 +50,7 @@ client/tests/drt
# Pub generated "packages" directories and files
packages
pubspec.lock
.packages
# Local pub storage
.pub

103
.packages
View file

@ -1,103 +0,0 @@
# Copyright (c) 2016, 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.
#
# .package file containing links to all packages in /pkg, and checked out
# by DEPS into /third_party/pkg and /third_party/pkg_tested.
# Please update this file if you add a package to DEPS or /pkg
#
analysis_server:pkg/analysis_server/lib
analyzer:pkg/analyzer/lib
analyzer_cli:pkg/analyzer_cli/lib
args:third_party/pkg/args/lib
async:third_party/pkg/async/lib
async_helper:pkg/async_helper/lib
barback:third_party/pkg/barback/lib
bazel_worker:third_party/pkg/bazel_worker/lib
boolean_selector:third_party/pkg/boolean_selector/lib
browser:pkg/browser/lib
charcode:third_party/pkg/charcode/lib
charted:third_party/observatory_pub_packages/packages/charted/lib
cli_util:third_party/pkg/cli_util/lib
code_transformers:third_party/pkg/code_transformers/lib
collection:third_party/pkg/collection/lib
compiler:pkg/compiler/lib
# Compiler is imported as compiler_unsupported so it can work outside the SDK.
compiler_unsupported:pkg/compiler/lib
convert:third_party/pkg/convert/lib
crypto:third_party/pkg/crypto/lib
csslib:third_party/pkg/csslib/lib
dart2js_incremental:pkg/dart2js_incremental/lib
dart2js_info:third_party/pkg/dart2js_info/lib
dart_messages:pkg/dart_messages/lib
dart_style:third_party/pkg_tested/dart_style/lib
dartdoc:third_party/pkg/dartdoc/lib
dev_compiler:pkg/dev_compiler/lib
expect:pkg/expect/lib
fixnum:third_party/pkg/fixnum/lib
func:third_party/pkg/func/lib
glob:third_party/pkg/glob/lib
html:third_party/pkg/html/lib
http:third_party/pkg/http/lib
http_multi_server:third_party/pkg/http_multi_server/lib
http_parser:third_party/pkg/http_parser/lib
http_throttle:third_party/pkg/http_throttle/lib
initialize:third_party/pkg/initialize/lib
intl:third_party/pkg/intl/lib
isolate:third_party/pkg/isolate/lib
js:pkg/js/lib
js_ast:pkg/js_ast/lib
js_runtime:sdk/lib/_internal/js_runtime/lib
json_rpc_2:third_party/pkg/json_rpc_2/lib
kernel:third_party/pkg/kernel/lib
linter:third_party/pkg/linter/lib
logging:third_party/pkg/logging/lib
lookup_map:pkg/lookup_map/lib
markdown:third_party/pkg/markdown/lib
matcher:third_party/pkg/matcher/lib
meta:pkg/meta/lib
metatest:third_party/pkg/metatest/lib
microlytics:pkg/microlytics/lib
mime:third_party/pkg/mime/lib
mustache4dart:third_party/pkg/mustache4dart/lib
oauth2:third_party/pkg/oauth2/lib
observatory:runtime/observatory/lib
observe:third_party/pkg/observe/lib
package_config:third_party/pkg_tested/package_config/lib
package_resolver:third_party/pkg_tested/package_resolver/lib
path:third_party/pkg/path/lib
petitparser:third_party/pkg/petitparser/lib
plugin:third_party/pkg/plugin/lib
pool:third_party/pkg/pool/lib
protobuf:third_party/pkg/protobuf/lib
pub:third_party/pkg/pub/lib
pub_cache:third_party/pkg/pub_cache/lib
pub_semver:third_party/pkg/pub_semver/lib
quiver:third_party/pkg/quiver/lib
resource:third_party/pkg/resource/lib
scheduled_test:third_party/pkg/scheduled_test/lib
sdk_library_metadata:sdk/lib/_internal/sdk_library_metadata/lib
shelf:third_party/pkg/shelf/lib
shelf_packages_handler:third_party/pkg/shelf_packages_handler/lib
shelf_static:third_party/pkg/shelf_static/lib
shelf_web_socket:third_party/pkg/shelf_web_socket/lib
smoke:third_party/pkg/smoke/lib
source_map_stack_trace:third_party/pkg/source_map_stack_trace/lib
source_maps:third_party/pkg/source_maps/lib
source_span:third_party/pkg/source_span/lib
stack_trace:third_party/pkg/stack_trace/lib
stream_channel:third_party/pkg/stream_channel/lib
string_scanner:third_party/pkg/string_scanner/lib
test:third_party/pkg/test/lib
test_reflective_loader:third_party/pkg/test_reflective_loader/lib
typed_data:third_party/pkg/typed_data/lib
typed_mock:pkg/typed_mock/lib
unittest:third_party/pkg/unittest/lib
usage:third_party/pkg/usage/lib
utf:third_party/pkg/utf/lib
watcher:third_party/pkg/watcher/lib
web_components:third_party/pkg/web_components/lib
web_socket_channel:third_party/pkg/web_socket_channel/lib
when:third_party/pkg/when/lib
which:third_party/pkg/which/lib
yaml:third_party/pkg/yaml/lib

6
pkg/pkg.gyp
View file

@ -26,13 +26,11 @@
],
'outputs': [
'<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
'<(PRODUCT_DIR)/.packages',
],
'action': [
'python', '../tools/make_links.py', '--create-links',
'--create-package-file',
'python', '../tools/make_links.py',
'--timestamp_file=<(SHARED_INTERMEDIATE_DIR)/packages.stamp',
'<(PRODUCT_DIR)',
'<(PRODUCT_DIR)/packages',
'<@(_inputs)',
# Pub imports dart2js as compiler_unsupported so it can work outside
# the SDK. Map that to the compiler package.

1
runtime/dart-runtime.gyp
View file

@ -186,6 +186,7 @@
'target_name': 'runtime_all',
'type': 'none',
'dependencies': [
'../pkg/pkg.gyp:pkg_packages',
'sample_extension',
],
},

2
runtime/observatory/observatory.gypi
View file

@ -12,6 +12,8 @@
'type': 'none',
'dependencies': [
'dart_bootstrap#host',
# We use packages for building
'../pkg/pkg.gyp:pkg_packages#target',
],
'toolsets': ['host'],
'actions': [

39
sdk/bin/dart2js
View file

@ -52,4 +52,41 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
DART2JS="$DART_ROOT/pkg/compiler/lib/src/dart2js.dart"
exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$DART2JS" "${EXTRA_OPTIONS[@]}" "$@"
if [[ `uname` == 'Darwin' ]]; then
OUT_DIR="$DART_ROOT/xcodebuild/"
else
OUT_DIR="$DART_ROOT/out/"
fi
if [ -z "$DART_CONFIGURATION" ];
then
DIRS=$( ls "$OUT_DIR" )
# list of possible configurations in decreasing desirability
CONFIGS=("ReleaseX64" "ReleaseIA32" "DebugX64" "DebugIA32"
"ReleaseARM" "ReleaseARM64" "ReleaseARMV5TE" "ReleaseMIPS"
"DebugARM" "DebugARM64" "DebugARMV5TE" "DebugMIPS")
DART_CONFIGURATION="None"
for CONFIG in ${CONFIGS[*]}
do
for DIR in $DIRS;
do
if [ "$CONFIG" = "$DIR" ];
then
# choose most desirable configuration that is available and break
DART_CONFIGURATION="$DIR"
break 2
fi
done
done
if [ "$DART_CONFIGURATION" = "None" ]
then
echo "No valid dart configuration found in $OUT_DIR"
exit 1
fi
fi
BUILD_DIR="$OUT_DIR$DART_CONFIGURATION"
PACKAGE_ROOT="$BUILD_DIR/packages/"
exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "--package-root=$PACKAGE_ROOT" "$DART2JS" "${EXTRA_OPTIONS[@]}" "$@"

9
sdk/bin/dart2js.bat
View file

@ -39,7 +39,14 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1%
set DART2JS=%DART_ROOT%\pkg\compiler\lib\src\dart2js.dart
"%DART%" %EXTRA_VM_OPTIONS% "%DART2JS%" %EXTRA_OPTIONS% %*
rem DART_CONFIGURATION defaults to ReleaseX64
if "%DART_CONFIGURATION%"=="" set DART_CONFIGURATION=ReleaseX64
set BUILD_DIR=%DART_ROOT%\out\%DART_CONFIGURATION%
set PACKAGE_ROOT=%BUILD_DIR%\packages
"%DART%" %EXTRA_VM_OPTIONS% "--package-root=%PACKAGE_ROOT%" "%DART2JS%" %EXTRA_OPTIONS% %*
endlocal

40
sdk/bin/dartanalyzer
View file

@ -45,4 +45,42 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
ANALYZER="$DART_ROOT/pkg/analyzer_cli/bin/analyzer.dart"
exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$ANALYZER" "$SDK_ARG" "$@"
if [[ `uname` == 'Darwin' ]];
then
OUT_DIR="$DART_ROOT/xcodebuild/"
else
OUT_DIR="$DART_ROOT/out/"
fi
if [ -z "$DART_CONFIGURATION" ];
then
DIRS=$( ls "$OUT_DIR" )
# list of possible configurations in decreasing desirability
CONFIGS=("ReleaseX64" "ReleaseIA32" "DebugX64" "DebugIA32"
"ReleaseARM" "ReleaseARM64" "ReleaseARMV5TE" "ReleaseMIPS"
"DebugARM" "DebugARM64" "DebugARMV5TE" "DebugMIPS")
DART_CONFIGURATION="None"
for CONFIG in ${CONFIGS[*]}
do
for DIR in $DIRS;
do
if [ "$CONFIG" = "$DIR" ];
then
# choose most desirable configuration that is available and break
DART_CONFIGURATION="$DIR"
break 2
fi
done
done
if [ "$DART_CONFIGURATION" = "None" ]
then
echo "No valid dart configuration found in $OUT_DIR"
exit 1
fi
fi
BUILD_DIR="$OUT_DIR$DART_CONFIGURATION"
PACKAGE_ROOT="$BUILD_DIR/packages/"
exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "--package-root=$PACKAGE_ROOT" "$ANALYZER" "$SDK_ARG" "$@"

9
sdk/bin/dartanalyzer.bat
View file

@ -40,7 +40,14 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1%
set ANALYZER=%DART_ROOT%\pkg\analyzer_cli\bin\analyzer.dart
"%DART%" %EXTRA_VM_OPTIONS% "%ANALYZER%" "%SDK_ARG%" %*
rem DART_CONFIGURATION defaults to ReleaseX64
if "%DART_CONFIGURATION%"=="" set DART_CONFIGURATION=ReleaseX64
set BUILD_DIR=%DART_ROOT%\out\%DART_CONFIGURATION%
set PACKAGE_ROOT=%BUILD_DIR%\packages
"%DART%" %EXTRA_VM_OPTIONS% "--package-root=%PACKAGE_ROOT%" "%ANALYZER%" "%SDK_ARG%" %*
endlocal

40
sdk/bin/dartdevc
View file

@ -45,4 +45,42 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
DEV_COMPILER="$DART_ROOT/pkg/dev_compiler/bin/dartdevc.dart"
exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "$DEV_COMPILER" "$SDK_ARG" "$@"
if [[ `uname` == 'Darwin' ]];
then
OUT_DIR="$DART_ROOT/xcodebuild/"
else
OUT_DIR="$DART_ROOT/out/"
fi
if [ -z "$DART_CONFIGURATION" ];
then
DIRS=$( ls "$OUT_DIR" )
# list of possible configurations in decreasing desirability
CONFIGS=("ReleaseX64" "ReleaseIA32" "DebugX64" "DebugIA32"
"ReleaseARM" "ReleaseARM64" "ReleaseARMV5TE" "ReleaseMIPS"
"DebugARM" "DebugARM64" "DebugARMV5TE" "DebugMIPS")
DART_CONFIGURATION="None"
for CONFIG in ${CONFIGS[*]}
do
for DIR in $DIRS;
do
if [ "$CONFIG" = "$DIR" ];
then
# choose most desirable configuration that is available and break
DART_CONFIGURATION="$DIR"
break 2
fi
done
done
if [ "$DART_CONFIGURATION" = "None" ]
then
echo "No valid dart configuration found in $OUT_DIR"
exit 1
fi
fi
BUILD_DIR="$OUT_DIR$DART_CONFIGURATION"
PACKAGE_ROOT="$BUILD_DIR/packages/"
exec "$DART" "${EXTRA_VM_OPTIONS[@]}" "--package-root=$PACKAGE_ROOT" "$DEV_COMPILER" "$SDK_ARG" "$@"

9
sdk/bin/dartdevc.bat
View file

@ -36,7 +36,14 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1%
set DEV_COMPILER=%DART_ROOT%\third_party\pkg\dev_compiler\bin\dartdevc.dart
"%DART%" %EXTRA_VM_OPTIONS% "DEV_COMPILER%" "%SDK_ARG%" %*
rem DART_CONFIGURATION defaults to ReleaseX64
if "%DART_CONFIGURATION%"=="" set DART_CONFIGURATION=ReleaseX64
set BUILD_DIR=%DART_ROOT%\out\%DART_CONFIGURATION%
set PACKAGE_ROOT=%BUILD_DIR%\packages
"%DART%" %EXTRA_VM_OPTIONS% "--package-root=%PACKAGE_ROOT%" "DEV_COMPILER%" "%SDK_ARG%" %*
endlocal

15
sdk/bin/dartfmt
View file

@ -28,4 +28,17 @@ DART_ROOT="$(cd "${SDK_DIR}/.." ; pwd -P)"
DARTFMT="$DART_ROOT/third_party/pkg_tested/dart_style/bin/format.dart"
exec "$DART" "$DARTFMT" "$@"
if [ -z "$DART_CONFIGURATION" ];
then
DART_CONFIGURATION="ReleaseX64"
fi
if [[ `uname` == 'Darwin' ]]; then
BUILD_DIR="$DART_ROOT/xcodebuild/$DART_CONFIGURATION"
else
BUILD_DIR="$DART_ROOT/out/$DART_CONFIGURATION"
fi
PACKAGE_ROOT="$BUILD_DIR/packages/"
exec "$DART" "--package-root=$PACKAGE_ROOT" "$DARTFMT" "$@"

9
sdk/bin/dartfmt.bat
View file

@ -27,7 +27,14 @@ if %DART_ROOT:~-1%==\ set DART_ROOT=%DART_ROOT:~0,-1%
set DARTFMT=%DART_ROOT%\third_party\pkg_tested\dart_style\bin\format.dart
"%DART%" "%DARTFMT%" %*
rem DART_CONFIGURATION defaults to ReleaseX64
if "%DART_CONFIGURATION%"=="" set DART_CONFIGURATION=ReleaseX64
set BUILD_DIR=%DART_ROOT%\out\%DART_CONFIGURATION%
set PACKAGE_ROOT=%BUILD_DIR%\packages
"%DART%" "--package-root=%PACKAGE_ROOT%" "%DARTFMT%" %*
endlocal

3
sdk/bin/pub
View file

@ -79,7 +79,8 @@ fi
# Use the Dart binary in the built SDK so pub can find the version file next
# to it.
DART="$BUILD_DIR/dart-sdk/bin/dart"
PACKAGES_DIR="$BUILD_DIR/packages/"
# Run pub.
PUB="$SDK_DIR/../third_party/pkg/pub/bin/pub.dart"
exec "$DART" "${VM_OPTIONS[@]}" "$PUB" "$@"
exec "$DART" "${VM_OPTIONS[@]}" "--package-root=$PACKAGES_DIR" "$PUB" "$@"

3
sdk/bin/pub.bat
View file

@ -31,11 +31,12 @@ if not "_%DART_VM_OPTIONS%_" == "__" (
rem Use the Dart binary in the built SDK so pub can find the version file next
rem to it.
set BUILD_DIR=%SDK_DIR%\..\out\ReleaseX64
set PACKAGES_DIR=%BUILD_DIR%\packages
set DART=%BUILD_DIR%\dart-sdk\bin\dart
rem Run pub.
set PUB="%SDK_DIR%\..\third_party\pkg\pub\bin\pub.dart"
"%DART%" %VM_OPTIONS% "%PUB%" %*
"%DART%" %VM_OPTIONS% --package-root="%PACKAGES_DIR%" "%PUB%" %*
endlocal

16
tests/standalone/io/http_client_stays_alive_test.dart
View file

@ -11,22 +11,12 @@ import "package:async_helper/async_helper.dart";
//
// The main script spawns a server and a subprocess which does a connection back
// to it.
// The subprocess is expected to shut down its idle sockets after
// The subprocess is expected to shut down it's idle sockets after
// [HttpClient.idleTimeout] and the main script will assert that this happens
// within +/- 2 <= seconds.
const SECONDS = 4;
List<String> packageOptions() {
if (Platform.packageRoot != null) {
return <String>['--package-root=${Platform.packageRoot}'];
} else if (Platform.packageConfig != null) {
return <String>['--packages=${Platform.packageConfig}'];
} else {
return <String>[];
}
}
void runServerProcess() {
asyncStart();
HttpServer.bind('127.0.0.1', 0).then((server) {
@ -39,7 +29,9 @@ void runServerProcess() {
});
var sw = new Stopwatch()..start();
var arguments = packageOptions()..add(Platform.script.toString())..add(url);
var arguments = ['--package-root=${Platform.packageRoot}',
'${Platform.script}',
url];
Process.run(Platform.executable, arguments).then((res) {
subscription.cancel();
if (res.exitCode != 0) {

45
tools/make_links.py
View file

@ -26,8 +26,6 @@ import os
import shutil
import subprocess
import sys
import urllib
import urlparse
import utils
# Useful messages when we find orphaned checkouts.
@ -45,15 +43,6 @@ def get_options():
action="store_true",
dest="quiet",
default=False)
result.add_option("--create-links",
help='Create links to the package lib directories in "packages/".',
action='store_false',
default=True)
result.add_option("--create-package-file",
help='Create a ".packages" file pointing to the packages.',
action='store_false',
default=True)
return result.parse_args()
def make_link(quiet, source, target, orig_source):
@ -92,12 +81,12 @@ def create_timestamp_file(options):
os.mkdir(dir_name)
open(options.timestamp_file, 'w').close()
def main(argv):
(options, args) = get_options()
target_dir = os.path.relpath(args[0])
target = os.path.join(target_dir, 'packages')
target = os.path.relpath(args[0])
if os.path.exists(target):
# If the packages directory already exists, delete the current links in
# If the packages directory already exists, delete the current links inside
# it. This is necessary, otherwise we can end up having links in there
# pointing to directories which no longer exist (on incremental builds).
for link in os.listdir(target):
@ -110,12 +99,7 @@ def main(argv):
os.remove(full_link)
else:
os.makedirs(target)
target = os.path.join(target_dir, '.packages')
if os.path.exists(target):
os.remove(target)
linked_names = {};
package_file_contents = '# .package file created by tools/make_links.py\n'
for source in args[1:]:
# Assume the source directory is named ".../NAME/lib".
split = source.split(':')
@ -138,21 +122,14 @@ def main(argv):
return 1
linked_names[name] = path
orig_source = source
if options.create_links:
if utils.GuessOS() == 'win32':
source = os.path.relpath(source)
else:
source = os.path.relpath(source, start=target)
exit_code = make_link(options.quiet,
source, os.path.join(target, name), orig_source)
if exit_code != 0:
return exit_code
abs_source = os.path.abspath(orig_source)
source_url = urlparse.urljoin('file:', urllib.pathname2url(abs_source))
package_file_contents += '%s:%s\n' % (name, source_url)
if options.create_package_file:
with open(os.path.join(target_dir, '.packages'), 'w') as package_file:
package_file.write(package_file_contents)
if utils.GuessOS() == 'win32':
source = os.path.relpath(source)
else:
source = os.path.relpath(source, start=target)
exit_code = make_link(
options.quiet, source, os.path.join(target, name), orig_source)
if exit_code != 0:
return exit_code
create_timestamp_file(options)
return 0

25
tools/testing/dart/test_suite.dart
View file

@ -956,7 +956,6 @@ class StandardTestSuite extends TestSuite {
// pubspec.yaml file and if so, create a custom package root for it.
List<Command> baseCommands = <Command>[];
Path packageRoot;
Path packages;
if (configuration['use_repository_packages'] ||
configuration['use_public_packages']) {
Path pubspecYamlFile = _findPubspecYamlFile(filePath);
@ -996,11 +995,11 @@ class StandardTestSuite extends TestSuite {
multiHtmlTestExpectations[fullTestName] =
testExpectations.expectations(fullTestName);
}
enqueueBrowserTest(baseCommands, packageRoot, packages, info, testName,
enqueueBrowserTest(baseCommands, packageRoot, info, testName,
multiHtmlTestExpectations);
} else {
enqueueBrowserTest(
baseCommands, packageRoot, packages, info, testName, expectations);
baseCommands, packageRoot, info, testName, expectations);
}
} else {
enqueueStandardTest(baseCommands, info, testName, expectations);
@ -1201,7 +1200,7 @@ class StandardTestSuite extends TestSuite {
* compilation and many browser runs).
*/
void enqueueBrowserTest(List<Command> baseCommands, Path packageRoot,
Path packages, TestInformation info, String testName, expectations) {
TestInformation info, String testName, expectations) {
RegExp badChars = new RegExp('[-=/]');
List VmOptionsList = getVmOptions(info.optionsFromFile);
bool multipleOptions = VmOptionsList.length > 1;
@ -1209,15 +1208,14 @@ class StandardTestSuite extends TestSuite {
String optionsName =
multipleOptions ? vmOptions.join('-').replaceAll(badChars, '') : '';
String tempDir = createOutputDirectory(info.filePath, optionsName);
enqueueBrowserTestWithOptions(baseCommands, packageRoot, packages,
info, testName, expectations, vmOptions, tempDir);
enqueueBrowserTestWithOptions(baseCommands, packageRoot, info, testName,
expectations, vmOptions, tempDir);
}
}
void enqueueBrowserTestWithOptions(
List<Command> baseCommands,
Path packageRoot,
Path packages,
TestInformation info,
String testName,
expectations,
@ -1587,11 +1585,12 @@ class StandardTestSuite extends TestSuite {
String packagesFromFile) {
if (packagesFromFile != null) {
return "--packages=$packagesFromFile";
} else if (packageRootFromFile != null) {
return "--package-root=$packageRootFromFile";
} else {
return null;
}
if (packageRootFromFile == "none") {
return null;
}
packageRootFromFile ??= "$buildDir/packages/";
return "--package-root=$packageRootFromFile";
}
/**
@ -1844,7 +1843,7 @@ class PKGTestSuite extends StandardTestSuite {
recursive: true);
void enqueueBrowserTest(List<Command> baseCommands, Path packageRoot,
packages, TestInformation info, String testName, expectations) {
TestInformation info, String testName, expectations) {
String runtime = configuration['runtime'];
Path filePath = info.filePath;
Path dir = filePath.directoryPath;
@ -1853,7 +1852,7 @@ class PKGTestSuite extends StandardTestSuite {
File customHtml = new File(customHtmlPath.toNativePath());
if (!customHtml.existsSync()) {
super.enqueueBrowserTest(
baseCommands, packageRoot, packages, info, testName, expectations);
baseCommands, packageRoot, info, testName, expectations);
} else {
Path relativeHtml = customHtmlPath.relativeTo(TestUtils.dartDir);
List<Command> commands = []..addAll(baseCommands);

2
utils/analysis_server/analysis_server.gyp
View file

@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
'../../pkg/pkg_files.gyp:pkg_files_stamp'
],
'actions': [
@ -26,6 +27,7 @@
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/analysis_server.dart.snapshot',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../pkg/analysis_server/bin/server.dart',
],
},

2
utils/compiler/compiler.gyp
View file

@ -12,6 +12,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
'dart2js_files_stamp',
],
'actions': [
@ -35,6 +36,7 @@
'create_snapshot.dart',
'--output_dir=<(SHARED_INTERMEDIATE_DIR)',
'--dart2js_main=pkg/compiler/lib/src/dart2js.dart',
'--package_root=<(PRODUCT_DIR)/packages/',
],
},
],

14
utils/compiler/create_snapshot.dart
View file

@ -61,9 +61,10 @@ void writeSnapshotFile(var path, var content) {
writer.close();
}
Future createSnapshot(var dart_file) {
Future createSnapshot(var dart_file, var packageRoot) {
return Process.run(Platform.executable,
["--snapshot=$dart_file.snapshot",
["--package-root=$packageRoot",
"--snapshot=$dart_file.snapshot",
dart_file])
.then((result) {
if (result.exitCode != 0) {
@ -79,9 +80,11 @@ Future createSnapshot(var dart_file) {
* Takes the following arguments:
* --output_dir=val The full path to the output_dir.
* --dart2js_main=val The path to the dart2js main script relative to root.
* --package-root=val The package-root used to find packages for the snapshot.
*/
void main(List<String> arguments) {
var validArguments = ["--output_dir", "--dart2js_main"];
var validArguments = ["--output_dir", "--dart2js_main",
"--package_root"];
var args = {};
for (var argument in arguments) {
var argumentSplit = argument.split("=");
@ -93,6 +96,7 @@ void main(List<String> arguments) {
}
if (!args.containsKey("dart2js_main")) throw "Please specify dart2js_main";
if (!args.containsKey("output_dir")) throw "Please specify output_dir";
if (!args.containsKey("package_root")) throw "Please specify package_root";
var scriptFile = Uri.base.resolveUri(Platform.script);
var path = scriptFile.resolve(".");
@ -100,13 +104,13 @@ void main(List<String> arguments) {
getSnapshotGenerationFile(args, rootPath).then((result) {
var wrapper = "${args['output_dir']}/utils_wrapper.dart";
writeSnapshotFile(wrapper, result);
createSnapshot(wrapper);
createSnapshot(wrapper, args["package_root"]);
});
getDart2jsSnapshotGenerationFile(args, rootPath).then((result) {
var wrapper = "${args['output_dir']}/dart2js.dart";
writeSnapshotFile(wrapper, result);
createSnapshot(wrapper);
createSnapshot(wrapper, args["package_root"]);
});
}

5
utils/dartanalyzer/dartanalyzer.gyp
View file

@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
],
'actions': [
{
@ -26,6 +27,7 @@
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/dartanalyzer.dart.snapshot',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../pkg/analyzer_cli/bin/analyzer.dart',
],
},
@ -42,6 +44,7 @@
],
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../pkg/analyzer/tool/summary/build_sdk_summaries.dart',
'single-output',
'<(SHARED_INTERMEDIATE_DIR)/sdk_summary_bundle.bin',
@ -57,6 +60,7 @@
],
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../pkg/analyzer/tool/summary/build_sdk_summaries.dart',
'extract-spec-sum',
'<(SHARED_INTERMEDIATE_DIR)/sdk_summary_bundle.bin',
@ -73,6 +77,7 @@
],
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../pkg/analyzer/tool/summary/build_sdk_summaries.dart',
'extract-strong-sum',
'<(SHARED_INTERMEDIATE_DIR)/sdk_summary_bundle.bin',

2
utils/dartdevc/dartdevc.gyp
View file

@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
],
'actions': [
{
@ -26,6 +27,7 @@
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/dartdevc.dart.snapshot',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../pkg/dev_compiler/bin/dartdevc.dart'
],
},

2
utils/dartdoc/dartdoc.gyp
View file

@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
],
'actions': [
{
@ -25,6 +26,7 @@
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/dartdoc.dart.snapshot',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../third_party/pkg/dartdoc/bin/dartdoc.dart',
],
},

2
utils/dartfmt/dartfmt.gyp
View file

@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
],
'actions': [
{
@ -25,6 +26,7 @@
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/dartfmt.dart.snapshot',
'--package-root=<(PRODUCT_DIR)/packages/',
'../../third_party/pkg_tested/dart_style/bin/format.dart',
],
},

2
utils/pub/pub.gyp
View file

@ -9,6 +9,7 @@
'type': 'none',
'dependencies': [
'../../runtime/dart-runtime.gyp:dart',
'../../pkg/pkg.gyp:pkg_packages',
'../../pkg/pkg_files.gyp:pkg_files_stamp',
'../../utils/compiler/compiler.gyp:dart2js_files_stamp'
],
@ -27,6 +28,7 @@
],
'action': [
'<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)dart<(EXECUTABLE_SUFFIX)',
'--package-root=<(PRODUCT_DIR)/packages/',
'--snapshot=<(SHARED_INTERMEDIATE_DIR)/pub.dart.snapshot',
'../../third_party/pkg/pub/bin/pub.dart',
]