Skip to content

Move where wasm binaries are generated #36781

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

Merged
steveisok merged 3 commits into from
May 22, 2020
Merged

Move where wasm binaries are generated #36781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7508032
Shift producing wasm binaries to the native dir so that they'll come …
May 20, 2020
3a76c19
Glob the native files for mobile and make sure they get reflected in …
May 21, 2020
0f5adef
Update eng/liveBuilds.targets
steveisok May 22, 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
6 changes: 5 additions & 1 deletion eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
$(LibrariesAllBinArtifactsPath)*.dll;
$(LibrariesAllBinArtifactsPath)*.pdb"
IsNative="" />
<LibrariesRuntimeFiles Include="
<LibrariesRuntimeFiles Condition="'$(TargetsMobile)' != 'true'" Include="
$(LibrariesNativeArtifactsPath)*.dll;
$(LibrariesNativeArtifactsPath)*.dylib;
$(LibrariesNativeArtifactsPath)*.a;
Expand All @@ -184,6 +184,10 @@
$(LibrariesNativeArtifactsPath)*.dwarf;
$(LibrariesNativeArtifactsPath)*.pdb"
IsNative="true" />
<LibrariesRuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
Include="
$(LibrariesNativeArtifactsPath)**\*.*"
IsNative="true" />
</ItemGroup>

<Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The 'libs' subset must be built before building this project." />
Expand Down
2 changes: 1 addition & 1 deletion src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@

<ItemGroup Condition="'$(PackageRID)' != ''">
<LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" />
<LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native" />
<LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native/%(RecursiveDir)" />
<ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ emsdk_env.sh: | provision-wasm

MONO_OBJ_DIR=$(OBJDIR)/mono/Browser.wasm.$(CONFIG)
MONO_INCLUDE_DIR=$(MONO_BIN_DIR)/include/mono-2.0
BUILDS_BIN_DIR=$(MONO_BIN_DIR)/wasm/runtimes
BUILDS_BIN_DIR=$(SYS_NATIVE_DIR)/wasm/runtimes
BUILDS_OBJ_DIR=$(MONO_OBJ_DIR)/wasm/runtimes
MONO_LIBS = \
$(MONO_BIN_DIR)/{libmono-ee-interp.a,libmonosgen-2.0.a,libmono-ilgen.a,libmono-icall-table.a} \
Expand Down