From cdf9b67ffad3b53eabf2b5e21c0ef95a78e4eb8a Mon Sep 17 00:00:00 2001
From: Aaron Robinson <arobins@microsoft.com>
Date: Wed, 22 Aug 2018 08:47:59 -0700
Subject: [PATCH] Moving hostpolicy to sub-directory under dll
 (dotnet/core-setup#4483)

* Moving hostpolicy to sub-directory under dll

* Remove inconsistent property

* Remove 'exe' and 'dll' directories.


Commit migrated from https://github.com/dotnet/core-setup/commit/2ef0b64810530961f492c33d37fc7509128e0a9b
---
 src/installer/corehost/build.proj                  | 22 ++++++++++------------
 src/installer/corehost/cli/CMakeLists.txt          |  5 +++--
 .../corehost/cli/{exe => }/apphost/CMakeLists.txt  |  2 +-
 .../corehost/cli/{exe => }/dotnet/CMakeLists.txt   |  2 +-
 src/installer/corehost/cli/{exe => }/exe.cmake     | 22 +++++++++++-----------
 src/installer/corehost/cli/exe/CMakeLists.txt      |  3 ---
 .../cli/{dll => hostpolicy}/CMakeLists.txt         |  0
 7 files changed, 26 insertions(+), 30 deletions(-)
 rename src/installer/corehost/cli/{exe => }/apphost/CMakeLists.txt (97%)
 rename src/installer/corehost/cli/{exe => }/dotnet/CMakeLists.txt (92%)
 rename src/installer/corehost/cli/{exe => }/exe.cmake (78%)
 delete mode 100644 src/installer/corehost/cli/exe/CMakeLists.txt
 rename src/installer/corehost/cli/{dll => hostpolicy}/CMakeLists.txt (100%)

diff --git a/src/installer/corehost/build.proj b/src/installer/corehost/build.proj
index 4ac16fb..79657b0 100644
--- a/src/installer/corehost/build.proj
+++ b/src/installer/corehost/build.proj
@@ -19,8 +19,6 @@
           DependsOnTargets="GetLatestCommitHash;GenerateVersionSourceFile">
     <PropertyGroup>
       <CMakeBuildDir>$(IntermediateOutputRootPath)corehost\cmake\</CMakeBuildDir>
-      <DotNetHostFxrPath>$(CMakeBuildDir)cli\fxr\$(DotnetHostFxrBaseName)</DotNetHostFxrPath>
-      <HostPolicyPath>$(CMakeBuildDir)cli\dll\$(HostPolicyBaseName)</HostPolicyPath>
     
       <BuildArgs>--arch $(TargetArchitecture) --apphostver $(AppHostVersion) --hostver $(HostVersion) --fxrver $(HostResolverVersion) --policyver $(HostPolicyVersion) --commithash $(LatestCommit)</BuildArgs>
       <BuildArgs Condition="'$(PortableBuild)' == 'true'">$(BuildArgs) -portable</BuildArgs>     
@@ -36,10 +34,10 @@
           WorkingDirectory="$(CMakeBuildDir)"/>
 
     <ItemGroup>
-      <CMakeOutput Include="$(CMakeBuildDir)cli\exe\dotnet\dotnet" />
-      <CMakeOutput Include="$(CMakeBuildDir)cli\exe\apphost\apphost" />
-      <CMakeOutput Include="$(HostPolicyPath)" />
-      <CMakeOutput Include="$(DotnetHostFxrPath)" />
+      <CMakeOutput Include="$(CMakeBuildDir)cli\dotnet\dotnet" />
+      <CMakeOutput Include="$(CMakeBuildDir)cli\apphost\apphost" />
+      <CMakeOutput Include="$(CMakeBuildDir)cli\hostpolicy\$(HostPolicyBaseName)" />
+      <CMakeOutput Include="$(CMakeBuildDir)cli\fxr\$(DotnetHostFxrBaseName)" />
     </ItemGroup>
     <ItemGroup Condition="'$(StripSymbols)' == 'true'">
       <CMakeOutput Include="@(CmakeOutput -> '%(Identity)$(SymbolFileExtension)')" />
@@ -80,12 +78,12 @@
     <Exec Command="$(MSBuildProjectDirectory)\build.cmd $(BuildArgs)$(CustomNativeToolsetDir)" />
 
     <ItemGroup>
-      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\exe\dotnet\$(ConfigurationGroup)\dotnet.exe" />
-      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\exe\dotnet\$(ConfigurationGroup)\dotnet.pdb" />
-      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\exe\apphost\$(ConfigurationGroup)\apphost.exe" />
-      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\exe\apphost\$(ConfigurationGroup)\apphost.pdb" />
-      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\dll\$(ConfigurationGroup)\$(HostPolicyBaseName)" />
-      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\dll\$(ConfigurationGroup)\hostpolicy.pdb" />
+      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\dotnet\$(ConfigurationGroup)\dotnet.exe" />
+      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\dotnet\$(ConfigurationGroup)\dotnet.pdb" />
+      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\apphost\$(ConfigurationGroup)\apphost.exe" />
+      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\apphost\$(ConfigurationGroup)\apphost.pdb" />
+      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\hostpolicy\$(ConfigurationGroup)\$(HostPolicyBaseName)" />
+      <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\hostpolicy\$(ConfigurationGroup)\hostpolicy.pdb" />
       <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\fxr\$(ConfigurationGroup)\$(DotnetHostFxrBaseName)" />
       <CMakeOutput Include="$(IntermediateOutputRootPath)corehost\cli\fxr\$(ConfigurationGroup)\hostfxr.pdb" />      
     </ItemGroup>
diff --git a/src/installer/corehost/cli/CMakeLists.txt b/src/installer/corehost/cli/CMakeLists.txt
index f6ae63f..d32baf5 100644
--- a/src/installer/corehost/cli/CMakeLists.txt
+++ b/src/installer/corehost/cli/CMakeLists.txt
@@ -1,3 +1,4 @@
-add_subdirectory(exe)
+add_subdirectory(apphost)
+add_subdirectory(dotnet)
 add_subdirectory(fxr)
-add_subdirectory(dll)
+add_subdirectory(hostpolicy)
diff --git a/src/installer/corehost/cli/exe/apphost/CMakeLists.txt b/src/installer/corehost/cli/apphost/CMakeLists.txt
similarity index 97%
rename from src/installer/corehost/cli/exe/apphost/CMakeLists.txt
rename to src/installer/corehost/cli/apphost/CMakeLists.txt
index 990592a..cc610cd 100644
--- a/src/installer/corehost/cli/exe/apphost/CMakeLists.txt
+++ b/src/installer/corehost/cli/apphost/CMakeLists.txt
@@ -18,7 +18,7 @@ endif()
 set(SKIP_VERSIONING 1)
 
 set(SOURCES
-    ../../fxr/fx_ver.cpp
+    ../fxr/fx_ver.cpp
 )
 
 include(../exe.cmake)
diff --git a/src/installer/corehost/cli/exe/dotnet/CMakeLists.txt b/src/installer/corehost/cli/dotnet/CMakeLists.txt
similarity index 92%
rename from src/installer/corehost/cli/exe/dotnet/CMakeLists.txt
rename to src/installer/corehost/cli/dotnet/CMakeLists.txt
index b8b0763..5b3b392 100644
--- a/src/installer/corehost/cli/exe/dotnet/CMakeLists.txt
+++ b/src/installer/corehost/cli/dotnet/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 2.6)
 project(dotnet)
 set(DOTNET_HOST_EXE_NAME "dotnet")
 set(SOURCES 
-    ../../fxr/fx_ver.cpp)
+    ../fxr/fx_ver.cpp)
 include(../exe.cmake)
 
 install_library_and_symbols (dotnet)
