Skip to content

Fix binplacing WASM files for in-tree runtime pack #36985

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
akoeplinger merged 2 commits into from
May 26, 2020
Merged

Fix binplacing WASM files for in-tree runtime pack #36985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6cad58
Fix binplacing WASM files for in-tree runtime pack
akoeplinger May 25, 2020
a3fcc0c
Fix installer build
akoeplinger May 26, 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
18 changes: 12 additions & 6 deletions eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@
Include="$(MonoArtifactsPath)\cross\*.*" />
<MonoIncludeFiles Condition="'$(TargetsMobile)' == 'true'"
Include="$(MonoArtifactsPath)\include\**\*.*" />
<WasmDistFiles Condition="'$(TargetOS)' == 'Browser'"
Include="$(MonoArtifactsPath)\wasm\runtimes\**\*.*" />
</ItemGroup>

<Error Condition="'@(RuntimeFiles)' == ''" Text="The '$(RuntimeFlavor)' subset must be built before building this project." />
Expand Down Expand Up @@ -176,7 +174,7 @@
$(LibrariesAllBinArtifactsPath)*.dll;
$(LibrariesAllBinArtifactsPath)*.pdb"
IsNative="" />
<LibrariesRuntimeFiles Condition="'$(TargetsMobile)' != 'true'" Include="
<LibrariesRuntimeFiles Include="
$(LibrariesNativeArtifactsPath)*.dll;
$(LibrariesNativeArtifactsPath)*.dylib;
$(LibrariesNativeArtifactsPath)*.a;
Expand All @@ -185,10 +183,18 @@
$(LibrariesNativeArtifactsPath)*.dwarf;
$(LibrariesNativeArtifactsPath)*.pdb"
IsNative="true" />
<LibrariesRuntimeFiles Condition="'$(TargetsMobile)' == 'true'"
<LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser'"
Include="
$(LibrariesNativeArtifactsPath)**\*.*"
IsNative="true" />
$(LibrariesNativeArtifactsPath)wasm\runtimes\debug\dotnet.js;
Comment thread
akoeplinger marked this conversation as resolved.
Outdated
$(LibrariesNativeArtifactsPath)wasm\runtimes\debug\dotnet.wasm;"
IsNative="true"
NativeSubDirectory="wasm/runtimes/debug/" />
<LibrariesRuntimeFiles Condition="'$(TargetOS)' == 'Browser'"
Include="
$(LibrariesNativeArtifactsPath)wasm\runtimes\release\dotnet.js;
$(LibrariesNativeArtifactsPath)wasm\runtimes\release\dotnet.wasm"
IsNative="true"
NativeSubDirectory="wasm/runtimes/release/" />
</ItemGroup>

<Error Condition="'@(LibrariesRefAssemblies)' == ''" Text="The 'libs' subset must be built before building this project." />
Expand Down
7 changes: 1 addition & 6 deletions 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 @@ -76,11 +76,6 @@
<TargetPath>runtimes/$(PackageRID)/native/include/%(RecursiveDir)</TargetPath>
</RuntimeFiles>

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

<CoreCLRCrossTargetFiles Condition="'%(FileName)' == 'clrjit' or '%(FileName)' == 'libclrjit'">
<TargetPath>runtimes/$(CoreCLRCrossTargetComponentDirName)_$(TargetArchitecture)/native</TargetPath>
</CoreCLRCrossTargetFiles>
Expand All @@ -105,7 +100,7 @@

<ItemGroup Condition="'$(PackageRID)' != ''">
<LibrariesRuntimeFiles Condition="'%(IsNative)' != 'true'" TargetPath="runtimes/$(PackageRID)/lib/$(NetCoreAppCurrent)" />
<LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native/%(RecursiveDir)" />
<LibrariesRuntimeFiles Condition="'%(IsNative)' == 'true'" TargetPath="runtimes/$(PackageRID)/native/%(LibrariesRuntimeFiles.NativeSubDirectory)%(RecursiveDir)" />
Copy link
Copy Markdown
Member

@ViktorHofer ViktorHofer May 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took me a while to understand what this is doing. You might want to add a comment.

Copy link
Copy Markdown
Member Author

@akoeplinger akoeplinger May 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah though that applies to all of this build logic, it's pretty hard to understand without spending a lot of time looking at build flows in the binlog. 😄

Copy link
Copy Markdown
Member Author

@akoeplinger akoeplinger May 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will merge to unblock wasm and add the comment in another PR.

