Author: jyknight Date: Tue May 22 15:53:50 2018 New Revision: 333035 URL: http://llvm.org/viewvc/llvm-project?rev=333035&view=rev Log: Normalize some lldb #include statements.
Most non-local includes of header files living under lldb/sources/ were specified with the full path starting after sources/. However, in a few instances, other sub-directories were added to include paths, or Normalize those few instances to follow the style used by the rest of the codebase, to make it easier to understand. Modified: lldb/trunk/source/API/SBTarget.cpp lldb/trunk/source/Interpreter/CommandInterpreter.cpp lldb/trunk/source/Plugins/JITLoader/GDB/CMakeLists.txt lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h lldb/trunk/source/Plugins/Process/FreeBSD/CMakeLists.txt lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIX.h lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp lldb/trunk/source/Plugins/Process/Linux/CMakeLists.txt lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h lldb/trunk/source/Plugins/Process/NetBSD/CMakeLists.txt lldb/trunk/source/Plugins/Process/POSIX/CMakeLists.txt lldb/trunk/source/Plugins/Process/Utility/CMakeLists.txt lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp lldb/trunk/source/Plugins/Process/elf-core/CMakeLists.txt lldb/trunk/source/Plugins/Process/mach-core/CMakeLists.txt lldb/trunk/source/Plugins/Process/mach-core/ProcessMachCore.cpp lldb/trunk/source/Plugins/Process/minidump/CMakeLists.txt lldb/trunk/source/Target/CMakeLists.txt Modified: lldb/trunk/source/API/SBTarget.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/API/SBTarget.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/API/SBTarget.cpp (original) +++ lldb/trunk/source/API/SBTarget.cpp Tue May 22 15:53:50 2018 @@ -64,7 +64,7 @@ #include "lldb/Utility/Log.h" #include "lldb/Utility/RegularExpression.h" -#include "../source/Commands/CommandObjectBreakpoint.h" +#include "Commands/CommandObjectBreakpoint.h" #include "lldb/Interpreter/CommandReturnObject.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/Regex.h" Modified: lldb/trunk/source/Interpreter/CommandInterpreter.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Interpreter/CommandInterpreter.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Interpreter/CommandInterpreter.cpp (original) +++ lldb/trunk/source/Interpreter/CommandInterpreter.cpp Tue May 22 15:53:50 2018 @@ -14,31 +14,31 @@ #include "CommandObjectScript.h" #include "lldb/Interpreter/CommandObjectRegexCommand.h" -#include "../Commands/CommandObjectApropos.h" -#include "../Commands/CommandObjectBreakpoint.h" -#include "../Commands/CommandObjectBugreport.h" -#include "../Commands/CommandObjectCommands.h" -#include "../Commands/CommandObjectDisassemble.h" -#include "../Commands/CommandObjectExpression.h" -#include "../Commands/CommandObjectFrame.h" -#include "../Commands/CommandObjectGUI.h" -#include "../Commands/CommandObjectHelp.h" -#include "../Commands/CommandObjectLanguage.h" -#include "../Commands/CommandObjectLog.h" -#include "../Commands/CommandObjectMemory.h" -#include "../Commands/CommandObjectPlatform.h" -#include "../Commands/CommandObjectPlugin.h" -#include "../Commands/CommandObjectProcess.h" -#include "../Commands/CommandObjectQuit.h" -#include "../Commands/CommandObjectRegister.h" -#include "../Commands/CommandObjectSettings.h" -#include "../Commands/CommandObjectSource.h" -#include "../Commands/CommandObjectStats.h" -#include "../Commands/CommandObjectTarget.h" -#include "../Commands/CommandObjectThread.h" -#include "../Commands/CommandObjectType.h" -#include "../Commands/CommandObjectVersion.h" -#include "../Commands/CommandObjectWatchpoint.h" +#include "Commands/CommandObjectApropos.h" +#include "Commands/CommandObjectBreakpoint.h" +#include "Commands/CommandObjectBugreport.h" +#include "Commands/CommandObjectCommands.h" +#include "Commands/CommandObjectDisassemble.h" +#include "Commands/CommandObjectExpression.h" +#include "Commands/CommandObjectFrame.h" +#include "Commands/CommandObjectGUI.h" +#include "Commands/CommandObjectHelp.h" +#include "Commands/CommandObjectLanguage.h" +#include "Commands/CommandObjectLog.h" +#include "Commands/CommandObjectMemory.h" +#include "Commands/CommandObjectPlatform.h" +#include "Commands/CommandObjectPlugin.h" +#include "Commands/CommandObjectProcess.h" +#include "Commands/CommandObjectQuit.h" +#include "Commands/CommandObjectRegister.h" +#include "Commands/CommandObjectSettings.h" +#include "Commands/CommandObjectSource.h" +#include "Commands/CommandObjectStats.h" +#include "Commands/CommandObjectTarget.h" +#include "Commands/CommandObjectThread.h" +#include "Commands/CommandObjectType.h" +#include "Commands/CommandObjectVersion.h" +#include "Commands/CommandObjectWatchpoint.h" #include "lldb/Core/Debugger.h" #include "lldb/Core/PluginManager.h" Modified: lldb/trunk/source/Plugins/JITLoader/GDB/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/JITLoader/GDB/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/JITLoader/GDB/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/JITLoader/GDB/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,5 +1,3 @@ -include_directories(.) - add_lldb_library(lldbPluginJITLoaderGDB PLUGIN JITLoaderGDB.cpp Modified: lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h (original) +++ lldb/trunk/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h Tue May 22 15:53:50 2018 @@ -17,7 +17,7 @@ // Other libraries and framework includes // Project includes -#include "../../Process/gdb-remote/GDBRemoteCommunicationClient.h" +#include "Plugins/Process/gdb-remote/GDBRemoteCommunicationClient.h" #include "Plugins/Process/Utility/GDBRemoteSignals.h" #include "lldb/Target/Platform.h" Modified: lldb/trunk/source/Plugins/Process/FreeBSD/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/FreeBSD/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/FreeBSD/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/FreeBSD/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,7 +1,3 @@ -include_directories(.) -include_directories(../POSIX) -include_directories(../Utility) - add_lldb_library(lldbPluginProcessFreeBSD PLUGIN ProcessFreeBSD.cpp FreeBSDThread.cpp Modified: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIX.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIX.h?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIX.h (original) +++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIX.h Tue May 22 15:53:50 2018 @@ -13,7 +13,7 @@ // C Includes // C++ Includes // Other libraries and framework includes -#include "RegisterInfoInterface.h" +#include "Plugins/Process/Utility/RegisterInfoInterface.h" #include "lldb/Target/RegisterContext.h" #include "lldb/Utility/ArchSpec.h" Modified: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp (original) +++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_arm.cpp Tue May 22 15:53:50 2018 @@ -14,7 +14,7 @@ #include "ProcessFreeBSD.h" #include "ProcessMonitor.h" #include "RegisterContextPOSIXProcessMonitor_arm.h" -#include "RegisterContextPOSIX_arm.h" +#include "Plugins/Process/Utility/RegisterContextPOSIX_arm.h" using namespace lldb_private; using namespace lldb; Modified: lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp (original) +++ lldb/trunk/source/Plugins/Process/FreeBSD/RegisterContextPOSIXProcessMonitor_powerpc.cpp Tue May 22 15:53:50 2018 @@ -14,7 +14,7 @@ #include "ProcessFreeBSD.h" #include "ProcessMonitor.h" #include "RegisterContextPOSIXProcessMonitor_powerpc.h" -#include "RegisterContextPOSIX_powerpc.h" +#include "Plugins/Process/Utility/RegisterContextPOSIX_powerpc.h" using namespace lldb_private; using namespace lldb; Modified: lldb/trunk/source/Plugins/Process/Linux/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/Linux/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,7 +1,3 @@ -include_directories(.) -include_directories(../POSIX) -include_directories(../Utility) - add_lldb_library(lldbPluginProcessLinux PLUGIN NativeProcessLinux.cpp NativeRegisterContextLinux.cpp Modified: lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h (original) +++ lldb/trunk/source/Plugins/Process/Linux/NativeRegisterContextLinux_ppc64le.h Tue May 22 15:53:50 2018 @@ -19,7 +19,7 @@ #include "Plugins/Process/Utility/lldb-ppc64le-register-enums.h" #define DECLARE_REGISTER_INFOS_PPC64LE_STRUCT -#include "RegisterInfos_ppc64le.h" +#include "Plugins/Process/Utility/RegisterInfos_ppc64le.h" #undef DECLARE_REGISTER_INFOS_PPC64LE_STRUCT namespace lldb_private { Modified: lldb/trunk/source/Plugins/Process/NetBSD/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/NetBSD/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/NetBSD/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/NetBSD/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,7 +1,3 @@ -include_directories(.) -include_directories(../POSIX) -include_directories(../Utility) - add_lldb_library(lldbPluginProcessNetBSD PLUGIN NativeProcessNetBSD.cpp NativeRegisterContextNetBSD.cpp Modified: lldb/trunk/source/Plugins/Process/POSIX/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/POSIX/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/POSIX/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/POSIX/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,6 +1,3 @@ -include_directories(.) -include_directories(../Utility) - add_lldb_library(lldbPluginProcessPOSIX PLUGIN CrashReason.cpp ProcessMessage.cpp Modified: lldb/trunk/source/Plugins/Process/Utility/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Utility/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Utility/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/Utility/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,5 +1,3 @@ -include_directories(../../../Utility/) - add_lldb_library(lldbPluginProcessUtility PLUGIN DynamicRegisterInfo.cpp FreeBSDSignals.cpp Modified: lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/Windows/Common/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,6 +1,3 @@ -include_directories(.) -include_directories(../../Utility) - set(PROC_WINDOWS_COMMON_SOURCES DebuggerThread.cpp LocalDebugDelegate.cpp Modified: lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp (original) +++ lldb/trunk/source/Plugins/Process/Windows/Common/TargetThreadWindows.cpp Tue May 22 15:53:50 2018 @@ -19,7 +19,7 @@ #include "ProcessWindows.h" #include "ProcessWindowsLog.h" #include "TargetThreadWindows.h" -#include "UnwindLLDB.h" +#include "Plugins/Process/Utility/UnwindLLDB.h" #if defined(_WIN64) #include "x64/RegisterContextWindows_x64.h" Modified: lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp (original) +++ lldb/trunk/source/Plugins/Process/Windows/Common/x64/RegisterContextWindows_x64.cpp Tue May 22 15:53:50 2018 @@ -14,9 +14,9 @@ #include "lldb/lldb-private-types.h" #include "RegisterContextWindows_x64.h" -#include "RegisterContext_x86.h" +#include "Plugins/Process/Utility/RegisterContext_x86.h" #include "TargetThreadWindows.h" -#include "lldb-x86-register-enums.h" +#include "Plugins/Process/Utility/lldb-x86-register-enums.h" #include "llvm/ADT/STLExtras.h" Modified: lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp (original) +++ lldb/trunk/source/Plugins/Process/Windows/Common/x86/RegisterContextWindows_x86.cpp Tue May 22 15:53:50 2018 @@ -15,9 +15,9 @@ #include "ProcessWindowsLog.h" #include "RegisterContextWindows_x86.h" -#include "RegisterContext_x86.h" +#include "Plugins/Process/Utility/RegisterContext_x86.h" #include "TargetThreadWindows.h" -#include "lldb-x86-register-enums.h" +#include "Plugins/Process/Utility/lldb-x86-register-enums.h" #include "llvm/ADT/STLExtras.h" Modified: lldb/trunk/source/Plugins/Process/elf-core/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/elf-core/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/elf-core/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/elf-core/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,5 +1,3 @@ -include_directories(../Utility) - add_lldb_library(lldbPluginProcessElfCore PLUGIN ProcessElfCore.cpp ThreadElfCore.cpp Modified: lldb/trunk/source/Plugins/Process/mach-core/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/mach-core/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/mach-core/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/mach-core/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,5 +1,3 @@ -include_directories(../Utility) - add_lldb_library(lldbPluginProcessMachCore PLUGIN ProcessMachCore.cpp ThreadMachCore.cpp Modified: lldb/trunk/source/Plugins/Process/mach-core/ProcessMachCore.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/mach-core/ProcessMachCore.cpp?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/mach-core/ProcessMachCore.cpp (original) +++ lldb/trunk/source/Plugins/Process/mach-core/ProcessMachCore.cpp Tue May 22 15:53:50 2018 @@ -35,7 +35,7 @@ // Project includes #include "ProcessMachCore.h" -#include "StopInfoMachException.h" +#include "Plugins/Process/Utility/StopInfoMachException.h" #include "ThreadMachCore.h" // Needed for the plug-in names for the dynamic loaders. Modified: lldb/trunk/source/Plugins/Process/minidump/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/minidump/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Plugins/Process/minidump/CMakeLists.txt (original) +++ lldb/trunk/source/Plugins/Process/minidump/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,5 +1,3 @@ -include_directories(../Utility) - add_lldb_library(lldbPluginProcessMinidump PLUGIN MinidumpTypes.cpp MinidumpParser.cpp Modified: lldb/trunk/source/Target/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/CMakeLists.txt?rev=333035&r1=333034&r2=333035&view=diff ============================================================================== --- lldb/trunk/source/Target/CMakeLists.txt (original) +++ lldb/trunk/source/Target/CMakeLists.txt Tue May 22 15:53:50 2018 @@ -1,5 +1,3 @@ -include_directories(../Plugins/Process/Utility) - add_lldb_library(lldbTarget ABI.cpp CPPLanguageRuntime.cpp _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits