Skip to content

Publish nethost static library #296

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
dagood merged 1 commit into from
Dec 9, 2019
Merged

Publish nethost static library #296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/installer/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@
<LibSuffix>.so</LibSuffix>
<LibSuffix Condition="'$(OSGroup)' == 'Windows_NT'">.dll</LibSuffix>
<LibSuffix Condition="'$(OSGroup)' == 'OSX'">.dylib</LibSuffix>
<StaticLibPrefix>lib</StaticLibPrefix>
<StaticLibSuffix>.a</StaticLibSuffix>
<StaticLibSuffix Condition="'$(OSGroup)' == 'Windows_NT'">.lib</StaticLibSuffix>
</PropertyGroup>

<PropertyGroup>
Expand Down
18 changes: 18 additions & 0 deletions src/installer/corehost/cli/lib_static.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Licensed to the .NET Foundation under one or more agreements.
# The .NET Foundation licenses this file to you under the MIT license.
# See the LICENSE file in the project root for more information.

project(lib${DOTNET_PROJECT_NAME})

include(${CMAKE_CURRENT_LIST_DIR}/common.cmake)

add_definitions(-D_NO_ASYNCRTIMP)
add_definitions(-D_NO_PPLXIMP)
add_definitions(-DEXPORT_SHARED_API=1)

add_library(lib${DOTNET_PROJECT_NAME} STATIC ${SOURCES} ${RESOURCES})

set_target_properties(lib${DOTNET_PROJECT_NAME} PROPERTIES MACOSX_RPATH TRUE)
set_target_properties(lib${DOTNET_PROJECT_NAME} PROPERTIES PREFIX "")

set_common_libs("lib")
2 changes: 2 additions & 0 deletions src/installer/corehost/cli/nethost/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,12 @@ if(WIN32)
endif()

include(../lib.cmake)
include(../lib_static.cmake)

add_definitions(-DFEATURE_LIBHOST=1)
add_definitions(-DNETHOST_EXPORT)

install(FILES nethost.h DESTINATION corehost)
install(TARGETS nethost DESTINATION corehost)
install(TARGETS libnethost DESTINATION corehost)
install_symbols(nethost corehost)
1 change: 1 addition & 0 deletions src/installer/pkg/packaging/installers.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<ItemGroup>
<NetHostFiles Include="$(_NetHostOutputDir)nethost.h" />
<NetHostFiles Include="$(_NetHostOutputDir)$(LibPrefix)nethost$(LibSuffix)" />
<NetHostFiles Include="$(_NetHostOutputDir)$(StaticLibPrefix)nethost$(StaticLibSuffix)" />
<NetHostFiles Condition="'$(OSGroup)' == 'Windows_NT'" Include="$(_NetHostOutputDir)nethost.lib" />
</ItemGroup>
<Copy SourceFiles="@(NetHostFiles)"
Expand Down
1 change: 1 addition & 0 deletions ...cts/Microsoft.NETCore.DotNetAppHost/runtime.FreeBSD.Microsoft.NETCore.DotNetAppHost.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ItemGroup>
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.so" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.a" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />

<File Include="@(ArchitectureSpecificNativeFile)">
Expand Down
1 change: 1 addition & 0 deletions ...rojects/Microsoft.NETCore.DotNetAppHost/runtime.OSX.Microsoft.NETCore.DotNetAppHost.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ItemGroup>
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.dylib" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.a" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />

<File Include="@(ArchitectureSpecificNativeFile)">
Expand Down
1 change: 1 addition & 0 deletions ...ojects/Microsoft.NETCore.DotNetAppHost/runtime.Unix.Microsoft.NETCore.DotNetAppHost.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<ItemGroup>
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/apphost" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.so" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.a" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />

<File Include="@(ArchitectureSpecificNativeFile)">
Expand Down
1 change: 1 addition & 0 deletions .../Microsoft.NETCore.DotNetAppHost/runtime.Windows_NT.Microsoft.NETCore.DotNetAppHost.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/ijwhost.dll" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/ijwhost.lib" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.dll" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/libnethost.lib" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.h" />
<ArchitectureSpecificNativeFile Include="$(DotNetHostBinDir)/nethost.lib" />

Expand Down