<ReferenceCopyLocalPaths Include="@(LibrariesRuntimeFiles)" />
</ItemGroup>

Expand Down
6 changes: 6 additions & 0 deletions src/libraries/Native/native-binplace.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@
<NativeBinPlaceItem Include="$(NativeBinDir)*.dbg" />
<NativeBinPlaceItem Include="$(NativeBinDir)*.dylib" />
<NativeBinPlaceItem Include="$(NativeBinDir)*.dwarf" />
<NativeBinPlaceItem Condition="'$(TargetOS)' == 'Browser'" Include="$(NativeBinDir)wasm\runtimes\debug\dotnet.js;$(NativeBinDir)wasm\runtimes\debug\dotnet.wasm">
<DestinationSubDirectory>wasm\runtimes\debug\</DestinationSubDirectory>
</NativeBinPlaceItem>
<NativeBinPlaceItem Condition="'$(TargetOS)' == 'Browser'" Include="$(NativeBinDir)wasm\runtimes\release\dotnet.js;$(NativeBinDir)wasm\runtimes\release\dotnet.wasm">
<DestinationSubDirectory>wasm\runtimes\release\</DestinationSubDirectory>
</NativeBinPlaceItem>

<BinPlaceItem Condition="'$(BinPlaceTestRuntimePack)' != 'true'" Include="@(NativeBinPlaceItem)" />
<FileWrites Include="@(NativeBinPlaceItem)" />
Expand Down
1 change: 0 additions & 1 deletion src/libraries/pretest.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<ProjectReference Include="$(CommonTestPath)AppleTestRunner\AppleTestRunner.csproj" Condition="'$(TargetOS)' == 'iOS' or '$(TargetOS)' == 'tvOS'"/>
<ProjectReference Include="$(CommonTestPath)AndroidTestRunner\AndroidTestRunner.csproj" Condition="'$(TargetOS)' == 'Android'" />
<ProjectReference Include="$(MonoProjectRoot)wasm\wasm.proj" Condition="'$(TargetOS)' == 'Browser'" />
</ItemGroup>

<Target Name="RestoreTestHost"
Expand Down
3 changes: 0 additions & 3 deletions src/libraries/restore/runtime/runtime.depproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@
<NativeBinPlaceItem Include="@(MonoIncludeFiles)">
<DestinationSubDirectory>include/%(RecursiveDir)</DestinationSubDirectory>
</NativeBinPlaceItem>
<NativeBinPlaceItem Include="@(WasmDistFiles)">
<DestinationSubDirectory>wasm/%(RecursiveDir)</DestinationSubDirectory>
</NativeBinPlaceItem>
</ItemGroup>
<ItemGroup Condition="'$(TargetsMobile)' != 'true'">
<TestHostBinPlaceItem Include="@(RuntimeFiles)" />
Expand Down
6 changes: 5 additions & 1 deletion src/libraries/src.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

<PropertyGroup>
<TraversalGlobalProperties>BuildAllProjects=true</TraversalGlobalProperties>
<NativeBinPlaceDependsOnTargets Condition="'$(TargetOS)' == 'Browser'">BuildWasmRuntimes</NativeBinPlaceDependsOnTargets>
</PropertyGroup>

<ItemGroup>
Expand All @@ -24,8 +25,11 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.vbproj" Exclude="@(ProjectExclusions)" />
</ItemGroup>

<Import Condition="'$(TargetOS)' == 'Browser'" Project="$(MonoProjectRoot)wasm\wasm.targets" />

<Target Name="NativeBinPlace"
BeforeTargets="Build">
AfterTargets="Build"
DependsOnTargets="$(NativeBinPlaceDependsOnTargets)">
<MSBuild Targets="Build"
Projects="@(NativeBinPlaceProject)"
Properties="$(TraversalGlobalProperties)" />
Expand Down
4 changes: 2 additions & 2 deletions src/mono/wasm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ BINDIR?=$(TOP)/artifacts/bin
OBJDIR?=$(TOP)/artifacts/obj
PINVOKE_TABLE?=$(TOP)/artifacts/obj/mono/Browser.wasm.$(CONFIG)/wasm/pinvoke-table.h
MONO_BIN_DIR?=$(BINDIR)/mono/Browser.wasm.$(CONFIG)
SYS_NATIVE_DIR?=$(BINDIR)/native/net5.0-Browser-$(CONFIG)-wasm/
SYS_NATIVE_DIR?=$(OBJDIR)/native/net5.0-Browser-$(CONFIG)-wasm/System.Native
Copy link
Copy Markdown
Contributor

