[wasm] Unify BuildWasmRuntimes target and use cmake (#58878)

Add new cmake file to build native parts of `BuildWasmRuntimes` target. That unifies the build on windows and mac/linux.

Implements #51553

* [wasm] Add cmake file for runtime native build

* Use the new cmake file

* Set the emcc configuration flags

The ninja generator is not multi-configuration cmake generator, so we
have to pass them from msbuild

* Update Makefile

* Fix few build issues

* Copy ICU files to native bin dir

* Copy source files to native bin dir

* Copy required header file

* Make all settings target specific

src/mono/wasm/Makefile

@@ -101,20 +101,8 @@ $(NATIVE_BIN_DIR)/include/wasm:
 $(BUILDS_OBJ_DIR):
 	mkdir -p $$@
 
-$(NATIVE_BIN_DIR)/dotnet.js: $(BUILDS_OBJ_DIR)/driver.o $(BUILDS_OBJ_DIR)/pinvoke.o $(BUILDS_OBJ_DIR)/corebindings.o runtime/library_mono.js runtime/binding_support.js runtime/dotnet_support.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.js $(2) $(EMCC_DEFAULT_RSP) | $(NATIVE_BIN_DIR)
-	$(EMCC) @$(EMCC_DEFAULT_RSP) $(1) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library $(SYSTEM_NATIVE_LIBDIR)/pal_random.js $(BUILDS_OBJ_DIR)/driver.o $(BUILDS_OBJ_DIR)/pinvoke.o $(BUILDS_OBJ_DIR)/corebindings.o $(2) -o $(NATIVE_BIN_DIR)/dotnet.js $(3)
-
-$(BUILDS_OBJ_DIR)/pinvoke-table.h: $(PINVOKE_TABLE) | $(BUILDS_OBJ_DIR)
-	if cmp -s $(PINVOKE_TABLE) $$@ ; then : ; else cp $(PINVOKE_TABLE) $$@ ; fi
-
-$(BUILDS_OBJ_DIR)/driver.o: runtime/driver.c $(EMCC_DEFAULT_RSP) | $(BUILDS_OBJ_DIR)
-	$(EMCC) @$(EMCC_DEFAULT_RSP) $(1) -Oz -DCORE_BINDINGS -I$(BUILDS_OBJ_DIR) -I$(MONO_INCLUDE_DIR) runtime/driver.c -c -o $$@
-
-$(BUILDS_OBJ_DIR)/pinvoke.o: runtime/pinvoke.c runtime/pinvoke.h $(BUILDS_OBJ_DIR)/pinvoke-table.h $(EMCC_DEFAULT_RSP) | $(BUILDS_OBJ_DIR)
-	$(EMCC) @$(EMCC_DEFAULT_RSP) $(1) -Oz -DGEN_PINVOKE=1 -I$(BUILDS_OBJ_DIR) runtime/pinvoke.c -c -o $$@
-
-$(BUILDS_OBJ_DIR)/corebindings.o: runtime/corebindings.c $(EMCC_DEFAULT_RSP) | $(BUILDS_OBJ_DIR)
-	$(EMCC) @$(EMCC_DEFAULT_RSP) $(1) -Oz -I$(MONO_INCLUDE_DIR) runtime/corebindings.c -c -o $$@
+$(NATIVE_BIN_DIR)/dotnet.js: runtime/library_mono.js runtime/binding_support.js runtime/dotnet_support.js $(SYSTEM_NATIVE_LIBDIR)/pal_random.js $(2) $(EMCC_DEFAULT_RSP) | $(NATIVE_BIN_DIR)
+	$(DOTNET) build $(CURDIR)/wasm.proj _MSBUILD_WASM_BUILD_ARGS /t:BuildWasmRuntimes
 
 $(EMCC_DEFAULT_RSP): $(CURDIR)/wasm.proj | $(NATIVE_BIN_DIR)/src Makefile
 	$(DOTNET) build $(CURDIR)/wasm.proj /p:Configuration=$(CONFIG) /t:GenerateEmccPropsAndRspFiles

src/mono/wasm/runtime/CMakeLists.txt

@@ -0,0 +1,27 @@
+cmake_minimum_required(VERSION 3.14.5)
+
+project(mono-wasm-runtime C)
+
+add_executable(dotnet corebindings.c driver.c pinvoke.c)
+
+target_include_directories(dotnet PUBLIC ${MONO_INCLUDES} ${MONO_OBJ_INCLUDES})
+target_compile_options(dotnet PUBLIC @${NATIVE_BIN_DIR}/src/emcc-default.rsp ${CONFIGURATION_EMCC_FLAGS} -DCORE_BINDINGS -DGEN_PINVOKE=1)
+target_link_libraries(dotnet
+    ${ICU_LIB_DIR}/libicuuc.a
+    ${ICU_LIB_DIR}/libicui18n.a
+    ${MONO_ARTIFACTS_DIR}/libmono-component-hot_reload-static.a
+    ${MONO_ARTIFACTS_DIR}/libmono-component-debugger-static.a
+    ${MONO_ARTIFACTS_DIR}/libmono-component-diagnostics_tracing-stub-static.a
+    ${MONO_ARTIFACTS_DIR}/libmono-ee-interp.a
+    ${MONO_ARTIFACTS_DIR}/libmonosgen-2.0.a
+    ${MONO_ARTIFACTS_DIR}/libmono-ilgen.a
+    ${MONO_ARTIFACTS_DIR}/libmono-icall-table.a
+    ${NATIVE_BIN_DIR}/libSystem.Native.a
+    ${NATIVE_BIN_DIR}/libSystem.IO.Compression.Native.a)
+
+set_target_properties(dotnet PROPERTIES
+    CMAKE_EXECUTABLE_SUFFIX ".js"
+    LINK_FLAGS "@${NATIVE_BIN_DIR}/src/emcc-default.rsp ${CONFIGURATION_EMCC_FLAGS} -DENABLE_NETCORE=1 --js-library ${SOURCE_DIR}/library_mono.js --js-library ${SOURCE_DIR}/binding_support.js --js-library ${SOURCE_DIR}/dotnet_support.js --js-library ${SYSTEM_NATIVE_DIR}/pal_random.js"
+    RUNTIME_OUTPUT_DIRECTORY "${NATIVE_BIN_DIR}")
+
+add_custom_command(TARGET dotnet POST_BUILD COMMAND ${EMSDK_PATH}/upstream/bin/wasm-opt --strip-dwarf ${NATIVE_BIN_DIR}/dotnet.wasm -o ${NATIVE_BIN_DIR}/dotnet.wasm)

src/mono/wasm/wasm.proj

@@ -138,106 +138,32 @@
 
   <!-- This is a documented target that is invoked by developers in their innerloop work. -->
   <Target Name="BuildWasmRuntimes"
-          Condition="'$(OS)' != 'Windows_NT'"
           AfterTargets="Build"
           DependsOnTargets="GenerateEmccPropsAndRspFiles;BuildPInvokeTable;BundleTimeZones">
 
-    <Exec Command="make -C $(MonoProjectRoot)wasm all SHELL=/bin/bash BINDIR=$(ArtifactsBinDir) MONO_BIN_DIR=$(MonoArtifactsPath) OBJDIR=$(ArtifactsObjDir) NATIVE_BIN_DIR=$(NativeBinDir) CONFIG=$(Configuration) PINVOKE_TABLE=$(WasmPInvokeTablePath) ICU_LIBDIR=$(ICULibDir)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <ItemGroup>
-      <IcuDataFiles Include="$(NativeBinDir)*.dat" />
-      <WasmSrcFiles Include="$(NativeBinDir)src\*.c;
-                             $(NativeBinDir)src\*.js;
-                             $(_EmccDefaultsRspPath);
-                             $(NativeBinDir)src\emcc-props.json" />
-      <WasmHeaderFiles Include="$(NativeBinDir)include\wasm\*.h" />
-    </ItemGroup>
-
-    <Copy SourceFiles="$(NativeBinDir)dotnet.js;
-                       $(NativeBinDir)dotnet.wasm;
-                       $(NativeBinDir)dotnet.timezones.blat;
-                       $(NativeBinDir)libicuuc.a;
-                       $(NativeBinDir)libicui18n.a"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
-          SkipUnchangedFiles="true" />
-
-    <Copy SourceFiles="@(IcuDataFiles)"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
-          SkipUnchangedFiles="true" />
-
-    <Copy SourceFiles="@(WasmSrcFiles)"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)src"
-          SkipUnchangedFiles="true" />
-
-    <Copy SourceFiles="@(WasmHeaderFiles)"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)include\wasm"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <Target Name="BuildWinWasmRuntimes"
-          Condition="'$(OS)' == 'Windows_NT'"
-          AfterTargets="Build"
-          DependsOnTargets="GenerateEmccPropsAndRspFiles;BuildPInvokeTable;BundleTimezones">
-
-    <PropertyGroup>
-      <EmccConfigurationFlags Condition="'$(Configuration)' == 'Debug'">-g -Os -s -DENABLE_NETCORE=1 -DDEBUG=1</EmccConfigurationFlags>
-      <EmccConfigurationFlags Condition="'$(Configuration)' == 'Release'">-Oz -DENABLE_NETCORE=1</EmccConfigurationFlags>
-      <StripCmd>&quot;$(EMSDK_PATH)/upstream/bin/wasm-opt&quot; --strip-dwarf &quot;$(NativeBinDir)dotnet.wasm&quot; -o &quot;$(NativeBinDir)dotnet.wasm&quot;</StripCmd>
-      <WasmObjDir>$(ArtifactsObjDir)wasm</WasmObjDir>
-      <WasmVersionFile>$(WasmObjDir)\emcc-version.txt</WasmVersionFile>
-      <MonoIncludeDir>$(MonoArtifactsPath)include/mono-2.0</MonoIncludeDir>
-      <SystemNativeDir>$(RepoRoot)src\libraries\Native\Unix\System.Native</SystemNativeDir>
-    </PropertyGroup>
     <ItemGroup>
       <ICULibNativeFiles Include="$(ICULibDir)/libicuuc.a;
                                   $(ICULibDir)/libicui18n.a" />
-      <MonoComponentLibs Include="$(MonoArtifactsPath)libmono-component-hot_reload-static.a;
-                                  $(MonoArtifactsPath)libmono-component-debugger-static.a;
-                                  $(MonoArtifactsPath)libmono-component-diagnostics_tracing-stub-static.a" />
-      <MonoLibFiles Include="$(MonoArtifactsPath)libmono-ee-interp.a;
-                             $(MonoArtifactsPath)libmonosgen-2.0.a;
-                             $(MonoArtifactsPath)libmono-ilgen.a;
-                             $(MonoArtifactsPath)libmono-icall-table.a;
-                             $(NativeBinDir)libSystem.Native.a;
-                             $(NativeBinDir)libSystem.IO.Compression.Native.a" />
-      <MonoLibFiles Include="@(ICULibNativeFiles)" />
-      <MonoLibFiles Include="@(MonoComponentLibs)" />
-      <PInvokeTableFile Include="$(WasmObjDir)\pinvoke-table.h" />
       <ICULibFiles Include="$(ICULibDir)/*.dat" />
     </ItemGroup>
+    <PropertyGroup>
+      <PInvokeTableFile>$(ArtifactsObjDir)wasm/pinvoke-table.h</PInvokeTableFile>
+      <CMakeConfigurationEmccFlags Condition="'$(Configuration)' == 'Debug'">-g -Os -s -DDEBUG=1</CMakeConfigurationEmccFlags>
+      <CMakeConfigurationEmccFlags Condition="'$(Configuration)' == 'Release'">-Oz</CMakeConfigurationEmccFlags>
+      <CMakeBuildRuntimeConfigureCmd>emcmake cmake $(MSBuildThisFileDirectory)runtime -DCONFIGURATION_EMCC_FLAGS=&quot;$(CMakeConfigurationEmccFlags)&quot; -DMONO_INCLUDES=&quot;$(MonoArtifactsPath)include/mono-2.0&quot; -DMONO_OBJ_INCLUDES=&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -DICU_LIB_DIR=&quot;$(ICULibDir.TrimEnd('\/'))&quot; -DMONO_ARTIFACTS_DIR=&quot;$(MonoArtifactsPath.TrimEnd('\/'))&quot; -DNATIVE_BIN_DIR=&quot;$(NativeBinDir.TrimEnd('\/'))&quot; -DSYSTEM_NATIVE_DIR=&quot;$(RepoRoot)src/libraries/Native/Unix/System.Native&quot; -DEMSDK_PATH=&quot;$(EMSDK_PATH.TrimEnd('\/'))&quot; -DSOURCE_DIR=&quot;$(MSBuildThisFileDirectory.TrimEnd('\/'))/runtime&quot;</CMakeBuildRuntimeConfigureCmd>
+      <CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' == 'Windows_NT'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; &amp;&amp; call &quot;$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env.bat'))&quot; &amp;&amp; $(CMakeBuildRuntimeConfigureCmd)</CMakeBuildRuntimeConfigureCmd>
+      <CMakeBuildRuntimeConfigureCmd Condition="'$(OS)' != 'Windows_NT'">bash -c 'source $(EMSDK_PATH)/emsdk_env.sh 2>&amp;1 &amp;&amp; $(CMakeBuildRuntimeConfigureCmd)'</CMakeBuildRuntimeConfigureCmd>
+
+      <CMakeBuildRuntimeCmd>cmake --build . --config $(Configuration)</CMakeBuildRuntimeCmd>
+      <CMakeBuildRuntimeCmd Condition="'$(OS)' == 'Windows_NT'">call &quot;$(RepositoryEngineeringDir)native\init-vs-env.cmd&quot; &amp;&amp; call &quot;$([MSBuild]::NormalizePath('$(EMSDK_PATH)', 'emsdk_env.bat'))&quot; &amp;&amp; $(CMakeBuildRuntimeCmd)</CMakeBuildRuntimeCmd>
+      <CMakeBuildRuntimeCmd Condition="'$(OS)' != 'Windows_NT'">bash -c 'source $(EMSDK_PATH)/emsdk_env.sh 2>&amp;1 &amp;&amp;  $(CMakeBuildRuntimeCmd)'</CMakeBuildRuntimeCmd>
+      <SystemNativeDir>$(RepoRoot)src\libraries\Native\Unix\System.Native</SystemNativeDir>
+    </PropertyGroup>
 
-    <RunWithEmSdkEnv Command="$(EmccCmd) @$(_EmccDefaultsRspPath) $(EmccConfigurationFlags) -Oz -I&quot;$(MonoIncludeDir)&quot; runtime/corebindings.c -c -o &quot;$(MonoObjDir)corebindings.o&quot;"
-          EmSdkPath="$(EMSDK_PATH)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <RunWithEmSdkEnv Command="$(EmccCmd) @$(_EmccDefaultsRspPath) $(EmccConfigurationFlags) -Oz -DCORE_BINDINGS -I&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -I&quot;$(MonoIncludeDir)&quot; runtime/driver.c -c -o &quot;$(MonoObjDir)driver.o&quot;"
-          EmSdkPath="$(EMSDK_PATH)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <Copy SourceFiles="@(PInvokeTableFile)"
+    <Copy SourceFiles="$(PInvokeTableFile)"
           DestinationFolder="$(MonoObjDir)"
           SkipUnchangedFiles="true" />
 
-    <RunWithEmSdkEnv Command="$(EmccCmd) @$(_EmccDefaultsRspPath) $(EmccConfigurationFlags) -Oz -DGEN_PINVOKE=1 -I&quot;$(MonoObjDir.TrimEnd('\/'))&quot; -I&quot;$(MonoIncludeDir)&quot; runtime/pinvoke.c -c -o &quot;$(MonoObjDir)pinvoke.o&quot;"
-          EmSdkPath="$(EMSDK_PATH)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <RunWithEmSdkEnv Command="$(EmccCmd) @$(_EmccDefaultsRspPath) $(EmccConfigurationFlags) --js-library runtime/library_mono.js --js-library runtime/binding_support.js --js-library runtime/dotnet_support.js --js-library &quot;$(SystemNativeDir)\pal_random.js&quot; &quot;$(MonoObjDir)driver.o&quot; &quot;$(MonoObjDir)pinvoke.o&quot; &quot;$(MonoObjDir)corebindings.o&quot; &quot;@(MonoLibFiles->'%(FullPath)', '&quot; &quot;')&quot; -o &quot;$(NativeBinDir)dotnet.js&quot; &amp;&amp; $(StripCmd)"
-          EmSdkPath="$(EMSDK_PATH)"
-          IgnoreStandardErrorWarningFormat="true" />
-
-    <RunWithEmSdkEnv Command="$(EmccCmd) --version"
-          ConsoleToMsBuild="true"
-          EmSdkPath="$(EMSDK_PATH)"
-          IgnoreStandardErrorWarningFormat="true">
-      <Output TaskParameter="ConsoleOutput" ItemName="_VersionLines" />
-    </RunWithEmSdkEnv>
-
-    <Copy SourceFiles="runtime\pinvoke.h"
-          DestinationFolder="$(NativeBinDir)include\wasm"
-          SkipUnchangedFiles="true" />
-
     <Copy SourceFiles="runtime/driver.c;
                        runtime/pinvoke.c;
                        runtime/corebindings.c;
