merge to main

Author: devoncarew

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

@@ -93,7 +93,6 @@ class NativeAssetsBuildRunner {
     required BuildValidator buildValidator,
     required ApplicationAssetValidator applicationAssetValidator,
     required OS targetOS,
-    required BuildMode buildMode,
     required Uri workingDirectory,
     PackageLayout? packageLayout,
     String? runPackageName,
@@ -124,7 +123,6 @@ class NativeAssetsBuildRunner {
         ..setupHookConfig(
           targetOS: targetOS,
           buildAssetTypes: buildAssetTypes,
-          buildMode: buildMode,
           packageName: package.name,
           packageRoot: packageLayout.packageRoot(package.name),
         )
@@ -200,7 +198,6 @@ class NativeAssetsBuildRunner {
     required LinkConfigValidator configValidator,
     required LinkValidator linkValidator,
     required OS targetOS,
-    required BuildMode buildMode,
     required Uri workingDirectory,
     required ApplicationAssetValidator applicationAssetValidator,
     PackageLayout? packageLayout,
@@ -225,7 +222,6 @@ class NativeAssetsBuildRunner {
         ..setupHookConfig(
           targetOS: targetOS,
           buildAssetTypes: buildAssetTypes,
-          buildMode: buildMode,
           packageName: package.name,
           packageRoot: packageLayout.packageRoot(package.name),
         );

pkgs/native_assets_builder/test/build_runner/build_runner_reusability_test.dart

@@ -36,7 +36,6 @@ void main() async {
       await buildRunner.build(
         configCreator: configCreator,
         targetOS: OS.current,
-        buildMode: BuildMode.release,
         workingDirectory: packageUri,
         linkingEnabled: false,
         buildAssetTypes: [],
@@ -46,7 +45,6 @@ void main() async {
       );
       await buildRunner.build(
         configCreator: configCreator,
-        buildMode: BuildMode.release,
         targetOS: OS.current,
         workingDirectory: packageUri,
         linkingEnabled: false,

pkgs/native_assets_builder/test/build_runner/concurrency_shared_test_helper.dart

@@ -21,7 +21,6 @@ void main(List<String> args) async {
     dartExecutable: dartExecutable,
   ).build(
     configCreator: BuildConfigBuilder.new,
-    buildMode: BuildMode.release,
     targetOS: target.os,
     workingDirectory: packageUri,
     linkingEnabled: false,

pkgs/native_assets_builder/test/build_runner/concurrency_test_helper.dart

@@ -32,7 +32,6 @@ void main(List<String> args) async {
         cCompilerConfig: dartCICompilerConfig,
         targetMacOSVersion: OS.current == OS.macOS ? defaultMacOSVersion : null,
       ),
-    buildMode: BuildMode.release,
     targetOS: OS.current,
     workingDirectory: packageUri,
     linkingEnabled: false,

pkgs/native_assets_builder/test/build_runner/helpers.dart

@@ -71,7 +71,6 @@ Future<BuildResult?> build(
         return configBuilder;
       },
       configValidator: configValidator,
-      buildMode: BuildMode.release,
       targetOS: targetOS,
       workingDirectory: packageUri,
       packageLayout: packageLayout,
@@ -137,7 +136,6 @@ Future<LinkResult?> link(
         return configBuilder;
       },
       configValidator: configValidator,
-      buildMode: BuildMode.release,
       targetOS: target?.os ?? OS.current,
       workingDirectory: packageUri,
       packageLayout: packageLayout,
@@ -195,7 +193,6 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
             targetAndroidNdkApi: targetAndroidNdkApi,
           ),
         configValidator: buildConfigValidator,
-        buildMode: BuildMode.release,
         targetOS: target?.os ?? OS.current,
         workingDirectory: packageUri,
         packageLayout: packageLayout,
@@ -228,7 +225,6 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
             targetAndroidNdkApi: targetAndroidNdkApi,
           ),
         configValidator: linkConfigValidator,
-        buildMode: BuildMode.release,
         targetOS: target?.os ?? OS.current,
         workingDirectory: packageUri,
         packageLayout: packageLayout,

pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart

@@ -32,15 +32,16 @@ void main() async {
 
       final configBuilder = BuildConfigBuilder()
         ..setupHookConfig(
-            packageName: name,
-            packageRoot: testPackageUri,
-            targetOS: OS.current,
-            buildAssetTypes: [CodeAsset.type],
-            buildMode: BuildMode.debug)
+          packageName: name,
+          packageRoot: testPackageUri,
+          targetOS: OS.current,
+          buildAssetTypes: [CodeAsset.type],
+        )
         ..setupBuildConfig(dryRun: false, linkingEnabled: false)
         ..setupBuildRunConfig(
-            outputDirectory: outputDirectory,
-            outputDirectoryShared: outputDirectoryShared)
+          outputDirectory: outputDirectory,
+          outputDirectoryShared: outputDirectoryShared,
+        )
         ..setupCodeConfig(
           targetArchitecture: Architecture.current,
           linkModePreference: LinkModePreference.dynamic,

pkgs/native_assets_builder/test/test_data/transformer_test.dart

@@ -47,15 +47,16 @@ void main() async {
       Future<void> runBuild(Architecture architecture) async {
         final configBuilder = BuildConfigBuilder()
           ..setupHookConfig(
-              packageName: packageName,
-              packageRoot: packageUri,
-              targetOS: OS.current,
-              buildAssetTypes: [DataAsset.type],
-              buildMode: BuildMode.debug)
+            packageName: packageName,
+            packageRoot: packageUri,
+            targetOS: OS.current,
+            buildAssetTypes: [DataAsset.type],
+          )
           ..setupBuildConfig(dryRun: false, linkingEnabled: false)
           ..setupBuildRunConfig(
-              outputDirectory: outputDirectory,
-              outputDirectoryShared: outputDirectoryShared)
+            outputDirectory: outputDirectory,
+            outputDirectoryShared: outputDirectoryShared,
+          )
           ..setupCodeConfig(
             targetArchitecture: architecture,
             linkModePreference: LinkModePreference.dynamic,

pkgs/native_assets_builder/test_data/native_dynamic_linking/hook/build.dart

@@ -19,6 +19,7 @@ void main(List<String> args) async {
         sources: [
           'src/debug.c',
         ],
+        buildMode: BuildMode.debug,
       ),
       CBuilder.library(
         name: 'math',
@@ -27,6 +28,7 @@ void main(List<String> args) async {
           'src/math.c',
         ],
         libraries: ['debug'],
+        buildMode: BuildMode.debug,
       ),
       CBuilder.library(
         name: 'add',
@@ -35,6 +37,7 @@ void main(List<String> args) async {
           'src/add.c',
         ],
         libraries: ['math'],
+        buildMode: BuildMode.debug,
       )
     ];
 

pkgs/native_assets_cli/CHANGELOG.md

@@ -5,6 +5,10 @@
   missing. This enables (1) code to run if an asset is missing but that code is
   not invoked at runtime, and (2) doing fallback implementations in Dart if an
   asset is missing.
+- **Breaking change** Move `BuildMode` to `package:native_toolchain_c`. This way
+  it can be controlled in the build hook together with the `OptimizationLevel`.
+  Most likely, every package should ship with `release`. `BuildMode.debug`
+  should only be used while developing the package locally.
 - **Breaking change**: Change the behavior of `testBuildHook` and
   `testCodeBuildHook`; instead of defining tests, these methods should now be
   called from within tests.

pkgs/native_assets_cli/lib/code_assets.dart

@@ -10,7 +10,6 @@ export 'native_assets_cli.dart'
         EncodedAsset,
         EncodedAssetBuildOutputBuilder,
         EncodedAssetLinkOutputBuilder;
-export 'src/build_mode.dart' show BuildMode;
 export 'src/code_assets/architecture.dart' show Architecture;
 export 'src/code_assets/c_compiler_config.dart' show CCompilerConfig;
 export 'src/code_assets/code_asset.dart' show CodeAsset, OSLibraryNaming;