[native_assets_cli] Introduce CCompilerConfig.windows (#1913)

Closes: #1606

This PR moves `cCompilerConfig.envScript` to `cCompilerConfig.windows.developerCommandPrompt.script`.

Notable changes:

* The `DeveloperCommandPrompt` is optional, but if it's set, both the script and arguments must be set. Since clang on Windows detects the MSVC installations, the `developerCommandPrompt` itself is optional for the case where clang is passed as the compiler on Windows
* The OS-specific configurations nested under `CodeConfig` have been renamed to `<OS>CodeConfig` avoid naming conflicts with `<OS>CCompilerConfig`.
* The JSON structure has been updated with the nesting.

Up for discussion:

* Naming (`developerCommandPrompt` is rather long)
* Should we expose a `Future<Map<String, String>> loadEnvironment()` on `DeveloperCommandPrompt`? It's a bit out of place because the config is rather only a view on the JSON. However, it is most likely use case.

Author: dcharkes

pkgs/native_assets_builder/test/build_runner/build_runner_reusability_test.dart

@@ -37,7 +37,7 @@ void main() async {
           targetArchitecture: Architecture.current,
           targetOS: OS.current,
           macOS: targetOS == OS.macOS
-              ? MacOSConfig(targetVersion: defaultMacOSVersion)
+              ? MacOSCodeConfig(targetVersion: defaultMacOSVersion)
               : null,
           linkModePreference: LinkModePreference.dynamic,
         );

pkgs/native_assets_builder/test/build_runner/concurrency_shared_test_helper.dart

@@ -31,10 +31,10 @@ void main(List<String> args) async {
         targetArchitecture: target.architecture,
         targetOS: targetOS,
         macOS: targetOS == OS.macOS
-            ? MacOSConfig(targetVersion: defaultMacOSVersion)
+            ? MacOSCodeConfig(targetVersion: defaultMacOSVersion)
             : null,
         android:
-            targetOS == OS.android ? AndroidConfig(targetNdkApi: 30) : null,
+            targetOS == OS.android ? AndroidCodeConfig(targetNdkApi: 30) : null,
         linkModePreference: LinkModePreference.dynamic,
       ),
 

pkgs/native_assets_builder/test/build_runner/concurrency_test_helper.dart

@@ -36,7 +36,7 @@ void main(List<String> args) async {
         linkModePreference: LinkModePreference.dynamic,
         cCompiler: dartCICompilerConfig,
         macOS: targetOS == OS.macOS
-            ? MacOSConfig(targetVersion: defaultMacOSVersion)
+            ? MacOSCodeConfig(targetVersion: defaultMacOSVersion)
             : null,
       ),
     workingDirectory: packageUri,

pkgs/native_assets_builder/test/build_runner/helpers.dart

@@ -86,17 +86,17 @@ Future<BuildResult?> build(
             linkModePreference: linkModePreference,
             cCompiler: cCompiler ?? dartCICompilerConfig,
             iOS: targetOS == OS.iOS
-                ? IOSConfig(
+                ? IOSCodeConfig(
                     targetSdk: targetIOSSdk!,
                     targetVersion: targetIOSVersion!,
                   )
                 : null,
             macOS: targetOS == OS.macOS
-                ? MacOSConfig(
+                ? MacOSCodeConfig(
                     targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
                 : null,
             android: targetOS == OS.android
-                ? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
+                ? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
                 : null,
           );
         }
@@ -163,17 +163,17 @@ Future<LinkResult?> link(
             linkModePreference: linkModePreference,
             cCompiler: cCompiler ?? dartCICompilerConfig,
             iOS: targetOS == OS.iOS
-                ? IOSConfig(
+                ? IOSCodeConfig(
                     targetSdk: targetIOSSdk!,
                     targetVersion: targetIOSVersion!,
                   )
                 : null,
             macOS: targetOS == OS.macOS
-                ? MacOSConfig(
+                ? MacOSCodeConfig(
                     targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
                 : null,
             android: targetOS == OS.android
-                ? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
+                ? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
                 : null,
           );
         }
@@ -239,17 +239,17 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
               linkModePreference: linkModePreference,
               cCompiler: cCompiler ?? dartCICompilerConfig,
               iOS: targetOS == OS.iOS
-                  ? IOSConfig(
+                  ? IOSCodeConfig(
                       targetSdk: targetIOSSdk!,
                       targetVersion: targetIOSVersion!,
                     )
                   : null,
               macOS: targetOS == OS.macOS
-                  ? MacOSConfig(
+                  ? MacOSCodeConfig(
                       targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
                   : null,
               android: targetOS == OS.android
-                  ? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
+                  ? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
                   : null,
             );
           }
@@ -285,17 +285,17 @@ Future<(BuildResult?, LinkResult?)> buildAndLink(
               linkModePreference: linkModePreference,
               cCompiler: cCompiler ?? dartCICompilerConfig,
               iOS: targetOS == OS.iOS
-                  ? IOSConfig(
+                  ? IOSCodeConfig(
                       targetSdk: targetIOSSdk!,
                       targetVersion: targetIOSVersion!,
                     )
                   : null,
               macOS: targetOS == OS.macOS
-                  ? MacOSConfig(
+                  ? MacOSCodeConfig(
                       targetVersion: targetMacOSVersion ?? defaultMacOSVersion)
                   : null,
               android: targetOS == OS.android
-                  ? AndroidConfig(targetNdkApi: targetAndroidNdkApi!)
+                  ? AndroidCodeConfig(targetNdkApi: targetAndroidNdkApi!)
                   : null,
             );
           }
@@ -374,15 +374,19 @@ final CCompilerConfig? dartCICompilerConfig = (() {
           .map((arg) => arg.trim())
           .where((arg) => arg.isNotEmpty)
           .toList();
-  final hasEnvScriptArgs = envScriptArgs != null && envScriptArgs.isNotEmpty;
 
   if (cc != null && ar != null && ld != null) {
     return CCompilerConfig(
       archiver: Uri.file(ar),
       compiler: Uri.file(cc),
-      envScript: envScript != null ? Uri.file(envScript) : null,
-      envScriptArgs: hasEnvScriptArgs ? envScriptArgs : null,
       linker: Uri.file(ld),
+      windows: WindowsCCompilerConfig(
+          developerCommandPrompt: envScript == null
+              ? null
+              : DeveloperCommandPrompt(
+                  script: Uri.file(envScript),
+                  arguments: envScriptArgs ?? [],
+                )),
     );
   }
   return null;

pkgs/native_assets_builder/test/helpers.dart

@@ -190,8 +190,14 @@ final cCompiler = (_cc == null || _ar == null || _ld == null)
         compiler: _cc!,
         archiver: _ar!,
         linker: _ld!,
-        envScript: _envScript,
-        envScriptArgs: _envScriptArgs,
+        windows: _envScript == null
+            ? null
+            : WindowsCCompilerConfig(
+                developerCommandPrompt: DeveloperCommandPrompt(
+                  script: _envScript!,
+                  arguments: _envScriptArgs ?? [],
+                ),
+              ),
       );
 
 extension on String {

pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart

@@ -46,7 +46,7 @@ void main() async {
           targetArchitecture: Architecture.current,
           targetOS: targetOS,
           macOS: targetOS == OS.macOS
-              ? MacOSConfig(targetVersion: defaultMacOSVersion)
+              ? MacOSCodeConfig(targetVersion: defaultMacOSVersion)
               : null,
           linkModePreference: LinkModePreference.dynamic,
           cCompiler: cCompiler,

pkgs/native_assets_builder/test/test_data/transformer_test.dart

@@ -64,7 +64,7 @@ void main() async {
             targetArchitecture: architecture,
             targetOS: targetOS,
             macOS: targetOS == OS.macOS
-                ? MacOSConfig(targetVersion: defaultMacOSVersion)
+                ? MacOSCodeConfig(targetVersion: defaultMacOSVersion)
                 : null,
             linkModePreference: LinkModePreference.dynamic,
           );

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

@@ -21,5 +21,5 @@ const _rightContents = '''{
   "encodedAssets": [],
   "dependencies": [],
   "metadata": {},
-  "version": "1.8.0"
+  "version": "1.9.0"
 }''';

pkgs/native_assets_cli/example/build/download_asset/tool/build.dart

@@ -91,15 +91,15 @@ BuildInput createBuildInput(
         linkModePreference: LinkModePreference.dynamic,
         android: os != OS.android
             ? null
-            : AndroidConfig(
+            : AndroidCodeConfig(
                 targetNdkApi: androidTargetNdkApi,
               ),
         iOS: os != OS.iOS
             ? null
-            : IOSConfig(
+            : IOSCodeConfig(
                 targetSdk: IOSSdk.fromString(iOSSdk!),
                 targetVersion: iOSTargetVersion,
               ),
-        macOS: MacOSConfig(targetVersion: macOSTargetVersion));
+        macOS: MacOSCodeConfig(targetVersion: macOSTargetVersion));
   return BuildInput(inputBuilder.json);
 }

pkgs/native_assets_cli/lib/code_assets.dart

@@ -11,20 +11,21 @@ export 'native_assets_cli.dart'
         EncodedAssetBuildOutputBuilder,
         EncodedAssetLinkOutputBuilder;
 export 'src/code_assets/architecture.dart' show Architecture;
-export 'src/code_assets/c_compiler_config.dart' show CCompilerConfig;
+export 'src/code_assets/c_compiler_config.dart'
+    show CCompilerConfig, DeveloperCommandPrompt, WindowsCCompilerConfig;
 export 'src/code_assets/code_asset.dart' show CodeAsset, OSLibraryNaming;
 export 'src/code_assets/config.dart'
     show
-        AndroidConfig,
+        AndroidCodeConfig,
         CodeAssetBuildOutputBuilder,
         CodeAssetBuildOutputBuilderAdd,
         CodeAssetHookConfig,
         CodeAssetLinkInput,
         CodeAssetLinkOutputBuilder,
         CodeAssetLinkOutputBuilderAdd,
         CodeConfig,
-        IOSConfig,
-        MacOSConfig;
+        IOSCodeConfig,
+        MacOSCodeConfig;
 export 'src/code_assets/ios_sdk.dart' show IOSSdk;
 export 'src/code_assets/link_mode.dart'
     show