Fix build for new files locations.

Author: viewizard

CMakeLists.txt

@@ -44,7 +44,7 @@ if (NOT "${DOTNET_DIR}" STREQUAL "")
 endif()
 
 add_subdirectory(third_party/linenoise-ng)
-add_subdirectory(src/debug/netcoredbg)
+add_subdirectory(src)
 
 include(getgitrevisiondescription.cmake)
 
@@ -88,5 +88,5 @@ get_git_subject_date_revision_dir(BUILD_CORECLR_GIT_SUBJECT BUILD_CORECLR_GIT_DA
 execute_process(COMMAND date OUTPUT_VARIABLE BUILD_NETCOREDBG_DATE
   ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/debug/netcoredbg/buildinfo.cpp.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/src/debug/netcoredbg/buildinfo.cpp" @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/buildinfo.cpp.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/src/buildinfo.cpp" @ONLY)

packaging/netcoredbg.spec

@@ -99,14 +99,14 @@ cmake ../netcoredbg \
 
 make %{?jobs:-j%jobs} %{?verbose:VERBOSE=1}
 
-%dotnet_build -s ../netcoredbg/packaging/pkgs ../netcoredbg/src/debug/netcoredbg
+%dotnet_build -s ../netcoredbg/packaging/pkgs ../netcoredbg/src/managed
 
 %install
 cd build
 %make_install
 mkdir -p %{buildroot}%{sdk_install_prefix}
 mv %{buildroot}%{install_prefix}/netcoredbg %{buildroot}%{sdk_install_prefix}
-install -p -m 644 ../netcoredbg/src/debug/netcoredbg/bin/*/*/SymbolReader.dll %{buildroot}%{sdk_install_prefix}
+install -p -m 644 ../netcoredbg/src/managed/bin/*/*/ManagedPart.dll %{buildroot}%{sdk_install_prefix}
 
 export CSVER=$(ls /nuget/microsoft.codeanalysis.common.*.nupkg | sort -n | tail -1 | cut -d "." -f4-6)
 export SYSCODEPAGES=$(ls /nuget/system.text.encoding.codepages.4.*.nupkg | sort -n | tail -1)

src/CMakeLists.txt

@@ -73,31 +73,31 @@ add_custom_command(
 )
 
 set(netcoredbg_SRC
-    main.cpp
-    manageddebugger.cpp
-    symbolreader.cpp
-    platform.cpp
-    protocol.cpp
-    breakpoints.cpp
-    modules.cpp
-    variables.cpp
-    typeprinter.cpp
-    valuewalk.cpp
-    valueprint.cpp
-    miprotocol.cpp
-    vscodeprotocol.cpp
-    frames.cpp
-    jmc.cpp
-    cputil.cpp
-    expr.cpp
-    valuewrite.cpp
-    logger.cpp
+    debugger/breakpoints.cpp
+    debugger/expr.cpp
+    debugger/frames.cpp
+    debugger/manageddebugger.cpp
+    debugger/valueprint.cpp
+    debugger/valuewalk.cpp
+    debugger/valuewrite.cpp
+    debugger/variables.cpp
+    managed/interop.cpp
+    metadata/jmc.cpp
+    metadata/modules.cpp
+    metadata/typeprinter.cpp
+    protocols/cliprotocol.cpp
+    protocols/iprotocol.cpp
+    protocols/miprotocol.cpp
+    protocols/protocol.cpp
+    protocols/tokenizer.cpp
+    protocols/vscodeprotocol.cpp
+    utils/utf.cpp
+    utils/logger.cpp
     buildinfo.cpp
-    cliprotocol.cpp
-    iprotocol.cpp
-    tokenizer.cpp
     errormessage.cpp
-)
+    main.cpp
+    platform.cpp
+    )
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
@@ -128,24 +128,24 @@ if (DBGSHIM_LOCATION)
     install(FILES ${DBGSHIM_LOCATION} DESTINATION ${CMAKE_INSTALL_PREFIX})
 endif()
 
-# Build managed part of the debugger (SymbolReader.dll)
+# Build managed part of the debugger (ManagedPart.dll)
 
 if (BUILD_MANAGED)
-    set(SYMBOLREADER_PROJECT ${CMAKE_CURRENT_SOURCE_DIR}/SymbolReader.csproj)
-    set(SYMBOLREADER_DLL_NAME SymbolReader.dll)
-    set(DOTNET_BUILD_RESULT ${CMAKE_CURRENT_BINARY_DIR}/${SYMBOLREADER_DLL_NAME})
+    set(MANAGEDPART_PROJECT ${CMAKE_CURRENT_SOURCE_DIR}/managed/ManagedPart.csproj)
+    set(MANAGEDPART_DLL_NAME ManagedPart.dll)
+    set(DOTNET_BUILD_RESULT ${CMAKE_CURRENT_BINARY_DIR}/${MANAGEDPART_DLL_NAME})
 
     find_program(DOTNETCLI dotnet PATHS "${DOTNET_DIR}" ENV PATH NO_DEFAULT_PATH)
 
     add_custom_command(OUTPUT ${DOTNET_BUILD_RESULT}
-      COMMAND ${DOTNETCLI} publish ${SYMBOLREADER_PROJECT} -o ${CMAKE_CURRENT_BINARY_DIR} /p:BaseIntermediateOutputPath=${CMAKE_CURRENT_BINARY_DIR}/obj/
+      COMMAND ${DOTNETCLI} publish ${MANAGEDPART_PROJECT} -o ${CMAKE_CURRENT_BINARY_DIR} /p:BaseIntermediateOutputPath=${CMAKE_CURRENT_BINARY_DIR}/obj/
       WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
-      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/SymbolReader.cs" "${SYMBOLREADER_PROJECT}"
-      COMMENT "Compiling ${SYMBOLREADER_DLL_NAME}"
+      DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/managed/SymbolReader.cs" "${MANAGEDPART_PROJECT}"
+      COMMENT "Compiling ${MANAGEDPART_DLL_NAME}"
       VERBATIM
     )
 
-    add_custom_target(symbolreader_dll ALL DEPENDS ${DOTNET_BUILD_RESULT})
+    add_custom_target(managedpart_dll ALL DEPENDS ${DOTNET_BUILD_RESULT})
 
     # Copy dlls
     set(ROSLYN_DLLS

src/debugger/breakpoints.cpp

@@ -2,16 +2,16 @@
 // Distributed under the MIT License.
 // See the LICENSE file in the project root for more information.
 
-#include "manageddebugger.h"
+#include "debugger/manageddebugger.h"
 
 #include <mutex>
 #include <unordered_set>
 #include <fstream>
 #include <algorithm>
-#include "typeprinter.h"
-#include "logger.h"
-#include "cputil.h"
-#include "symbolreader.h"
+#include "metadata/typeprinter.h"
+#include "utils/logger.h"
+#include "utils/utf.h"
+#include "managed/interop.h"
 
 using std::string;
 

src/debugger/debugger.h

@@ -15,7 +15,7 @@
 #include <windows.h>
 #endif
 
-#include "protocol.h"
+#include "protocols/protocol.h"
 
 class Debugger
 {

src/debugger/expr.cpp

@@ -2,13 +2,13 @@
 // Distributed under the MIT License.
 // See the LICENSE file in the project root for more information.
 
-#include "manageddebugger.h"
+#include "debugger/manageddebugger.h"
 
 #include <vector>
 #include <list>
 
-#include "cputil.h"
-#include "typeprinter.h"
+#include "utils/utf.h"
+#include "metadata/typeprinter.h"
 #include "valueprint.h"
 
 

src/debugger/frames.cpp

@@ -2,15 +2,15 @@
 // Distributed under the MIT License.
 // See the LICENSE file in the project root for more information.
 
-#include "frames.h"
+#include "debugger/frames.h"
 
 #include <sstream>
 #include <algorithm>
 
-#include "typeprinter.h"
+#include "metadata/typeprinter.h"
 #include "platform.h"
-#include "manageddebugger.h"
-#include "logger.h"
+#include "debugger/manageddebugger.h"
+#include "utils/logger.h"
 
 
 HRESULT GetThreadsState(ICorDebugController *controller, std::vector<Thread> &threads)

src/debugger/frames.h

@@ -11,7 +11,7 @@
 #pragma GCC diagnostic pop
 
 #include <vector>
-#include "protocol.h"
+#include "protocols/protocol.h"
 
 struct Thread;
 

src/debugger/manageddebugger.cpp

@@ -13,15 +13,15 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include "manageddebugger.h"
+#include "debugger/manageddebugger.h"
 
 #include "valueprint.h"
-#include "symbolreader.h"
-#include "cputil.h"
+#include "managed/interop.h"
+#include "utils/utf.h"
 #include "platform.h"
-#include "typeprinter.h"
-#include "frames.h"
-#include "logger.h"
+#include "metadata/typeprinter.h"
+#include "debugger/frames.h"
+#include "utils/logger.h"
 
 using std::string;
 using std::vector;

src/debugger/manageddebugger.h

@@ -3,9 +3,9 @@
 // See the LICENSE file in the project root for more information.
 #pragma once
 
-#include "modules.h"
-#include "debugger.h"
-#include "protocol.h"
+#include "metadata/modules.h"
+#include "debugger/debugger.h"
+#include "protocols/protocol.h"
 
 #include <unordered_map>
 #include <unordered_set>