diff --git a/src/installer/corehost/cli/exe/exe.cmake b/src/installer/corehost/cli/exe.cmake
similarity index 78%
rename from src/installer/corehost/cli/exe/exe.cmake
rename to src/installer/corehost/cli/exe.cmake
index 7ae6a2c..4ef768c 100644
--- a/src/installer/corehost/cli/exe/exe.cmake
+++ b/src/installer/corehost/cli/exe.cmake
@@ -11,36 +11,36 @@ else()
     add_compile_options(-fvisibility=hidden)
 endif()
 
-include(../../setup.cmake)
+include(../setup.cmake)
 
 # Include directories
 if(WIN32)
     include_directories("${CLI_CMAKE_RESOURCE_DIR}/${DOTNET_HOST_EXE_NAME}")
 endif()
-include_directories(../../../)
-include_directories(../../../common)
 include_directories(../../)
-include_directories(../../fxr)
+include_directories(../../common)
+include_directories(../)
+include_directories(../fxr)
 
 # CMake does not recommend using globbing since it messes with the freshness checks
 list(APPEND SOURCES
-    ../../../corehost.cpp
-    ../../../common/trace.cpp
-    ../../../common/utils.cpp)
+    ../../corehost.cpp
+    ../../common/trace.cpp
+    ../../common/utils.cpp)
 
 if(WIN32)
     list(APPEND SOURCES
-        ../../../common/pal.windows.cpp
-        ../../../common/longfile.windows.cpp)
+        ../../common/pal.windows.cpp
+        ../../common/longfile.windows.cpp)
 else()
     list(APPEND SOURCES
-        ../../../common/pal.unix.cpp
+        ../../common/pal.unix.cpp
         ${VERSION_FILE_PATH})
 endif()
 
 set(RESOURCES)
 if(WIN32 AND NOT SKIP_VERSIONING)
-    list(APPEND RESOURCES ../../native.rc)
+    list(APPEND RESOURCES ../native.rc)
 endif()
 
 add_executable(${DOTNET_HOST_EXE_NAME} ${SOURCES} ${RESOURCES})
diff --git a/src/installer/corehost/cli/exe/CMakeLists.txt b/src/installer/corehost/cli/exe/CMakeLists.txt
deleted file mode 100644
index 4facc1f..0000000
--- a/src/installer/corehost/cli/exe/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-cmake_minimum_required (VERSION 2.6)
-add_subdirectory(dotnet)
-add_subdirectory(apphost)
diff --git a/src/installer/corehost/cli/dll/CMakeLists.txt b/src/installer/corehost/cli/hostpolicy/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/dll/CMakeLists.txt
rename to src/installer/corehost/cli/hostpolicy/CMakeLists.txt
-- 
2.7.4