@marek-safar marek-safar May 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still not sure why we explicitly list only this native lib

Copy link
Copy Markdown
Member Author

@akoeplinger akoeplinger May 26, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually we'll need all of them but right now it's the only native lib we use. This will need to be refactored into proper msbuild anyway.

BUILDS_BIN_DIR?=$(BINDIR)/native/net5.0-Browser-$(CONFIG)-wasm/wasm/runtimes

all: build-native

Expand Down Expand Up @@ -44,7 +45,6 @@ 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=$(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
13 changes: 4 additions & 9 deletions src/mono/wasm/wasm.proj → src/mono/wasm/wasm.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
<Project Sdk="Microsoft.Build.Traversal">
<PropertyGroup>
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
</PropertyGroup>
<Project>

<UsingTask TaskName="PInvokeTableGenerator"
AssemblyFile="$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'WasmAppBuilder', 'Debug', '$(NetCoreAppCurrent)', 'publish', 'WasmAppBuilder.dll'))"/>

<PropertyGroup>
<WasmPInvokeTablePath>$(MonoObjDir)wasm/pinvoke-table.h</WasmPInvokeTablePath>
<RuntimePackDir>$(ArtifactsDir)bin\lib-runtime-packs\runtimes\browser-wasm\lib\$(NetCoreAppCurrent)</RuntimePackDir>
<WasmPInvokeTablePath>$(ArtifactsObjDir)wasm/pinvoke-table.h</WasmPInvokeTablePath>
</PropertyGroup>

<ItemGroup>
Expand All @@ -29,7 +25,7 @@
</Target>

<Target Name="BuildPInvokeTable" DependsOnTargets="CheckEnv">
<MakeDir Directories="$(MonoObjDir)wasm"/>
<MakeDir Directories="$(ArtifactsObjDir)wasm"/>
<PInvokeTableGenerator
Modules="@(WasmPInvokeModules)"
Assemblies="@(WasmPInvokeAssemblies)"
Expand All @@ -38,9 +34,8 @@
</Target>

<Target Name="BuildWasmRuntimes"
AfterTargets="Build"
DependsOnTargets="BuildPInvokeTable">
<Exec Command="make -C $(MonoProjectRoot)wasm all SHELL=/bin/bash BINDIR=$(ArtifactsBinDir) MONO_BIN_DIR=$(MonoArtifactsPath) OBJDIR=$(ArtifactsObjDir) SYS_NATIVE_DIR=$(ArtifactsBinDir)/native/$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture) CONFIG=$(Configuration) PINVOKE_TABLE=$(WasmPInvokeTablePath)" IgnoreStandardErrorWarningFormat="true"/>
<Exec Command="make -C $(MonoProjectRoot)wasm all SHELL=/bin/bash BINDIR=$(ArtifactsBinDir) MONO_BIN_DIR=$(MonoArtifactsPath) OBJDIR=$(ArtifactsObjDir) BUILDS_BIN_DIR=$(NativeBinDir)/wasm/runtimes SYS_NATIVE_DIR=$(ArtifactsObjDir)/native/$(NetCoreAppCurrent)-$(TargetOS)-$(Configuration)-$(TargetArchitecture)/System.Native CONFIG=$(Configuration) PINVOKE_TABLE=$(WasmPInvokeTablePath)" IgnoreStandardErrorWarningFormat="true"/>
</Target>

</Project>
2 changes: 1 addition & 1 deletion tools-local/tasks/mobile.tasks/WasmAppBuilder/WasmAppBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public override bool Execute () {
foreach (var assembly in Assemblies!.Values)
File.Copy (assembly.Location, Path.Join (AppDir, "managed", Path.GetFileName (assembly.Location)), true);
foreach (var f in new string [] { "dotnet.wasm", "dotnet.js" })
File.Copy (Path.Join (RuntimePackDir, "native", "wasm", "release", f), Path.Join (AppDir, f), true);
File.Copy (Path.Join (RuntimePackDir, "native", "wasm", "runtimes", "release", f), Path.Join (AppDir, f), true);
File.Copy (MainJS!, Path.Join (AppDir, Path.GetFileName (MainJS!)), true);

using (var sw = File.CreateText (Path.Join (AppDir, "mono-config.js"))) {
Expand Down