Build WASM runtimes #35566

vargaz · 2020-04-28T12:05:56Z

No description provided.

vargaz · 2020-04-28T12:06:30Z

The actual build is not setup yet.

marek-safar · 2020-04-28T12:54:48Z

eng/liveBuilds.targets

@@ -137,6 +137,8 @@
        Include="$(MonoArtifactsPath)\cross\*.*" />
      <MonoIncludeFiles Condition="'$(TargetsMobile)' == 'true' or '$(TargetOS)' == 'Browser'"
        Include="$(MonoArtifactsPath)\include\**\*.*" />
+      <WasmDistFiles Condition="'$(TargetOS)' == 'Browser'"
+        Include="$(MonoArtifactsPath)\wasm\runtimes\**\*.*" />


I think wasm name is redundant in this context and it might be better to explicitly included as there is only a handful of files

The different kinds of files go to different places inside the nuget, so they need different property names.

I was referring to \wasm\runtimes not sure we need this if the package is wasm only

hm yeah it's a bit redundant but since this is the source directory where the files get picked up rather than the destination in the nuget I don't care too much here.

Nit: Shouldn't we be using Condition="'$(TargetsBrowser)' == 'true'" here instead of Condition="'$(TargetOS)' == 'Browser'" for consistency?

Ideally yes, but that can be cleaned up later.

src/mono/wasm/Makefile

src/mono/wasm/runtime/linker-disable-collation.xml

src/mono/wasm/runtime/linker-preserves.xml

src/mono/wasm/runtime/linker-subs.xml

src/mono/wasm/runtime/zlib-helper.c

src/mono/wasm/runtime/pinvoke-tables-default-netcore.h

src/mono/wasm/runtime/pinvoke-tables-default.h

vargaz · 2020-04-30T11:44:42Z

The wasm installer build needs EMSDK_PATH set as well.

src/mono/wasm/wasm.proj

vargaz · 2020-05-01T14:53:59Z

This seems to work now.

src/mono/msbuild/WasmAppBuilder/WasmAppBuilder.cs

marek-safar · 2020-05-05T09:01:31Z

@akoeplinger please review

akoeplinger · 2020-05-05T13:42:25Z

eng/liveBuilds.targets

@@ -137,6 +137,8 @@
        Include="$(MonoArtifactsPath)\cross\*.*" />
      <MonoIncludeFiles Condition="'$(TargetsMobile)' == 'true' or '$(TargetOS)' == 'Browser'"
        Include="$(MonoArtifactsPath)\include\**\*.*" />
+      <WasmDistFiles Condition="'$(TargetOS)' == 'Browser'"
+        Include="$(MonoArtifactsPath)\wasm\runtimes\**\*.*" />


hm yeah it's a bit redundant but since this is the source directory where the files get picked up rather than the destination in the nuget I don't care too much here.

src/libraries/pretest.proj

src/mono/mono.proj

src/mono/msbuild/WasmAppBuilder/WasmAppBuilder.cs

src/mono/wasm/runtime/driver.c

src/mono/wasm/runtime/library_mono.js

src/mono/wasm/wasm.proj

src/mono/wasm/Makefile

akoeplinger · 2020-05-05T14:06:20Z

src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj

        Include="@(MonoIncludeFiles)">
        <TargetPath>runtimes/$(PackageRID)/native/include/%(RecursiveDir)</TargetPath>
      </RuntimeFiles>

+      <RuntimeFiles Condition="'$(TargetsBrowser)' == 'true'"
+        Include="@(WasmDistFiles)">
+        <TargetPath>runtimes/$(PackageRID)/native/wasm/runtimes/%(RecursiveDir)</TargetPath>


the wasm/runtimes in the path is redundant

…there.

…h to the make dependencies.

…ks might not exist yet.

vargaz requested a review from marek-safar as a code owner April 28, 2020 12:05

vargaz marked this pull request as draft April 28, 2020 12:06

marek-safar requested changes Apr 28, 2020

View reviewed changes

vargaz force-pushed the wasm-runtime branch from 2736c22 to a254cba Compare April 28, 2020 14:15

danmoseley added arch-wasm WebAssembly architecture area-Build-mono labels Apr 28, 2020

vargaz force-pushed the wasm-runtime branch from a254cba to 57f877b Compare April 29, 2020 07:26

ericstj mentioned this pull request Apr 29, 2020

Test failed: System.Text.RegularExpressions.Tests.RegexCacheTests.Ctor_Cache_Promote_entries fails with Timeout #13610

Closed

vargaz force-pushed the wasm-runtime branch 2 times, most recently from a92b9c9 to c371e7c Compare April 29, 2020 21:29

