Change location of some source files (dotnet#1376)

* Move coreclr/src/coreclr/hosts to one level up * Move native commons to :/eng/native
shangte · Jan 8, 2020 · f1dd1d3 · f1dd1d3
1 parent 9de4006
commit f1dd1d3
Show file tree

Hide file tree

Showing 43 changed files with 22 additions and 25 deletions.
diff --git a/docs/design/features/native-hosting.md b/docs/design/features/native-hosting.md
@@ -18,10 +18,10 @@ App (native or .NET Core both) which needs to use some of the other services pro
 
 ## Existing support
 * **C-style ABI in `coreclr`**
-`coreclr` exposes ABI to host the .NET Core runtime and run managed code already using C-style APIs. See this [header file](https://github.com/dotnet/coreclr/blob/master/src/coreclr/hosts/inc/coreclrhost.h) for the exposed functions.
+`coreclr` exposes ABI to host the .NET Core runtime and run managed code already using C-style APIs. See this [header file](https://github.com/dotnet/runtime/blob/master/src/coreclr/src/hosts/inc/coreclrhost.h) for the exposed functions.
 This API requires the native host to locate the runtime and to fully specify all startup parameters for the runtime. There's no inherent interoperability between these APIs and the .NET Core SDK.
 * **COM-style ABI in `coreclr`**
-`coreclr` exposes COM-style ABI to host the .NET Core runtime and perform a wide range of operations on it. See this [header file](https://github.com/dotnet/coreclr/blob/master/src/pal/prebuilt/inc/mscoree.h) for more details.
+`coreclr` exposes COM-style ABI to host the .NET Core runtime and perform a wide range of operations on it. See this [header file](https://github.com/dotnet/runtime/blob/master/src/coreclr/src/pal/prebuilt/inc/mscoree.h) for more details.
 Similarly to the C-style ABI the COM-style ABI also requires the native host to locate the runtime and to fully specify all startup parameters.
 There's no inherent interoperability between these APIs and the .NET Core SDK.
 The COM-style ABI is deprecated and should not be used going forward.
@@ -377,7 +377,7 @@ At the same time it gives the native app (`comhost` in this case) the ability to
 
 ### API usage
 The `hostfxr` exports are defined in the [hostfxr.h](https://github.com/dotnet/core-setup/blob/master/src/corehost/cli/hostfxr.h) header file.
-The runtime helper and method signatures for loading managed components are defined in [coreclr_delegates.h](https://github.com/dotnet/core-setup/blob/master/src/corehost/cli/coreclr_delegates.h) header file.
+The runtime helper and method signatures for loading managed components are defined in [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/coreclr_delegates.h) header file.
 
 Currently we don't plan to ship these files, but it's possible to take them from the repo and use it.
 

diff --git a/eng/common/configuretools.cmake → eng/native/configuretools.cmake b/eng/common/configuretools.cmake → eng/native/configuretools.cmake
diff --git a/eng/common/cross/gen-buildsys.sh → eng/native/gen-buildsys.sh b/eng/common/cross/gen-buildsys.sh → eng/native/gen-buildsys.sh
@@ -164,7 +164,7 @@ if [ "$CROSSCOMPILE" == "1" ]; then
     fi
     export TARGET_BUILD_ARCH=$build_arch
     cmake_extra_defines="$cmake_extra_defines -C $tryrun_dir/tryrun.cmake"
-    cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$scriptroot/toolchain.cmake"
+    cmake_extra_defines="$cmake_extra_defines -DCMAKE_TOOLCHAIN_FILE=$scriptroot/../common/cross/toolchain.cmake"
 fi
 
 cmake_command=$(command -v cmake)

diff --git a/src/coreclr/CMakeLists.txt b/src/coreclr/CMakeLists.txt
@@ -115,7 +115,7 @@ endif(WIN32)
 # Configure compiler settings for environment
 #----------------------------------------------------
 include(configurecompiler.cmake)
-include(${CLR_COMMON_DIR}/configuretools.cmake)
+include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake)
 
 #----------------------------------------------------
 # Cross target Component build specific configuration
@@ -136,7 +136,7 @@ include(pgosupport.cmake)
 #-----------------------------------------
 if(CLR_CMAKE_PLATFORM_UNIX)
     add_subdirectory(src/pal)
-    add_subdirectory(src/coreclr/hosts)
+    add_subdirectory(src/hosts)
 endif(CLR_CMAKE_PLATFORM_UNIX)
 
 # Add this subdir. We install the headers for the jit.

diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
@@ -235,7 +235,7 @@ if not defined VSINSTALLDIR (
 )
 if not exist "%VSINSTALLDIR%DIA SDK" goto NoDIA
 
-set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" "-DCLR_COMMON_DIR=%__RepoRootDir%/eng/common"
+set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native"
 call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectFilesDir%" "%__NativeTestIntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
 
 if not !errorlevel! == 0 (

diff --git a/src/coreclr/build-test.sh b/src/coreclr/build-test.sh
@@ -509,9 +509,9 @@ build_native_projects()
             extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
         fi
 
-        commonDir="$__RepoRootDir/eng/common"
-        __cmakeargs="$__cmakeargs -DCLR_COMMON_DIR=\"$commonDir\""
-        nextCommand="\"$commonDir/cross/gen-buildsys.sh\" \"$__TestDir\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\" $__BuildType $generator $extraCmakeArguments $__cmakeargs"
+        engNativeDir="$__RepoRootDir/eng/native"
+        __cmakeargs="$__cmakeargs -DCLR_ENG_NATIVE_DIR=\"$engNativeDir\""
+        nextCommand="\"$engNativeDir/gen-buildsys.sh\" \"$__TestDir\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\" $__BuildType $generator $extraCmakeArguments $__cmakeargs"
         echo "Invoking $nextCommand"
         eval $nextCommand
 

diff --git a/src/coreclr/build.cmd b/src/coreclr/build.cmd
@@ -484,7 +484,7 @@ if %__BuildCrossArchNative% EQU 1 (
 
     set __CMakeBinDir=%__CrossComponentBinDir%
     set "__CMakeBinDir=!__CMakeBinDir:\=/!"
-    set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCMAKE_SYSTEM_VERSION=10.0" "-DCLR_COMMON_DIR=%__RepoRootDir%/eng/common"
+    set __ExtraCmakeArgs="-DCLR_CROSS_COMPONENTS_BUILD=1" "-DCLR_CMAKE_TARGET_ARCH=%__BuildArch%" "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCMAKE_SYSTEM_VERSION=10.0" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native"
     call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectDir%" "%__CrossCompIntermediatesDir%" %__VSVersion% %__CrossArch% !__ExtraCmakeArgs!
 
     if not !errorlevel! == 0 (
@@ -562,7 +562,7 @@ if %__BuildNative% EQU 1 (
 
     echo %__MsgPrefix%Regenerating the Visual Studio solution
 
-    set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" !___CrossBuildDefine! "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCLR_COMMON_DIR=%__RepoRootDir%/eng/common"
+    set __ExtraCmakeArgs="-DCMAKE_SYSTEM_VERSION=10.0" !___CrossBuildDefine! "-DCLR_CMAKE_PGO_INSTRUMENT=%__PgoInstrument%" "-DCLR_CMAKE_OPTDATA_PATH=%__PgoOptDataPath%" "-DCLR_CMAKE_PGO_OPTIMIZE=%__PgoOptimize%" "-DCLR_ENG_NATIVE_DIR=%__RepoRootDir%/eng/native"
     call "%__SourceDir%\pal\tools\gen-buildsys.cmd" "%__ProjectDir%" "%__IntermediatesDir%" %__VSVersion% %__BuildArch% !__ExtraCmakeArgs!
     if not !errorlevel! == 0 (
         echo %__ErrMsgPrefix%%__MsgPrefix%Error: failed to generate native component build project!

diff --git a/src/coreclr/build.sh b/src/coreclr/build.sh
@@ -199,9 +199,9 @@ build_native()
             extraCmakeArguments="$extraCmakeArguments -DCLR_CMAKE_ENABLE_CODE_COVERAGE=1"
         fi
 
-        commonDir="$__RepoRootDir/eng/common"
-        __cmakeargs="$__cmakeargs -DCLR_COMMON_DIR=\"$commonDir\""
-        nextCommand="\"$commonDir/cross/gen-buildsys.sh\" \"$__ProjectRoot\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\" $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
+        engNativeDir="$__RepoRootDir/eng/native"
+        __cmakeargs="$__cmakeargs -DCLR_ENG_NATIVE_DIR=\"$engNativeDir\""
+        nextCommand="\"$engNativeDir/gen-buildsys.sh\" \"$__ProjectRoot\" \"$__ProjectRoot\" \"$intermediatesForBuild\" $platformArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\" $__BuildType $generator $scan_build $extraCmakeArguments $__cmakeargs"
         echo "Invoking $nextCommand"
         eval $nextCommand
 

diff --git a/src/coreclr/src/CMakeLists.txt b/src/coreclr/src/CMakeLists.txt
@@ -60,7 +60,6 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
 
 add_subdirectory(utilcode)
 add_subdirectory(gcinfo)
-add_subdirectory(coreclr)
 add_subdirectory(jit)
 add_subdirectory(vm)
 add_subdirectory(md)
@@ -77,4 +76,6 @@ add_subdirectory(ilasm)
 
 if(CLR_CMAKE_PLATFORM_UNIX)
     add_subdirectory(palrt)
+elseif(WIN32)
+    add_subdirectory(hosts)
 endif(CLR_CMAKE_PLATFORM_UNIX)
diff --git a/src/coreclr/src/coreclr/CMakeLists.txt b/src/coreclr/src/coreclr/CMakeLists.txt
diff --git a/src/coreclr/src/coreclr/hosts/CMakeLists.txt → src/coreclr/src/hosts/CMakeLists.txt b/src/coreclr/src/coreclr/hosts/CMakeLists.txt → src/coreclr/src/hosts/CMakeLists.txt
diff --git a/src/coreclr/src/coreclr/applydefines.pl → src/coreclr/src/hosts/applydefines.pl b/src/coreclr/src/coreclr/applydefines.pl → src/coreclr/src/hosts/applydefines.pl
diff --git a/.../coreclr/hosts/coreconsole/CMakeLists.txt → ...eclr/src/hosts/coreconsole/CMakeLists.txt b/.../coreclr/hosts/coreconsole/CMakeLists.txt → ...eclr/src/hosts/coreconsole/CMakeLists.txt
diff --git a/...coreclr/hosts/coreconsole/coreconsole.cpp → ...clr/src/hosts/coreconsole/coreconsole.cpp b/...coreclr/hosts/coreconsole/coreconsole.cpp → ...clr/src/hosts/coreconsole/coreconsole.cpp
diff --git a/.../src/coreclr/hosts/coreconsole/logger.cpp → src/coreclr/src/hosts/coreconsole/logger.cpp b/.../src/coreclr/hosts/coreconsole/logger.cpp → src/coreclr/src/hosts/coreconsole/logger.cpp
diff --git a/...lr/src/coreclr/hosts/coreconsole/logger.h → src/coreclr/src/hosts/coreconsole/logger.h b/...lr/src/coreclr/hosts/coreconsole/logger.h → src/coreclr/src/hosts/coreconsole/logger.h
diff --git a/...r/src/coreclr/hosts/coreconsole/native.rc → src/coreclr/src/hosts/coreconsole/native.rc b/...r/src/coreclr/hosts/coreconsole/native.rc → src/coreclr/src/hosts/coreconsole/native.rc
diff --git a/.../src/coreclr/hosts/corerun/CMakeLists.txt → src/coreclr/src/hosts/corerun/CMakeLists.txt b/.../src/coreclr/hosts/corerun/CMakeLists.txt → src/coreclr/src/hosts/corerun/CMakeLists.txt
diff --git a/...clr/src/coreclr/hosts/corerun/corerun.cpp → src/coreclr/src/hosts/corerun/corerun.cpp b/...clr/src/coreclr/hosts/corerun/corerun.cpp → src/coreclr/src/hosts/corerun/corerun.cpp
diff --git a/...eclr/src/coreclr/hosts/corerun/logger.cpp → src/coreclr/src/hosts/corerun/logger.cpp b/...eclr/src/coreclr/hosts/corerun/logger.cpp → src/coreclr/src/hosts/corerun/logger.cpp
diff --git a/...oreclr/src/coreclr/hosts/corerun/logger.h → src/coreclr/src/hosts/corerun/logger.h b/...oreclr/src/coreclr/hosts/corerun/logger.h → src/coreclr/src/hosts/corerun/logger.h
diff --git a/...reclr/src/coreclr/hosts/corerun/native.rc → src/coreclr/src/hosts/corerun/native.rc b/...reclr/src/coreclr/hosts/corerun/native.rc → src/coreclr/src/hosts/corerun/native.rc
diff --git a/...oreclr/src/coreclr/hosts/corerun/test.txt → src/coreclr/src/hosts/corerun/test.txt b/...oreclr/src/coreclr/hosts/corerun/test.txt → src/coreclr/src/hosts/corerun/test.txt
diff --git a/...src/coreclr/hosts/coreshim/CMakeLists.txt → ...coreclr/src/hosts/coreshim/CMakeLists.txt b/...src/coreclr/hosts/coreshim/CMakeLists.txt → ...coreclr/src/hosts/coreshim/CMakeLists.txt
diff --git a/.../coreclr/hosts/coreshim/ComActivation.cpp → ...eclr/src/hosts/coreshim/ComActivation.cpp b/.../coreclr/hosts/coreshim/ComActivation.cpp → ...eclr/src/hosts/coreshim/ComActivation.cpp
diff --git a/...r/src/coreclr/hosts/coreshim/CoreShim.cpp → src/coreclr/src/hosts/coreshim/CoreShim.cpp b/...r/src/coreclr/hosts/coreshim/CoreShim.cpp → src/coreclr/src/hosts/coreshim/CoreShim.cpp
diff --git a/...clr/src/coreclr/hosts/coreshim/CoreShim.h → src/coreclr/src/hosts/coreshim/CoreShim.h b/...clr/src/coreclr/hosts/coreshim/CoreShim.h → src/coreclr/src/hosts/coreshim/CoreShim.h
diff --git a/...lr/src/coreclr/hosts/coreshim/Exports.def → src/coreclr/src/hosts/coreshim/Exports.def b/...lr/src/coreclr/hosts/coreshim/Exports.def → src/coreclr/src/hosts/coreshim/Exports.def
diff --git a/...reclr/src/coreclr/hosts/inc/coreclrhost.h → src/coreclr/src/hosts/inc/coreclrhost.h b/...reclr/src/coreclr/hosts/inc/coreclrhost.h → src/coreclr/src/hosts/inc/coreclrhost.h
diff --git a/...coreclr/hosts/osxbundlerun/CMakeLists.txt → ...clr/src/hosts/osxbundlerun/CMakeLists.txt b/...coreclr/hosts/osxbundlerun/CMakeLists.txt → ...clr/src/hosts/osxbundlerun/CMakeLists.txt
diff --git a/...reclr/hosts/osxbundlerun/osxbundlerun.cpp → ...r/src/hosts/osxbundlerun/osxbundlerun.cpp b/...reclr/hosts/osxbundlerun/osxbundlerun.cpp → ...r/src/hosts/osxbundlerun/osxbundlerun.cpp
diff --git a/...eclr/hosts/unixcoreconsole/CMakeLists.txt → .../src/hosts/unixcoreconsole/CMakeLists.txt b/...eclr/hosts/unixcoreconsole/CMakeLists.txt → .../src/hosts/unixcoreconsole/CMakeLists.txt
diff --git a/...clr/hosts/unixcoreconsole/coreconsole.cpp → ...src/hosts/unixcoreconsole/coreconsole.cpp b/...clr/hosts/unixcoreconsole/coreconsole.cpp → ...src/hosts/unixcoreconsole/coreconsole.cpp
diff --git a/.../coreclr/hosts/unixcorerun/CMakeLists.txt → ...eclr/src/hosts/unixcorerun/CMakeLists.txt b/.../coreclr/hosts/unixcorerun/CMakeLists.txt → ...eclr/src/hosts/unixcorerun/CMakeLists.txt
diff --git a/...src/coreclr/hosts/unixcorerun/corerun.cpp → ...coreclr/src/hosts/unixcorerun/corerun.cpp b/...src/coreclr/hosts/unixcorerun/corerun.cpp → ...coreclr/src/hosts/unixcorerun/corerun.cpp
diff --git a/...lr/hosts/unixcoreruncommon/CMakeLists.txt → ...rc/hosts/unixcoreruncommon/CMakeLists.txt b/...lr/hosts/unixcoreruncommon/CMakeLists.txt → ...rc/hosts/unixcoreruncommon/CMakeLists.txt
diff --git a/...reclr/hosts/unixcoreruncommon/config.h.in → ...r/src/hosts/unixcoreruncommon/config.h.in b/...reclr/hosts/unixcoreruncommon/config.h.in → ...r/src/hosts/unixcoreruncommon/config.h.in
diff --git a/...r/hosts/unixcoreruncommon/configure.cmake → ...c/hosts/unixcoreruncommon/configure.cmake b/...r/hosts/unixcoreruncommon/configure.cmake → ...c/hosts/unixcoreruncommon/configure.cmake
diff --git a/...hosts/unixcoreruncommon/coreruncommon.cpp → ...hosts/unixcoreruncommon/coreruncommon.cpp b/...hosts/unixcoreruncommon/coreruncommon.cpp → ...hosts/unixcoreruncommon/coreruncommon.cpp
diff --git a/...r/hosts/unixcoreruncommon/coreruncommon.h → ...c/hosts/unixcoreruncommon/coreruncommon.h b/...r/hosts/unixcoreruncommon/coreruncommon.h → ...c/hosts/unixcoreruncommon/coreruncommon.h
diff --git a/src/coreclr/tests/CMakeLists.txt b/src/coreclr/tests/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 
 # Include global configure settings
 include(${CMAKE_CURRENT_SOURCE_DIR}/../configurecompiler.cmake)
-include(${CLR_COMMON_DIR}/configuretools.cmake)
+include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake)
 # Compile options
 
 if (WIN32)

diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt
@@ -281,7 +281,7 @@ function(install_library_and_symbols targetName)
 endfunction()
 
 include(configure.cmake)
-include(${CLR_COMMON_DIR}/configuretools.cmake)
+include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake)
 
 add_subdirectory(System.IO.Compression.Native)
 

diff --git a/src/libraries/Native/build-native.sh b/src/libraries/Native/build-native.sh
@@ -129,9 +129,9 @@ build_native()
     fi
 
     # Regenerate the CMake solution
-    commonDir="$__rootRepo/eng/common"
-    __CMakeExtraArgs="$__CMakeExtraArgs -DCLR_COMMON_DIR=\"$commonDir\""
-    nextCommand="\"$commonDir/cross/gen-buildsys.sh\" \"$__nativeroot\" \"$__nativeroot\" \"$__IntermediatesDir\" $__BuildArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\"  $__BuildType $__CMakeArgs $__CMakeExtraArgs"
+    engNativeDir="$__rootRepo/eng/native"
+    __CMakeExtraArgs="$__CMakeExtraArgs -DCLR_ENG_NATIVE_DIR=\"$engNativeDir\""
+    nextCommand="\"$engNativeDir/gen-buildsys.sh\" \"$__nativeroot\" \"$__nativeroot\" \"$__IntermediatesDir\" $__BuildArch $__Compiler \"$__CompilerMajorVersion\" \"$__CompilerMinorVersion\"  $__BuildType $__CMakeArgs $__CMakeExtraArgs"
     echo "Invoking $nextCommand"
     eval "$nextCommand"