@@ -248,35 +174,42 @@
           DestinationFolder="$(NativeBinDir)src"
           SkipUnchangedFiles="true" />
 
+    <Copy SourceFiles="runtime\pinvoke.h"
+          DestinationFolder="$(NativeBinDir)include\wasm"
+          SkipUnchangedFiles="true" />
+
     <Copy SourceFiles="@(ICULibFiles);@(ICULibNativeFiles)"
           DestinationFolder="$(NativeBinDir)"
           SkipUnchangedFiles="true" />
 
-    <Copy SourceFiles="$(NativeBinDir)dotnet.js;
-                       $(NativeBinDir)dotnet.wasm;
-                       $(NativeBinDir)dotnet.timezones.blat"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
-          SkipUnchangedFiles="true" />
+    <Exec Command="$(CMakeBuildRuntimeConfigureCmd)" WorkingDirectory="$(NativeBinDir)" />
+    <Exec Command="$(CMakeBuildRuntimeCmd)"  WorkingDirectory="$(NativeBinDir)" />
 
     <ItemGroup>
-      <WasmHeaderFiles Include="$(NativeBinDir)include\wasm\*.h" />
+      <IcuDataFiles Include="$(NativeBinDir)*.dat" />
       <WasmSrcFiles Include="$(NativeBinDir)src\*.c;
                              $(NativeBinDir)src\*.js;
                              $(_EmccDefaultsRspPath);
                              $(NativeBinDir)src\emcc-props.json" />
-      <IcuDataFiles Include="$(NativeBinDir)*.dat" />
+      <WasmHeaderFiles Include="$(NativeBinDir)include\wasm\*.h" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(WasmHeaderFiles)"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)include\wasm"
+    <Copy SourceFiles="$(NativeBinDir)dotnet.js;
+                       $(NativeBinDir)dotnet.wasm;
+                       $(NativeBinDir)dotnet.timezones.blat"
+          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
+          SkipUnchangedFiles="true" />
+
+    <Copy SourceFiles="@(IcuDataFiles);@(ICULibNativeFiles)"
+          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
           SkipUnchangedFiles="true" />
 
     <Copy SourceFiles="@(WasmSrcFiles)"
           DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)src"
           SkipUnchangedFiles="true" />
 
-    <Copy SourceFiles="@(IcuDataFiles);@(ICULibNativeFiles)"
-          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
+    <Copy SourceFiles="@(WasmHeaderFiles)"
+          DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)include\wasm"
           SkipUnchangedFiles="true" />
   </Target>