Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 29c00e2

Browse files
munificentcommit-bot@chromium.org
authored andcommitted
Don't look for the forked SDK in the migration script.
Now that we're unforked, this is no longer needed. Change-Id: I7016d34e11138ff21bcdb4af2795f7d4faa3e0fb Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/147817 Auto-Submit: Bob Nystrom <[email protected]> Commit-Queue: Nicholas Shahan <[email protected]> Reviewed-by: Nicholas Shahan <[email protected]>
1 parent 6e5cf35 commit 29c00e2

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

tools/migration/lib/src/analyze.dart

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,7 @@ Future<Map<String, List<_StaticError>>> _runAnalyzer(String inputDir,
9696
"${nnbd ? ' with NNBD' : ''}...");
9797
var result = await Process.run("dartanalyzer", [
9898
"--packages=${p.join(sdkRoot, '.packages')}",
99-
if (nnbd) ...[
100-
"--dart-sdk=$nnbdSdkBuildDir",
101-
"--enable-experiment=non-nullable",
102-
],
99+
if (nnbd) "--enable-experiment=non-nullable",
103100
"--format=machine",
104101
inputDir,
105102
]);

tools/migration/lib/src/io.dart

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import 'dart:io';
66

77
import 'package:path/path.dart' as p;
88

9-
import 'log.dart';
10-
119
/// True if the file system should be left untouched.
1210
bool dryRun = false;
1311

@@ -16,21 +14,6 @@ final String sdkRoot =
1614

1715
final String testRoot = p.join(sdkRoot, "tests");
1816

19-
final String nnbdSdkBuildDir = () {
20-
var buildDir = Platform.isMacOS ? "xcodebuild" : "out";
21-
var path = p.join(sdkRoot, buildDir, "ReleaseX64NNBD", "dart-sdk");
22-
23-
if (!Directory(path).existsSync()) {
24-
print(red("Could not find an NNBD SDK at $path"));
25-
print(red("Please build the NNBD SDK using:"));
26-
print("");
27-
print(red(" ./tools/build.py -m release --nnbd create_sdk"));
28-
exit(1);
29-
}
30-
31-
return path;
32-
}();
33-
3417
/// Copies the file from [from] to [to], which are both assumed to be relative
3518
/// paths inside "tests".
3619
void copyFile(String from, String to) {

0 commit comments

Comments
 (0)