[lldb-dev] Fixing messed-up include lines

Eli Friedman eli.friedman at gmail.com
Tue Jun 8 23:24:17 PDT 2010


Hi everyone,

The current LLDB source code contains a lot of include lines like the following:
#include <LLDB/SBDefines.h>

I'm not entirely sure how that works with the Xcode build system, but
it won't work correctly with a more usual make-based system which I'm
working on.  Attached is a patch which fixes such #include lines in
the include/lldb/API directory.  Will this (or other patches like it)
break the Xcode build system?

-Eli
-------------- next part --------------
Index: SBCommandReturnObject.h
===================================================================
--- SBCommandReturnObject.h	(revision 105680)
+++ SBCommandReturnObject.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBCommandReturnObject_h_
 #define LLDB_SBCommandReturnObject_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBCommunication.h
===================================================================
--- SBCommunication.h	(revision 105680)
+++ SBCommunication.h	(working copy)
@@ -10,8 +10,8 @@
 #ifndef LLDB_SBCommunication_h_
 #define LLDB_SBCommunication_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBError.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBError.h"
 
 namespace lldb {
 
Index: SBThread.h
===================================================================
--- SBThread.h	(revision 105680)
+++ SBThread.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBThread_h_
 #define LLDB_SBThread_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h>
 
 namespace lldb {
 
Index: SBLineEntry.h
===================================================================
--- SBLineEntry.h	(revision 105680)
+++ SBLineEntry.h	(working copy)
@@ -10,9 +10,9 @@
 #ifndef LLDB_SBLineEntry_h_
 #define LLDB_SBLineEntry_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBAddress.h>
-#include <LLDB/SBFileSpec.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBFileSpec.h"
 
 namespace lldb {
 
Index: SBSymbolContext.h
===================================================================
--- SBSymbolContext.h	(revision 105680)
+++ SBSymbolContext.h	(working copy)
@@ -10,13 +10,13 @@
 #ifndef LLDB_SBSymbolContext_h_
 #define LLDB_SBSymbolContext_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBBlock.h>
-#include <LLDB/SBCompileUnit.h>
-#include <LLDB/SBFunction.h>
-#include <LLDB/SBLineEntry.h>
-#include <LLDB/SBModule.h>
-#include <LLDB/SBSymbol.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBBlock.h"
+#include "lldb/API/SBCompileUnit.h"
+#include "lldb/API/SBFunction.h"
+#include "lldb/API/SBLineEntry.h"
+#include "lldb/API/SBModule.h"
+#include "lldb/API/SBSymbol.h"
 
 namespace lldb {
 
Index: SBInstructionList.h
===================================================================
--- SBInstructionList.h	(revision 105680)
+++ SBInstructionList.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBInstructionList_h_
 #define LLDB_SBInstructionList_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBDefines.h
===================================================================
--- SBDefines.h	(revision 105680)
+++ SBDefines.h	(working copy)
@@ -15,11 +15,11 @@
 // Other libraries and framework includes
 // Project includes
 
-#include <LLDB/lldb-defines.h>
-#include <LLDB/lldb-enumerations.h>
-#include <LLDB/lldb-forward.h>
-#include <LLDB/lldb-forward-rtti.h>
-#include <LLDB/lldb-types.h>
+#include "lldb/lldb-defines.h"
+#include "lldb/lldb-enumerations.h"
+#include "lldb/lldb-forward.h"
+#include "lldb/lldb-forward-rtti.h"
+#include "lldb/lldb-types.h"
 
 // Forward Declarations
 
Index: SBProcess.h
===================================================================
--- SBProcess.h	(revision 105680)
+++ SBProcess.h	(working copy)
@@ -10,9 +10,9 @@
 #ifndef LLDB_SBProcess_h_
 #define LLDB_SBProcess_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBError.h>
-#include <LLDB/SBTarget.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBTarget.h"
 
 namespace lldb {
 
Index: SBHostOS.h
===================================================================
--- SBHostOS.h	(revision 105680)
+++ SBHostOS.h	(working copy)
@@ -10,8 +10,8 @@
 #ifndef LLDB_SBHostOS_h_
 #define LLDB_SBHostOS_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBFileSpec.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFileSpec.h"
 
 namespace lldb {
 
Index: SBInstruction.h
===================================================================
--- SBInstruction.h	(revision 105680)
+++ SBInstruction.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBInstruction_h_
 #define LLDB_SBInstruction_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 // There's a lot to be fixed here, but need to wait for underlying insn implementation
 // to be revised & settle down first.
Index: SBModule.h
===================================================================
--- SBModule.h	(revision 105680)
+++ SBModule.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBModule_h_
 #define LLDB_SBModule_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBAddress.h
===================================================================
--- SBAddress.h	(revision 105680)
+++ SBAddress.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBAddress_h_
 #define LLDB_SBAddress_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBTarget.h
===================================================================
--- SBTarget.h	(revision 105680)
+++ SBTarget.h	(working copy)
@@ -10,9 +10,9 @@
 #ifndef LLDB_SBTarget_h_
 #define LLDB_SBTarget_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBBroadcaster.h>
-#include <LLDB/SBFileSpec.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBBroadcaster.h"
+#include "lldb/API/SBFileSpec.h"
 
 namespace lldb {
 
Index: SBBroadcaster.h
===================================================================
--- SBBroadcaster.h	(revision 105680)
+++ SBBroadcaster.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBBroadcaster_h_
 #define LLDB_SBBroadcaster_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBError.h
===================================================================
--- SBError.h	(revision 105680)
+++ SBError.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBError_h_
 #define LLDB_SBError_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBFileSpec.h
===================================================================
--- SBFileSpec.h	(revision 105680)
+++ SBFileSpec.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBFileSpec_h_
 #define LLDB_SBFileSpec_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBCommandInterpreter.h
===================================================================
--- SBCommandInterpreter.h	(revision 105680)
+++ SBCommandInterpreter.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBCommandInterpreter_h_
 #define LLDB_SBCommandInterpreter_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBStringList.h
===================================================================
--- SBStringList.h	(revision 105680)
+++ SBStringList.h	(working copy)
@@ -10,9 +10,8 @@
 #ifndef LLDB_SBStringList_h_
 #define LLDB_SBStringList_h_
 
+#include "lldb/API/SBDefines.h"
 
-#include <LLDB/SBDefines.h>
-
 namespace lldb {
 
 class SBStringList
Index: SBSymbol.h
===================================================================
--- SBSymbol.h	(revision 105680)
+++ SBSymbol.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBSymbol_h_
 #define LLDB_SBSymbol_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBValueList.h
===================================================================
--- SBValueList.h	(revision 105680)
+++ SBValueList.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBValueList_h_
 #define LLDB_SBValueList_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 class lldb_private::ValueObjectList;
 
Index: SBValue.h
===================================================================
--- SBValue.h	(revision 105680)
+++ SBValue.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBValue_h_
 #define LLDB_SBValue_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 class lldb_private::Variable;
 class lldb_private::ValueObject;
Index: SBType.h
===================================================================
--- SBType.h	(revision 105680)
+++ SBType.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBType_h_
 #define LLDB_SBType_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBEvent.h
===================================================================
--- SBEvent.h	(revision 105680)
+++ SBEvent.h	(working copy)
@@ -12,7 +12,7 @@
 
 #include <vector>
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBInputReader.h
===================================================================
--- SBInputReader.h	(revision 105680)
+++ SBInputReader.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBInputReader_h_
 #define LLDB_SBInputReader_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 #include <termios.h>
 
Index: SBCommandContext.h
===================================================================
--- SBCommandContext.h	(revision 105680)
+++ SBCommandContext.h	(working copy)
@@ -11,7 +11,7 @@
 #define LLDB_SBCommandContext_h_
 
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBDebugger.h
===================================================================
--- SBDebugger.h	(revision 105680)
+++ SBDebugger.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBDebugger_h_
 #define LLDB_SBDebugger_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBFunction.h
===================================================================
--- SBFunction.h	(revision 105680)
+++ SBFunction.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBFunction_h_
 #define LLDB_SBFunction_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBListener.h
===================================================================
--- SBListener.h	(revision 105680)
+++ SBListener.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBListener_h_
 #define LLDB_SBListener_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBBreakpointLocation.h
===================================================================
--- SBBreakpointLocation.h	(revision 105680)
+++ SBBreakpointLocation.h	(working copy)
@@ -10,8 +10,8 @@
 #ifndef LLDB_SBBreakpointLocation_h_
 #define LLDB_SBBreakpointLocation_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBBreakpoint.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBBreakpoint.h"
 
 namespace lldb {
 
Index: SBCompileUnit.h
===================================================================
--- SBCompileUnit.h	(revision 105680)
+++ SBCompileUnit.h	(working copy)
@@ -10,8 +10,8 @@
 #ifndef LLDB_SBCompileUnit_h_
 #define LLDB_SBCompileUnit_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBFileSpec.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBFileSpec.h"
 
 namespace lldb {
 
Index: LLDB.h
===================================================================
--- LLDB.h	(revision 105680)
+++ LLDB.h	(working copy)
@@ -14,36 +14,36 @@
 // C++ Includes
 // Other libraries and framework includes
 // Project includes
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBAddress.h>
-#include <LLDB/SBBlock.h>
-#include <LLDB/SBBreakpoint.h>
-#include <LLDB/SBBreakpointLocation.h>
-#include <LLDB/SBBroadcaster.h>
-#include <LLDB/SBCommandContext.h>
-#include <LLDB/SBCommandInterpreter.h>
-#include <LLDB/SBCommandReturnObject.h>
-#include <LLDB/SBCommunication.h>
-#include <LLDB/SBCompileUnit.h>
-#include <LLDB/SBDebugger.h>
-#include <LLDB/SBError.h>
-#include <LLDB/SBEvent.h>
-#include <LLDB/SBFileSpec.h>
-#include <LLDB/SBFrame.h>
-#include <LLDB/SBFunction.h>
-#include <LLDB/SBHostOS.h>
-#include <LLDB/SBInputReader.h>
-#include <LLDB/SBLineEntry.h>
-#include <LLDB/SBListener.h>
-#include <LLDB/SBModule.h>
-#include <LLDB/SBProcess.h>
-#include <LLDB/SBSourceManager.h>
-#include <LLDB/SBSymbol.h>
-#include <LLDB/SBSymbolContext.h>
-#include <LLDB/SBTarget.h>
-#include <LLDB/SBThread.h>
-#include <LLDB/SBType.h>
-#include <LLDB/SBValue.h>
-#include <LLDB/SBValueList.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBAddress.h"
+#include "lldb/API/SBBlock.h"
+#include "lldb/API/SBBreakpoint.h"
+#include "lldb/API/SBBreakpointLocation.h"
+#include "lldb/API/SBBroadcaster.h"
+#include "lldb/API/SBCommandContext.h"
+#include "lldb/API/SBCommandInterpreter.h"
+#include "lldb/API/SBCommandReturnObject.h"
+#include "lldb/API/SBCommunication.h"
+#include "lldb/API/SBCompileUnit.h"
+#include "lldb/API/SBDebugger.h"
+#include "lldb/API/SBError.h"
+#include "lldb/API/SBEvent.h"
+#include "lldb/API/SBFileSpec.h"
+#include "lldb/API/SBFrame.h"
+#include "lldb/API/SBFunction.h"
+#include "lldb/API/SBHostOS.h"
+#include "lldb/API/SBInputReader.h"
+#include "lldb/API/SBLineEntry.h"
+#include "lldb/API/SBListener.h"
+#include "lldb/API/SBModule.h"
+#include "lldb/API/SBProcess.h"
+#include "lldb/API/SBSourceManager.h"
+#include "lldb/API/SBSymbol.h"
+#include "lldb/API/SBSymbolContext.h"
+#include "lldb/API/SBTarget.h"
+#include "lldb/API/SBThread.h"
+#include "lldb/API/SBType.h"
+#include "lldb/API/SBValue.h"
+#include "lldb/API/SBValueList.h"
 
 #endif  // LLDB_LLDB_h_
Index: SBFrame.h
===================================================================
--- SBFrame.h	(revision 105680)
+++ SBFrame.h	(working copy)
@@ -10,8 +10,8 @@
 #ifndef LLDB_SBFrame_h_
 #define LLDB_SBFrame_h_
 
-#include <LLDB/SBDefines.h>
-#include <LLDB/SBValueList.h>
+#include "lldb/API/SBDefines.h"
+#include "lldb/API/SBValueList.h"
 
 namespace lldb {
 
Index: SBBlock.h
===================================================================
--- SBBlock.h	(revision 105680)
+++ SBBlock.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBBlock_h_
 #define LLDB_SBBlock_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBSourceManager.h
===================================================================
--- SBSourceManager.h	(revision 105680)
+++ SBSourceManager.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBSourceManager_h_
 #define LLDB_SBSourceManager_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 
Index: SBBreakpoint.h
===================================================================
--- SBBreakpoint.h	(revision 105680)
+++ SBBreakpoint.h	(working copy)
@@ -10,7 +10,7 @@
 #ifndef LLDB_SBBreakpoint_h_
 #define LLDB_SBBreakpoint_h_
 
-#include <LLDB/SBDefines.h>
+#include "lldb/API/SBDefines.h"
 
 namespace lldb {
 


More information about the lldb-dev mailing list