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

Revert "Migration: fix generate_resources.dart to use dart compile js."

Browse source 
This reverts commit 6abea1381b.

Reason for revert: Breaks internal build of migration tool

Original change's description:
> Migration: fix generate_resources.dart to use `dart compile js`.
>
> This is necessary because the command `dart2js` is no longer present
> in the SDK.
>
> Change-Id: Iea3cf3092bcda6c889c55a51d1b5601773404fb9
> Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/253862
> Reviewed-by: Samuel Rawlins <srawlins@google.com>
> Commit-Queue: Paul Berry <paulberry@google.com>

TBR=paulberry@google.com,srawlins@google.com

Change-Id: I73c3321e6c473f5690eaddd94d13003c978234b6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/253900
Reviewed-by: Paul Berry <paulberry@google.com>
Reviewed-by: Samuel Rawlins <srawlins@google.com>
Commit-Queue: Paul Berry <paulberry@google.com>
This commit is contained in:
Paul Berry 2022-08-07 12:31:19 +00:00 committed by Commit Bot
parent fab3bc0467
commit 4b61ceb1d2
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
pkg/nnbd_migration/tool/codegen/generate_resources.dart
View file

@ -18,7 +18,7 @@ void main(List<String> args) async {
var argParser = ArgParser()
..addFlag('verify', negatable: false)
..addFlag('dev', negatable: false)
..addOption('dart_path')
..addOption('dart2js_path')
..addFlag('help', negatable: false);
var argResults = argParser.parse(args);
if (argResults['help'] == true) {
@ -45,7 +45,8 @@ Run with '--verify' to validate that the web resource have been regenerated.
if (verify) {
verifyResourcesGDartGenerated();
} else {
await compileWebFrontEnd(devMode: dev!, dartPath: dartPath(argResults)!);
await compileWebFrontEnd(
devMode: dev!, dart2jsPath: dart2jsPath(argResults)!);
print('');
@ -90,11 +91,9 @@ String base64Encode(List<int> bytes) {
}
Future<void> compileWebFrontEnd(
{required bool devMode, required String dartPath}) async {
// dart compile js -m -o output source
var process = await Process.start(dartPath, [
'compile',
'js',
{required bool devMode, required String dart2jsPath}) async {
// dart2js -m -o output source
var process = await Process.start(dart2jsPath, [
devMode ? '-O1' : '-m',
'--no-frequency-based-minification',
'-o',
@ -121,12 +120,14 @@ void createResourcesGDart() {
resourcesFile.writeAsStringSync(content);
}
/// Returns the dartPath, either from [argResults] or the Platform.
String? dartPath(ArgResults argResults) {
if (argResults.wasParsed('dart_path')) {
return argResults['dart_path'] as String?;
/// Returns the dart2jsPath, either from [argResults] or the Platform.
String? dart2jsPath(ArgResults argResults) {
if (argResults.wasParsed('dart2js_path')) {
return argResults['dart2js_path'] as String?;
} else {
return Platform.resolvedExecutable;
var sdkBinDir = path.dirname(Platform.resolvedExecutable);
var dart2jsBinary = Platform.isWindows ? 'dart2js.bat' : 'dart2js';
return path.join(sdkBinDir, dart2jsBinary);
}
}