vargaz changed the title ~~Add beginnings of wasm binary generation.~~ Build WASM runtimes Apr 30, 2020

vargaz marked this pull request as ready for review April 30, 2020 06:07

vargaz force-pushed the wasm-runtime branch 3 times, most recently from 0f58684 to cca8a28 Compare April 30, 2020 10:55

marek-safar reviewed Apr 30, 2020

View reviewed changes

src/mono/wasm/wasm.proj Outdated Show resolved Hide resolved

vargaz force-pushed the wasm-runtime branch 5 times, most recently from e681a00 to d3f2741 Compare May 1, 2020 10:25

kjpou1 mentioned this pull request May 4, 2020

[wasm] Initial addition of Browser WebAssembly support #35573

Merged

marek-safar mentioned this pull request May 5, 2020

Extract wasm runtime files from mono repo #35406

Closed

marek-safar reviewed May 5, 2020

View reviewed changes

src/mono/msbuild/WasmAppBuilder/WasmAppBuilder.cs Outdated Show resolved Hide resolved

akoeplinger requested changes May 5, 2020

View reviewed changes

jaredpar mentioned this pull request May 5, 2020

OSX machines are de-provisioned during CI / PR runs leading to failures #34472

Closed

vargaz added 22 commits May 11, 2020 12:06

Get all runtime libs from bin/mono.

173eca0

Add some debugging code.

5e6841c

Fix target ordering.

6104f6c

Use MonoArtifactsPath.

a8c200a

Remove debugging code.

19411e7

Address comments.

a2e0246

Rename WasmAppBuilder task to PInvokeTableGenerator.

904368d

Add more license headers.

d571e7b

Remove emscripten patch which is no longer needed.

e003630

Use TargetsBrowser in a few more places.

0abb987

Remove zlib-helper.c, its not needed.

0be5e62

Convert wasm.proj to an SDK project.

c20e256

Make BuildWasmRuntimes the default target.

df8532e

Fix the build.

dc77553

use TargetOS==Browser in pretest.proj, TargetsBrowser is not defined …

bb4696d

…there.

Fix the build.

277cc4f

Add System.Console to the pinvoke table generator. Add pinvoke-table.…

2a4c3f3

…h to the make dependencies.

Simplify local emsdk installation.

817fee2

Fix the build.

a646c6d

Load libs from a different path for the pinvoke task, lib-runtime-pac…

a757f4b

…ks might not exist yet.

Load WasmAppBuilder from artifacts/bin/WasmAppBuilder.

1fd31ef

Put wasm files into lib-runtime-packs.

c9e8722

vargaz force-pushed the wasm-runtime branch from 9222306 to c9e8722 Compare May 11, 2020 16:40

Fix nullability warnings.

dc0ac83

akoeplinger approved these changes May 11, 2020

View reviewed changes

akoeplinger requested a review from marek-safar May 11, 2020 18:40

marek-safar approved these changes May 12, 2020

View reviewed changes

marek-safar merged commit 7f042fc into dotnet:master May 12, 2020

vargaz deleted the wasm-runtime branch May 12, 2020 11:58

ghost locked as resolved and limited conversation to collaborators Dec 9, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Build WASM runtimes #35566

Build WASM runtimes #35566

vargaz commented Apr 28, 2020

vargaz commented Apr 28, 2020

marek-safar Apr 28, 2020 •

edited

Loading

vargaz Apr 29, 2020

marek-safar Apr 30, 2020

akoeplinger May 5, 2020

kjpou1 May 6, 2020 •

edited

Loading

akoeplinger May 6, 2020

vargaz commented Apr 30, 2020

vargaz commented May 1, 2020

marek-safar commented May 5, 2020

akoeplinger May 5, 2020

akoeplinger May 5, 2020

Build WASM runtimes #35566

Build WASM runtimes #35566

Conversation

vargaz commented Apr 28, 2020

vargaz commented Apr 28, 2020

marek-safar Apr 28, 2020 • edited Loading

Choose a reason for hiding this comment

vargaz Apr 29, 2020

Choose a reason for hiding this comment

marek-safar Apr 30, 2020

Choose a reason for hiding this comment

akoeplinger May 5, 2020

Choose a reason for hiding this comment

kjpou1 May 6, 2020 • edited Loading

Choose a reason for hiding this comment

akoeplinger May 6, 2020

Choose a reason for hiding this comment

vargaz commented Apr 30, 2020

vargaz commented May 1, 2020

marek-safar commented May 5, 2020

akoeplinger May 5, 2020

Choose a reason for hiding this comment

akoeplinger May 5, 2020

Choose a reason for hiding this comment

marek-safar Apr 28, 2020 •

edited

Loading

kjpou1 May 6, 2020 •

edited

Loading