firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow snippets tool to be run from arbitrary CWDs (#25243)

Browse Source 
* Allow snippets tool to be run from arbitrary CWDs

* Drop use of absolute when using Platform.executable (path is not relative, might require PATH resolution)

* canonicalize paths

* Use path.fromUri consistently to resolve file URIs

* Force commit to try to kick Cirrus

* Force commit to kick Cirrus, again
This commit is contained in:
Janice Collins 2018-12-12 09:40:18 -08:00 committed by GitHub
parent e29b023a6b
commit 4a110b6227
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/bots/analyze-sample-code.dart
View File

@ -124,7 +124,7 @@ class SampleChecker {
/// Finds the location of the snippets script. /// Finds the location of the snippets script.
String get _snippetsExecutable { String get _snippetsExecutable {
final String platformScriptPath = path.dirname(Platform.script.toFilePath()); final String platformScriptPath = path.dirname(path.fromUri(Platform.script));
return path.canonicalize(path.join(platformScriptPath, '..', 'snippets', 'lib', 'main.dart')); return path.canonicalize(path.join(platformScriptPath, '..', 'snippets', 'lib', 'main.dart'));
} }
@ -206,18 +206,18 @@ class SampleChecker {
if (_snippetsSnapshotPath == null) { if (_snippetsSnapshotPath == null) {
_snippetsSnapshotPath = '$_snippetsExecutable.snapshot'; _snippetsSnapshotPath = '$_snippetsExecutable.snapshot';
return Process.runSync( return Process.runSync(
path.absolute(Platform.executable), path.canonicalize(Platform.executable),
<String>[ <String>[
'--snapshot=$_snippetsSnapshotPath', '--snapshot=$_snippetsSnapshotPath',
'--snapshot-kind=app-jit', '--snapshot-kind=app-jit',
path.absolute(_snippetsExecutable), path.canonicalize(_snippetsExecutable),
]..addAll(args), ]..addAll(args),
workingDirectory: workingDirectory, workingDirectory: workingDirectory,
); );
} else { } else {
return Process.runSync( return Process.runSync(
path.absolute(Platform.executable), path.canonicalize(Platform.executable),
<String>[path.absolute(_snippetsSnapshotPath)]..addAll(args), <String>[path.canonicalize(_snippetsSnapshotPath)]..addAll(args),
workingDirectory: workingDirectory, workingDirectory: workingDirectory,
); );
} }

4
dev/snippets/lib/snippets.dart
View File

@ -30,8 +30,8 @@ class _ComponentTuple {
class SnippetGenerator { class SnippetGenerator {
SnippetGenerator({Configuration configuration}) SnippetGenerator({Configuration configuration})
: configuration = configuration ?? : configuration = configuration ??
// This script must be run from dev/docs, so the root is up two levels. // Flutter's root is four directories up from this script.
Configuration(flutterRoot: Directory(path.canonicalize(path.join('..', '..')))) { Configuration(flutterRoot: Directory(Platform.environment['FLUTTER_ROOT'] ?? path.canonicalize(path.join(path.dirname(path.fromUri(Platform.script)), '..', '..', '..')))) {
this.configuration.createOutputDirectory(); this.configuration.createOutputDirectory();
} }