Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add files need for wasm executable relinking/aot to the wasm runtime pack. #43785

Merged
merged 5 commits into from
Nov 9, 2020
Merged

Add files need for wasm executable relinking/aot to the wasm runtime pack. #43785

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0dd5942
Add files need for wasm executable relinking/aot to the wasm runtime …
vargaz Oct 23, 2020
c042f56
Add pinvoke-table.h as well.
vargaz Oct 24, 2020
6f0a2ce
Remove unused libicu files.
vargaz Oct 26, 2020
26f1e84
Merge remote-tracking branch 'upstream/master' into wasm-runtime-pack
akoeplinger Nov 9, 2020
2eba4dd
Fix runtime pack directory for .c/.h/.js files
akoeplinger Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,10 @@
$(LibrariesNativeArtifactsPath)dotnet.js;
$(LibrariesNativeArtifactsPath)dotnet.wasm;
$(LibrariesNativeArtifactsPath)dotnet.timezones.blat;
$(LibrariesNativeArtifactsPath)*.dat;"
$(LibrariesNativeArtifactsPath)*.dat;
$(LibrariesNativeArtifactsPath)*.c;
$(LibrariesNativeArtifactsPath)*.h;
$(LibrariesNativeArtifactsPath)*.js;"
IsNative="true" />
</ItemGroup>

Expand Down
21 changes: 19 additions & 2 deletions src/mono/wasm/wasm.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,29 @@
AfterTargets="Build"
DependsOnTargets="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=$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/browser-wasm/native/lib ENABLE_ES6=$(WasmEnableES6)"
<PropertyGroup>
<_IcuLibdir>$(PkgMicrosoft_NETCore_Runtime_ICU_Transport)/runtimes/browser-wasm/native/lib</_IcuLibdir>
</PropertyGroup>

<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) ENABLE_ES6=$(WasmEnableES6)"
IgnoreStandardErrorWarningFormat="true" />

<Copy SourceFiles="$(NativeBinDir)dotnet.js;
$(NativeBinDir)dotnet.wasm;
$(NativeBinDir)dotnet.timezones.blat"
$(NativeBinDir)dotnet.timezones.blat;
$(MonoProjectRoot)wasm\runtime\driver.c;
$(MonoProjectRoot)wasm\runtime\pinvoke.c;
$(MonoProjectRoot)wasm\runtime\corebindings.c;
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
$(MonoProjectRoot)wasm\runtime\pinvoke.h;
$(MonoProjectRoot)wasm\runtime\binding_support.js;
$(MonoProjectRoot)wasm\runtime\dotnet_support.js;
$(MonoProjectRoot)wasm\runtime\library_mono.js;
$(LibrariesProjectRoot)Native\Unix\System.Native\pal_random.js;
akoeplinger marked this conversation as resolved.
Show resolved Hide resolved
$(_IcuLibdir)\libicudata.a;
$(_IcuLibdir)\libicui18n.a;
$(_IcuLibdir)\libicutest.a;
$(_IcuLibdir)\libicutu.a;
vargaz marked this conversation as resolved.
Show resolved Hide resolved
$(_IcuLibdir)\libicuuc.a"
DestinationFolder="$(MicrosoftNetCoreAppRuntimePackNativeDir)"
SkipUnchangedFiles="true" />

Expand Down