From: Sedar Gokbulut Date: Wed, 4 Jan 2017 19:21:20 +0000 (-0800) Subject: Adding Microsoft.NETCore.Native package (#8791) X-Git-Tag: accepted/tizen/base/20180629.140029~2684 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eea7b4691c0a489435814e48a257a9d047475006;p=platform%2Fupstream%2Fcoreclr.git Adding Microsoft.NETCore.Native package (#8791) * "Adding Microsoft.NETCore.Native package" * Adding generic linux configuration to Microsoft.NETCore.Native package * Fixing the OSX pkgproj of Microsoft.NETCore.Native to include S.Globalization.Native.dylib and not .so --- diff --git a/.gitignore b/.gitignore index 702c37d..5ebba36 100644 --- a/.gitignore +++ b/.gitignore @@ -24,6 +24,7 @@ build/ bld/ [Bb]in/ [Oo]bj/ +localpkg/ msbuild.log # add back architecture directories ignored in 'Build results' diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds new file mode 100644 index 0000000..a178ddb --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.builds @@ -0,0 +1,65 @@ + + + + + + + $(PackageOutputPath) + + + + + + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + Linux + amd64 + + + OSX + amd64 + + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..51b524a --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,50 @@ + + + + + true + true + x64;x86;arm64;arm; + $(PackagesOutputPath) + true + + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + amd64 + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..b772b7f --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/alpine/3.4.3/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + alpine.3.4.3-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..935954b --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/debian/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + debian.8-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..ed4f22b --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/fedora/23/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + fedora.23-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..fead3e5 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/fedora/24/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + fedora.24-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..afca009 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/linux/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + linux-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..becc455 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/opensuse/13.2/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + opensuse.13.2-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..6dbdb29 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/opensuse/42.1/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + opensuse.42.1-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..1fcd7f2 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/osx/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + osx.10.10-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..99a23de --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/rhel/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + rhel.7-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..c2a9661 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/ubuntu/14.04/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + ubuntu.14.04-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..4a4f2e7 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.04/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + ubuntu.16.04-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj new file mode 100644 index 0000000..6e04e85 --- /dev/null +++ b/src/.nuget/Microsoft.NETCore.Native/ubuntu/16.10/Microsoft.NETCore.Native.pkgproj @@ -0,0 +1,30 @@ + + + + + true + ubuntu.16.10-$(PackagePlatform) + + x64; + + + + + + + runtimes/$(PackageTargetRuntime)/native + + + + + + + + + + runtimes/$(PackageTargetRuntime)/native + true + + + + diff --git a/src/.nuget/descriptions.json b/src/.nuget/descriptions.json index 640ff02..ccb6af8 100644 --- a/src/.nuget/descriptions.json +++ b/src/.nuget/descriptions.json @@ -38,5 +38,10 @@ "Name": "Microsoft.NETCore.TestHost", "Description": "CoreCLR application host for test applications", "CommonTypes": [ ] + }, + { + "Name": "Microsoft.NETCore.Native", + "Description": "Native shims for .NET Core runtime", + "CommonTypes": [ ] } ] diff --git a/src/.nuget/packages.builds b/src/.nuget/packages.builds index 7458c8e..5d1d025 100644 --- a/src/.nuget/packages.builds +++ b/src/.nuget/packages.builds @@ -18,6 +18,7 @@ + diff --git a/src/corefx/System.Globalization.Native/CMakeLists.txt b/src/corefx/System.Globalization.Native/CMakeLists.txt index 90f5067..3c5c6a0 100644 --- a/src/corefx/System.Globalization.Native/CMakeLists.txt +++ b/src/corefx/System.Globalization.Native/CMakeLists.txt @@ -67,6 +67,14 @@ _add_library(System.Globalization.Native ${NATIVEGLOBALIZATION_SOURCES} ) +_add_library(System.Globalization.Native_Static + STATIC + ${NATIVEGLOBALIZATION_SOURCES} +) + +# Remove the _Static postfix from the static library name +set_target_properties(System.Globalization.Native_Static PROPERTIES OUTPUT_NAME System.Globalization.Native) + # Disable the "lib" prefix. set_target_properties(System.Globalization.Native PROPERTIES PREFIX "") @@ -80,10 +88,17 @@ if(NOT CLR_CMAKE_PLATFORM_DARWIN) ${ICUUC} ${ICUI18N} ) + target_link_libraries(System.Globalization.Native_Static + ${ICUUC} + ${ICUI18N} + ) elseif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(System.Globalization.Native dl ) + target_link_libraries(System.Globalization.Native_Static + dl + ) endif() else() target_link_libraries(System.Globalization.Native @@ -100,4 +115,5 @@ verify_dependencies( # add the install targets install_clr(System.Globalization.Native) +install_clr(System.Globalization.Native_Static)