Reorganize libs.native (#61958)

* Reorganize libs.native * Fix darwin build * Fix wasm-win32 build * Fix pipelines path evaluation
dotnet · Nov 24, 2021 · 7414af2 · 7414af2
1 parent 2307418
commit 7414af2
Show file tree

Hide file tree

Showing 472 changed files with 400 additions and 603 deletions.
diff --git a/docs/workflow/building/libraries/README.md b/docs/workflow/building/libraries/README.md
@@ -111,12 +111,12 @@ The libraries build contains some native code. This includes shims over libc, op
 
 - Building in debug mode for platform x64
 ```bash
-./src/libraries/Native/build-native.sh debug x64
+./src/native/libs/build-native.sh debug x64
 ```
 
 - The following example shows how you would do an arm cross-compile build
 ```bash
-./src/libraries/Native/build-native.sh debug arm cross verbose
+./src/native/libs/build-native.sh debug arm cross verbose
 ```
 
 For Windows, replace `build-native.sh` with `build-native.cmd`.

diff --git a/eng/Subsets.props b/eng/Subsets.props
@@ -280,7 +280,7 @@
 
   <!-- Libraries sets -->
   <ItemGroup Condition="$(_subset.Contains('+libs.native+'))">
-    <ProjectToBuild Include="$(LibrariesProjectRoot)Native\build-native.proj" Category="libs" />
+    <ProjectToBuild Include="$(SharedNativeRoot)libs\build-native.proj" Category="libs" />
   </ItemGroup>
 
   <ItemGroup Condition="$(_subset.Contains('+libs.ref+'))">

diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake
@@ -525,7 +525,7 @@ if (MSVC)
 
   # disable C++ RTTI
   # /GR is added by default by CMake, so remove it manually.
-  string(REPLACE "/GR" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+  string(REPLACE "/GR " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /GR-")
 
   add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/FC>) # use full pathnames in diagnostics

diff --git a/eng/native/configurepaths.cmake b/eng/native/configurepaths.cmake
@@ -1,7 +1,6 @@
 get_filename_component(CLR_REPO_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/../.. ABSOLUTE)
 set(CLR_ENG_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR})
 get_filename_component(CLR_SRC_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../src/native ABSOLUTE)
-get_filename_component(CLR_SRC_LIBS_NATIVE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../src/libraries/Native ABSOLUTE)
 set (CLR_ARTIFACTS_OBJ_DIR "${CLR_REPO_ROOT_DIR}/artifacts/obj")
 set(VERSION_HEADER_PATH "${CLR_ARTIFACTS_OBJ_DIR}/_version.h")
 set(VERSION_FILE_PATH "${CLR_ARTIFACTS_OBJ_DIR}/_version.c")

diff --git a/eng/pipelines/common/evaluate-default-paths.yml b/eng/pipelines/common/evaluate-default-paths.yml
@@ -9,9 +9,9 @@ jobs:
     - subset: coreclr
       include:
       - src/libraries/System.Private.CoreLib/*
-      - src/libraries/Native/Unix/System.Globalization.Native/*
-      - src/libraries/Native/Unix/Common/*
-      - src/native/*
+      - src/native/libs/Common/*
+      - src/native/libs/System.Globalization.Native/*
+      - src/native/libs/System.IO.Compression.Native/*
       exclude:
       - eng/Version.Details.xml
       - '*.md'
@@ -22,16 +22,17 @@ jobs:
       - src/installer/*
       - src/mono/*
       - src/libraries/*
+      - src/native/libs/*
       - src/tests/*
       - eng/pipelines/installer/*
       - eng/pipelines/mono/*
       - eng/pipelines/libraries/*
     - subset: mono
       include:
       - src/libraries/System.Private.CoreLib/*
-      - src/libraries/Native/Unix/System.Globalization.Native/*
-      - src/libraries/Native/Unix/Common/*
-      - src/native/*
+      - src/native/libs/Common/*
+      - src/native/libs/System.Globalization.Native/*
+      - src/native/libs/System.IO.Compression.Native/*
       exclude:
       - eng/Version.Details.xml
       - '*.md'
@@ -42,6 +43,7 @@ jobs:
       - src/installer/*
       - src/coreclr/*
       - src/libraries/*
+      - src/native/libs/*
       - src/tests/*
       - eng/pipelines/installer/*
       - eng/pipelines/coreclr/*

diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml
@@ -14,7 +14,7 @@ pr:
       - eng/pipelines/libraries/enterprise/*
       - src/libraries/Common/src/System/Net/*
       - src/libraries/Common/tests/System/Net/*
-      - src/libraries/Native/Unix/System.Net.Security.Native/*
+      - src/native/libs/System.Net.Security.Native/*
       - src/libraries/System.Net.Http/*
       - src/libraries/System.Net.Security/*
 

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -84,12 +84,7 @@ endif()
 #-------------------------------
 if(NOT CLR_CROSS_COMPONENTS_BUILD)
     set(STATIC_LIBS_ONLY 1)
-
-    if(CLR_CMAKE_TARGET_WIN32)
-        add_subdirectory(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Windows Native.Windows)
-    else()
-        add_subdirectory(${CLR_REPO_ROOT_DIR}/src/libraries/Native/Unix Native.Unix)
-    endif()
+    add_subdirectory(${CLR_SRC_NATIVE_DIR}/libs libs-native)
 endif(NOT CLR_CROSS_COMPONENTS_BUILD)
 
 #-----------------------------------------

diff --git a/src/coreclr/vm/CMakeLists.txt b/src/coreclr/vm/CMakeLists.txt
@@ -7,10 +7,8 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../interop/inc)
 include_directories(${CLR_SRC_NATIVE_DIR})
 
 # needed when zLib compression is used
-include_directories(${CLR_SRC_LIBS_NATIVE_DIR}/AnyOS/zlib)
-if(NOT CLR_CMAKE_TARGET_WIN32)
-    include_directories(${CLR_SRC_LIBS_NATIVE_DIR}/Unix/Common)
-endif()
+include_directories(${CLR_SRC_NATIVE_DIR}/libs/System.IO.Compression.Native)
+include_directories(${CLR_SRC_NATIVE_DIR}/libs/Common)
 
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)

diff --git a/src/libraries/Native/Unix/.clang-format b/src/libraries/Native/Unix/.clang-format
diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt