Version 3.9.0-232.0.dev

Merge 2bc4081 into dev

Author: Dart CI

CHANGELOG.md

@@ -23,6 +23,11 @@ constraint][language version] lower bound to 3.9 or greater (`sdk: '^3.9.0'`).
 [`switch_on_type`]: http://dart.dev/lints/switch_on_type
 [`unnecessary_unawaited`]: http://dart.dev/lints/unnecessary_unawaited
 
+#### Dart build
+
+- Breaking change of feature in preview: `dart build -f exe <target>` is now
+  `dart build cli --target=<target>`. See `dart build cli --help` for more info.
+
 #### Dart Development Compiler (dartdevc)
 
 - Outstanding async code now checks and cancels itself after a hot restart if

DEPS

@@ -54,7 +54,7 @@ vars = {
 
   # co19 is a cipd package automatically generated for each co19 commit.
   # Use tests/co19/update.sh to update this hash.
-  "co19_rev": "ae9af9df72a7d5998cbbfd910da0f42e329d964f",
+  "co19_rev": "c23b0d593e185fa45d37cd6373f33d20956cab40",
 
   # The internal benchmarks to use. See go/dart-benchmarks-internal
   "benchmarks_internal_rev": "1fa5d33a45f7d4dd0093124706cdfa45d9270851",
@@ -84,7 +84,7 @@ vars = {
   "download_reclient": True,
 
   # Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
-  "fuchsia_sdk_version": "version:28.20250611.5.1",
+  "fuchsia_sdk_version": "version:28.20250612.3.1",
   "download_fuchsia_deps": False,
 
   # Ninja, runs the build based on files generated by GN.

pkg/analyzer/lib/src/dart/resolver/flow_analysis_visitor.dart

@@ -245,13 +245,10 @@ class FlowAnalysisHelper {
         // a `FormalParameterListImpl`
         var declaredElement =
             parameter.declaredFragment!.element as PromotableElementImpl2;
-        // TODO(paulberry): `skipDuplicateCheck` is currently needed to work
-        // around a failure in duplicate_definition_test.dart; fix this.
         flow!.declare(
           declaredElement,
           SharedTypeView(declaredElement.type),
           initialized: true,
-          skipDuplicateCheck: true,
         );
       }
     }

pkg/dartdev/lib/src/commands/build.dart

@@ -10,11 +10,11 @@ import 'package:dart2native/generate.dart';
 import 'package:dartdev/src/commands/compile.dart';
 import 'package:dartdev/src/experiments.dart';
 import 'package:dartdev/src/native_assets_bundling.dart';
+import 'package:dartdev/src/native_assets_macos.dart';
 import 'package:dartdev/src/sdk.dart';
 import 'package:front_end/src/api_prototype/compiler_options.dart'
     show Verbosity;
 import 'package:path/path.dart' as path;
-import 'package:vm/target_os.dart'; // For possible --target-os values.
 
 import '../core.dart';
 import '../native_assets.dart';
@@ -29,37 +29,87 @@ class BuildCommand extends DartdevCommand {
   BuildCommand({bool verbose = false, required this.recordUseEnabled})
       : super(cmdName, 'Build a Dart application including native assets.',
             verbose) {
+    addSubcommand(BuildCliSubcommand(
+      verbose: verbose,
+      recordUseEnabled: recordUseEnabled,
+    ));
+  }
+}
+
+/// Subcommand for `dart build cli`.
+///
+/// Expects [Directory.current] to contain a Dart project with a bin/ directory.
+class BuildCliSubcommand extends CompileSubcommandCommand {
+  final bool recordUseEnabled;
+
+  static const String cmdName = 'cli';
+
+  static final OS targetOS = OS.current;
+  late final List<File> entryPoints;
+
+  BuildCliSubcommand({bool verbose = false, required this.recordUseEnabled})
+      : super(
+            cmdName,
+            '''Build a Dart application with a command line interface (CLI).
+
+The resulting CLI app bundle is structured in the following manner:
+
+bundle/
+  bin/
+    <executable>
+  lib/
+    <dynamic libraries>
+''',
+            verbose) {
+    final binDirectory =
+        Directory.fromUri(Directory.current.uri.resolve('bin/'));
+
+    final outputDirectoryDefault = Directory.fromUri(Directory.current.uri
+        .resolve('build/cli/${OS.current}-${Architecture.current}/'));
+    entryPoints = binDirectory.existsSync()
+        ? binDirectory
+            .listSync()
+            .whereType<File>()
+            .where((e) => e.path.endsWith('dart'))
+            .toList()
+        : [];
     argParser
       ..addOption(
-        outputOptionName,
+        'output',
         abbr: 'o',
         help: '''
-          Write the output to <folder name>.
+          Write the output to <output>/bundle/.
           This can be an absolute or relative path.
           ''',
+        valueHelp: 'path',
+        defaultsTo: path
+            .relative(outputDirectoryDefault.path, from: Directory.current.path)
+            .makeFolder(),
       )
       ..addOption(
-        formatOptionName,
-        abbr: 'f',
-        allowed: ['exe', 'aot'],
-        defaultsTo: 'exe',
+        'target',
+        abbr: 't',
+        help: '''The main entry-point file of the command-line application.
+Must be a Dart file in the bin/ directory.
+If the "--target" option is omitted, and there is a single Dart file in bin/,
+then that is used instead.''',
+        valueHelp: 'path',
+        defaultsTo: entryPoints.length == 1
+            ? path.relative(entryPoints.single.path,
+                from: Directory.current.path)
+            : null,
       )
-      ..addOption('target-os',
-          help: 'Compile to a specific target operating system.',
-          allowed: TargetOS.names)
       ..addOption(
         'verbosity',
         help: 'Sets the verbosity level of the compilation.',
+        valueHelp: 'level',
         defaultsTo: Verbosity.defaultValue,
         allowed: Verbosity.allowedValues,
         allowedHelp: Verbosity.allowedValuesHelp,
       )
       ..addExperimentalFlags(verbose: verbose);
   }
 
-  @override
-  String get invocation => '${super.invocation} <dart entry point>';
-
   @override
   Future<int> run() async {
     if (!Sdk.checkArtifactExists(genKernel) ||
@@ -75,62 +125,42 @@ class BuildCommand extends DartdevCommand {
     }
     final args = argResults!;
 
-    // We expect a single rest argument; the dart entry point.
-    if (args.rest.length != 1) {
-      // This throws.
-      usageException('Missing Dart entry point.');
-    }
-
-    // TODO(https://dartbug.com/52458): Support `dart build <pkg>:<bin-script>`.
-    // Similar to Dart run. Possibly also in `dart compile`.
-    final sourceUri = Uri(path: args.rest[0].normalizeCanonicalizePath());
+    final sourceUri =
+        File.fromUri(Uri.file(args.option('target')!).normalizePath())
+            .absolute
+            .uri;
     if (!checkFile(sourceUri.toFilePath())) {
       return genericErrorExitCode;
     }
 
     final outputUri = Uri.directory(
-      args.option(outputOptionName)?.normalizeCanonicalizePath().makeFolder() ??
+      args.option('output')?.normalizeCanonicalizePath().makeFolder() ??
           sourceUri.toFilePath().removeDotDart().makeFolder(),
     );
     if (await File.fromUri(outputUri.resolve('pubspec.yaml')).exists()) {
       stderr.writeln("'dart build' refuses to delete your project.");
       stderr.writeln('Requested output directory: ${outputUri.toFilePath()}');
       return 128;
     }
+    final outputDir = Directory.fromUri(outputUri);
+    if (await outputDir.exists()) {
+      stdout.writeln('Deleting output directory: ${outputUri.toFilePath()}.');
+      await outputDir.delete(recursive: true);
+    }
+    final bundleDirectory = Directory.fromUri(outputUri.resolve('bundle/'));
+    final binDirectory = Directory.fromUri(bundleDirectory.uri.resolve('bin/'));
+    await binDirectory.create(recursive: true);
 
-    final format = Kind.values.byName(args.option(formatOptionName)!);
-    final outputExeUri = outputUri.resolve(
-      format.appendFileExtension(
-        sourceUri.pathSegments.last.split('.').first,
+    final outputExeUri = binDirectory.uri.resolve(
+      targetOS.executableFileName(
+        path.basenameWithoutExtension(sourceUri.path),
       ),
     );
-    String? targetOS = args['target-os'];
-    if (format != Kind.exe) {
-      assert(format == Kind.aot);
-      // If we're generating an AOT snapshot and not an executable, then
-      // targetOS is allowed to be null for a platform-independent snapshot
-      // or a different platform than the host.
-    } else if (targetOS == null) {
-      targetOS = Platform.operatingSystem;
-    } else if (targetOS != Platform.operatingSystem) {
-      stderr.writeln(
-          "'dart build -f ${format.name}' does not support cross-OS compilation.");
-      stderr.writeln('Host OS: ${Platform.operatingSystem}');
-      stderr.writeln('Target OS: $targetOS');
-      return 128;
-    }
 
-    stdout.writeln('''The `dart build` command is in preview at the moment.
+    stdout.writeln('''The `dart build cli` command is in preview at the moment.
 See documentation on https://dart.dev/interop/c-interop#native-assets.
 ''');
 
-    final outputDir = Directory.fromUri(outputUri);
-    if (await outputDir.exists()) {
-      stdout.writeln('Deleting output directory: ${outputUri.toFilePath()}.');
-      await outputDir.delete(recursive: true);
-    }
-    await outputDir.create(recursive: true);
-
     stdout.writeln('Building native assets.');
     final packageConfigUri = await DartNativeAssetsBuilder.ensurePackageConfig(
       sourceUri,
@@ -168,14 +198,14 @@ See documentation on https://dart.dev/interop/c-interop#native-assets.
       final generator = KernelGenerator(
         genSnapshot: genSnapshotHost,
         targetDartAotRuntime: hostDartAotRuntime,
-        kind: format,
+        kind: Kind.exe,
         sourceFile: sourceUri.toFilePath(),
         outputFile: outputExeUri.toFilePath(),
         verbose: verbose,
         verbosity: args.option('verbosity')!,
         defines: [],
         packages: packageConfigUri.toFilePath(),
-        targetOS: targetOS == null ? null : OS.fromString(targetOS),
+        targetOS: targetOS,
         enableExperiment: args.enabledExperiments.join(','),
         tempDir: tempDir,
       );
@@ -214,7 +244,7 @@ Use linkMode as dynamic library instead.""");
         final kernelAssets = await bundleNativeAssets(
           allAssets,
           builder.target,
-          outputUri,
+          binDirectory.uri,
           relocatable: true,
           verbose: true,
         );
@@ -226,7 +256,11 @@ Use linkMode as dynamic library instead.""");
         nativeAssets: nativeAssetsYamlUri?.toFilePath(),
       );
 
-      // End linking here.
+      if (targetOS == OS.macOS) {
+        // The dylibs are opened with a relative path to the executable.
+        // MacOS prevents opening dylibs that are not on the include path.
+        await rewriteInstallPath(outputExeUri);
+      }
     } finally {
       await tempDir.delete(recursive: true);
     }

pkg/dartdev/lib/src/native_assets_bundling.dart

@@ -10,6 +10,8 @@ import 'package:data_assets/data_assets.dart';
 import 'package:hooks/hooks.dart';
 import 'package:hooks_runner/hooks_runner.dart';
 
+final libOutputDirectoryUriFromBin =
+    Uri.file('../').resolveUri(libOutputDirectoryUri);
 final libOutputDirectoryUri = Uri.file('lib/');
 final dataOutputDirectoryUri = Uri.file('assets/');
 
@@ -130,7 +132,7 @@ extension on CodeAsset {
       LookupInProcess() => KernelAssetInProcess(),
       DynamicLoadingBundled() => () {
           final relativeUri =
-              libOutputDirectoryUri.resolve(file!.pathSegments.last);
+              libOutputDirectoryUriFromBin.resolve(file!.pathSegments.last);
           return relocatable
               ? KernelAssetRelativePath(relativeUri)
               : KernelAssetAbsolutePath(outputUri.resolveUri(relativeUri));

pkg/dartdev/lib/src/native_assets_macos.dart

@@ -158,3 +158,45 @@ Map<Architecture?, List<String>> parseOtoolArchitectureSections(String output) {
 
   return architectureSections;
 }
+
+/// Rewrites the include path for an executable on MacOS.
+///
+/// The directory structure for `dart build cli` is
+///
+/// ```
+/// bundle/
+///   bin/
+///     <executable>
+///   lib/
+///     <dylibs>
+/// ```
+///
+/// So, the `bundle/` directory must be added to the include path to allow for
+/// loading dylibs.
+Future<void> rewriteInstallPath(Uri executable) async {
+  final result = await Process.run(
+    'install_name_tool',
+    ['-add_rpath', '@executable_path/..', executable.toFilePath()],
+  );
+  if (result.exitCode != 0) {
+    throw Exception(
+      'Failed to add rpath: ${result.stderr}',
+    );
+  }
+
+  // Resign after modifying.
+  final codesignResult = await Process.run(
+    'codesign',
+    [
+      '--force',
+      '--sign',
+      '-',
+      executable.toFilePath(),
+    ],
+  );
+  if (codesignResult.exitCode != 0) {
+    throw Exception(
+      'Failed to codesign dylib $executable: ${codesignResult.stderr}',
+    );
+  }
+}