Skip to content

Ship a .framework version of Mono #53370

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
directhex merged 24 commits into from
Jul 8, 2021
Merged

Ship a .framework version of Mono #53370

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
3d876f7
WIP
akoeplinger May 17, 2021
ada980d
Merge remote-tracking branch 'origin/main' into ios-xcframework
May 27, 2021
82555d5
Copy mono-framework.framework to same build dir as monosgen
May 27, 2021
4879ec7
Copy .frameworks to bin/
May 27, 2021
9e3bc17
Ship .framework in nupkg
May 27, 2021
ff168f9
Merge remote-tracking branch 'origin/main' into ios-xcframework
Jun 3, 2021
f97e186
Rename mono-framework to Mono
Jun 3, 2021
0ee1330
Merge remote-tracking branch 'origin/main' into ios-xcframework
Jun 29, 2021
7d8d578
Fix framework build on non-catalyst
Jun 29, 2021
e97ec4c
Build stubby (release) and static-component (release) .frameworks
Jun 30, 2021
f16eabb
Merge remote-tracking branch 'origin/main' into ios-xcframework
Jun 30, 2021
75ea8d1
Strip frameworks
Jun 30, 2021
9bd0b0e
What if we flatten to iOS-style unversioned frameworks on non-iOS?
Jul 1, 2021
4ee0938
Fix stripping-dwarf-files bug
Jul 2, 2021
45f4e2b
Merge remote-tracking branch 'origin/main' into ios-xcframework
Jul 2, 2021
3315ef6
Merge branch 'ios-xcframework' of github.com:directhex/runtime into i…
Jul 2, 2021
8f544ab
Bundle dylibs for components on dynamic component platforms
Jul 2, 2021
db386ee
Only build .frameworks if explicitly turned on; turn on in relevant C…
Jul 6, 2021
aa31a96
Merge remote-tracking branch 'origin/main' into ios-xcframework
Jul 6, 2021
62ab8ae
Typo
Jul 6, 2021
2837fcb
Fix casing (from Mitch)
Jul 7, 2021
65e00a7
Add explanation of whitespace fiddling to bypass cmake list limitations
Jul 7, 2021
29e9413
Release and debug were reversed (debug should get full objects, not s…
Jul 7, 2021
bd8272e
Merge remote-tracking branch 'origin/main' into ios-xcframework
Jul 8, 2021
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
Prev Previous commit
Next Next commit
Rename mono-framework to Mono
  • Loading branch information
Jo Shields committed Jun 3, 2021
commit f97e1861d7e7b8a89a89c91c10649b59728b7549
2 changes: 1 addition & 1 deletion eng/liveBuilds.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<IsNative>true</IsNative>
</RuntimeFiles>

<FrameworkFiles Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoArtifactsPath)\mono-framework.framework\*.*" />
<FrameworkFiles Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoArtifactsPath)\Mono.framework\*.*" />
<MonoIncludeFiles Condition="'$(TargetsMobile)' == 'true'"
Include="$(MonoArtifactsPath)\include\**\*.*" />
</ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -734,11 +734,11 @@
<Destination>$(RuntimeBinDir)cross\$(PackageRID)\opt$(ExeExt)</Destination>
</_MonoRuntimeArtifacts>
<_MonoIncludeArtifacts Include="$(MonoObjDir)out\include\**" />
<_MonoRuntimeArtifacts Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoObjDir)out\lib\mono-framework.framework\mono-framework">
<Destination>$(RuntimeBinDir)\mono-framework.framework\mono-framework</Destination>
<_MonoRuntimeArtifacts Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoObjDir)out\lib\Mono.framework\Mono">
<Destination>$(RuntimeBinDir)\Mono.framework\Mono</Destination>
</_MonoRuntimeArtifacts>
<_MonoRuntimeArtifacts Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoObjDir)out\lib\mono-framework.framework\Info.plist">
<Destination>$(RuntimeBinDir)\mono-framework.framework\Info.plist</Destination>
<_MonoRuntimeArtifacts Condition="'$(TargetsMacCatalyst)' == 'true' or '$(TargetsiOS)' == 'true' or '$(TargetstvOS)' == 'true'" Include="$(MonoObjDir)out\lib\Mono.framework\Info.plist">
<Destination>$(RuntimeBinDir)\Mono.framework\Info.plist</Destination>
</_MonoRuntimeArtifacts>
<_MonoRuntimeArtifacts Condition="'$(_MonoIncludeInterpStaticFiles)' == 'true'" Include="$(MonoObjDir)out\lib\libmono-ee-interp.a">
<Destination>$(RuntimeBinDir)libmono-ee-interp.a</Destination>
Expand Down
20 changes: 10 additions & 10 deletions src/mono/mono/mini/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,24 +391,24 @@ if(NOT DISABLE_SHARED_LIBS)


if(TARGET_DARWIN)
add_library(mono-framework SHARED $<TARGET_OBJECTS:monosgen-objects>)
target_compile_definitions(mono-framework PRIVATE -DMONO_DLL_EXPORT)
target_sources(mono-framework PRIVATE $<TARGET_OBJECTS:eglib_objects>)
target_link_libraries(mono-framework PRIVATE ${OS_LIBS} ${ICONV_LIB} ${LLVM_LIBS} ${ICU_LIBS})
add_library(Mono SHARED $<TARGET_OBJECTS:monosgen-objects>)
target_compile_definitions(Mono PRIVATE -DMONO_DLL_EXPORT)
target_sources(Mono PRIVATE $<TARGET_OBJECTS:eglib_objects>)
target_link_libraries(Mono PRIVATE ${OS_LIBS} ${ICONV_LIB} ${LLVM_LIBS} ${ICU_LIBS})
if(ICU_LDFLAGS)
set_property(TARGET mono-framework APPEND_STRING PROPERTY LINK_FLAGS " ${ICU_LDFLAGS}")
set_property(TARGET Mono APPEND_STRING PROPERTY LINK_FLAGS " ${ICU_LDFLAGS}")
endif()
if(STATIC_ICU)
set_property(TARGET mono-framework APPEND_STRING PROPERTY LINKER_LANGUAGE CXX)
set_property(TARGET Mono APPEND_STRING PROPERTY LINKER_LANGUAGE CXX)
endif ()
set_property(TARGET mono-framework APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-compatibility_version -Wl,2.0 -Wl,-current_version -Wl,2.0")
target_sources(mono-framework PRIVATE "${mono-components-objects}")
set_target_properties(mono-framework PROPERTIES
set_property(TARGET Mono APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-compatibility_version -Wl,2.0 -Wl,-current_version -Wl,2.0")
target_sources(Mono PRIVATE "${mono-components-objects}")
set_target_properties(Mono PROPERTIES
FRAMEWORK TRUE
FRAMEWORK_VERSION C
MACOSX_FRAMEWORK_IDENTIFIER net.dot.mono-framework
)
install(TARGETS mono-framework
install(TARGETS Mono
FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
)
endif()
Expand Down