[Lldb-commits] [lldb] 6498aff - [lldb/Bindings] Move bindings into their own subdirectory

Jonas Devlieghere via lldb-commits lldb-commits at lists.llvm.org
Thu Jan 9 08:44:46 PST 2020 

Author: Jonas Devlieghere
Date: 2020-01-09T08:44:34-08:00
New Revision: 6498aff249a1c3c6bad33137df3b90e2973722d6

URL: https://github.com/llvm/llvm-project/commit/6498aff249a1c3c6bad33137df3b90e2973722d6
DIFF: https://github.com/llvm/llvm-project/commit/6498aff249a1c3c6bad33137df3b90e2973722d6.diff

LOG: [lldb/Bindings] Move bindings into their own subdirectory

All the code required to generate the language bindings for Python and
Lua lives under scripts, even though the majority of this code aren't
scripts at all, and surrounded by scripts that are totally unrelated.

I've reorganized these files and moved everything related to the
language bindings into a new top-level directory named bindings. This
makes the corresponding files self contained and much more discoverable.

Differential revision: https://reviews.llvm.org/D72437

Added: 
    lldb/bindings/CMakeLists.txt
    lldb/bindings/headers.swig
    lldb/bindings/interface/SBAddress.i
    lldb/bindings/interface/SBAttachInfo.i
    lldb/bindings/interface/SBBlock.i
    lldb/bindings/interface/SBBreakpoint.i
    lldb/bindings/interface/SBBreakpointLocation.i
    lldb/bindings/interface/SBBreakpointName.i
    lldb/bindings/interface/SBBroadcaster.i
    lldb/bindings/interface/SBCommandInterpreter.i
    lldb/bindings/interface/SBCommandReturnObject.i
    lldb/bindings/interface/SBCommunication.i
    lldb/bindings/interface/SBCompileUnit.i
    lldb/bindings/interface/SBData.i
    lldb/bindings/interface/SBDebugger.i
    lldb/bindings/interface/SBDeclaration.i
    lldb/bindings/interface/SBError.i
    lldb/bindings/interface/SBEvent.i
    lldb/bindings/interface/SBExecutionContext.i
    lldb/bindings/interface/SBExpressionOptions.i
    lldb/bindings/interface/SBFile.i
    lldb/bindings/interface/SBFileSpec.i
    lldb/bindings/interface/SBFileSpecList.i
    lldb/bindings/interface/SBFrame.i
    lldb/bindings/interface/SBFunction.i
    lldb/bindings/interface/SBHostOS.i
    lldb/bindings/interface/SBInstruction.i
    lldb/bindings/interface/SBInstructionList.i
    lldb/bindings/interface/SBLanguageRuntime.i
    lldb/bindings/interface/SBLaunchInfo.i
    lldb/bindings/interface/SBLineEntry.i
    lldb/bindings/interface/SBListener.i
    lldb/bindings/interface/SBMemoryRegionInfo.i
    lldb/bindings/interface/SBMemoryRegionInfoList.i
    lldb/bindings/interface/SBModule.i
    lldb/bindings/interface/SBModuleSpec.i
    lldb/bindings/interface/SBPlatform.i
    lldb/bindings/interface/SBProcess.i
    lldb/bindings/interface/SBProcessInfo.i
    lldb/bindings/interface/SBQueue.i
    lldb/bindings/interface/SBQueueItem.i
    lldb/bindings/interface/SBSection.i
    lldb/bindings/interface/SBSourceManager.i
    lldb/bindings/interface/SBStream.i
    lldb/bindings/interface/SBStringList.i
    lldb/bindings/interface/SBStructuredData.i
    lldb/bindings/interface/SBSymbol.i
    lldb/bindings/interface/SBSymbolContext.i
    lldb/bindings/interface/SBSymbolContextList.i
    lldb/bindings/interface/SBTarget.i
    lldb/bindings/interface/SBThread.i
    lldb/bindings/interface/SBThreadCollection.i
    lldb/bindings/interface/SBThreadPlan.i
    lldb/bindings/interface/SBTrace.i
    lldb/bindings/interface/SBTraceOptions.i
    lldb/bindings/interface/SBType.i
    lldb/bindings/interface/SBTypeCategory.i
    lldb/bindings/interface/SBTypeEnumMember.i
    lldb/bindings/interface/SBTypeFilter.i
    lldb/bindings/interface/SBTypeFormat.i
    lldb/bindings/interface/SBTypeNameSpecifier.i
    lldb/bindings/interface/SBTypeSummary.i
    lldb/bindings/interface/SBTypeSynthetic.i
    lldb/bindings/interface/SBUnixSignals.i
    lldb/bindings/interface/SBValue.i
    lldb/bindings/interface/SBValueList.i
    lldb/bindings/interface/SBVariablesOptions.i
    lldb/bindings/interface/SBWatchpoint.i
    lldb/bindings/interfaces.swig
    lldb/bindings/lua.swig
    lldb/bindings/macros.swig
    lldb/bindings/python.swig
    lldb/bindings/python/createPythonInit.py
    lldb/bindings/python/python-extensions.swig
    lldb/bindings/python/python-swigsafecast.swig
    lldb/bindings/python/python-typemaps.swig
    lldb/bindings/python/python-wrapper.swig

Modified: 
    lldb/CMakeLists.txt
    lldb/docs/CMakeLists.txt
    lldb/source/API/CMakeLists.txt

Removed: 
    lldb/scripts/CMakeLists.txt
    lldb/scripts/Python/createPythonInit.py
    lldb/scripts/Python/python-extensions.swig
    lldb/scripts/Python/python-swigsafecast.swig
    lldb/scripts/Python/python-typemaps.swig
    lldb/scripts/Python/python-wrapper.swig
    lldb/scripts/headers.swig
    lldb/scripts/interface/SBAddress.i
    lldb/scripts/interface/SBAttachInfo.i
    lldb/scripts/interface/SBBlock.i
    lldb/scripts/interface/SBBreakpoint.i
    lldb/scripts/interface/SBBreakpointLocation.i
    lldb/scripts/interface/SBBreakpointName.i
    lldb/scripts/interface/SBBroadcaster.i
    lldb/scripts/interface/SBCommandInterpreter.i
    lldb/scripts/interface/SBCommandReturnObject.i
    lldb/scripts/interface/SBCommunication.i
    lldb/scripts/interface/SBCompileUnit.i
    lldb/scripts/interface/SBData.i
    lldb/scripts/interface/SBDebugger.i
    lldb/scripts/interface/SBDeclaration.i
    lldb/scripts/interface/SBError.i
    lldb/scripts/interface/SBEvent.i
    lldb/scripts/interface/SBExecutionContext.i
    lldb/scripts/interface/SBExpressionOptions.i
    lldb/scripts/interface/SBFile.i
    lldb/scripts/interface/SBFileSpec.i
    lldb/scripts/interface/SBFileSpecList.i
    lldb/scripts/interface/SBFrame.i
    lldb/scripts/interface/SBFunction.i
    lldb/scripts/interface/SBHostOS.i
    lldb/scripts/interface/SBInstruction.i
    lldb/scripts/interface/SBInstructionList.i
    lldb/scripts/interface/SBLanguageRuntime.i
    lldb/scripts/interface/SBLaunchInfo.i
    lldb/scripts/interface/SBLineEntry.i
    lldb/scripts/interface/SBListener.i
    lldb/scripts/interface/SBMemoryRegionInfo.i
    lldb/scripts/interface/SBMemoryRegionInfoList.i
    lldb/scripts/interface/SBModule.i
    lldb/scripts/interface/SBModuleSpec.i
    lldb/scripts/interface/SBPlatform.i
    lldb/scripts/interface/SBProcess.i
    lldb/scripts/interface/SBProcessInfo.i
    lldb/scripts/interface/SBQueue.i
    lldb/scripts/interface/SBQueueItem.i
    lldb/scripts/interface/SBSection.i
    lldb/scripts/interface/SBSourceManager.i
    lldb/scripts/interface/SBStream.i
    lldb/scripts/interface/SBStringList.i
    lldb/scripts/interface/SBStructuredData.i
    lldb/scripts/interface/SBSymbol.i
    lldb/scripts/interface/SBSymbolContext.i
    lldb/scripts/interface/SBSymbolContextList.i
    lldb/scripts/interface/SBTarget.i
    lldb/scripts/interface/SBThread.i
    lldb/scripts/interface/SBThreadCollection.i
    lldb/scripts/interface/SBThreadPlan.i
    lldb/scripts/interface/SBTrace.i
    lldb/scripts/interface/SBTraceOptions.i
    lldb/scripts/interface/SBType.i
    lldb/scripts/interface/SBTypeCategory.i
    lldb/scripts/interface/SBTypeEnumMember.i
    lldb/scripts/interface/SBTypeFilter.i
    lldb/scripts/interface/SBTypeFormat.i
    lldb/scripts/interface/SBTypeNameSpecifier.i
    lldb/scripts/interface/SBTypeSummary.i
    lldb/scripts/interface/SBTypeSynthetic.i
    lldb/scripts/interface/SBUnixSignals.i
    lldb/scripts/interface/SBValue.i
    lldb/scripts/interface/SBValueList.i
    lldb/scripts/interface/SBVariablesOptions.i
    lldb/scripts/interface/SBWatchpoint.i
    lldb/scripts/interfaces.swig
    lldb/scripts/lldb.swig
    lldb/scripts/lldb_lua.swig
    lldb/scripts/macros.swig


################################################################################
diff  --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 6170ab625c54..573b8556989e 100644
--- a/lldb/CMakeLists.txt
+++ b/lldb/CMakeLists.txt
@@ -56,7 +56,7 @@ if (LLDB_ENABLE_PYTHON)
 endif ()
 
 if (LLDB_ENABLE_PYTHON OR LLDB_ENABLE_LUA)
-  add_subdirectory(scripts)
+  add_subdirectory(bindings)
 endif ()
 
 # We need the headers generated by instrinsics_gen before we can compile
@@ -97,7 +97,7 @@ if(LLDB_INCLUDE_TESTS)
 endif()
 
 if (LLDB_ENABLE_PYTHON)
-  get_target_property(lldb_scripts_dir swig_wrapper BINARY_DIR)
+  get_target_property(lldb_bindings_dir swig_wrapper BINARY_DIR)
 
   if(LLDB_BUILD_FRAMEWORK)
     set(lldb_python_build_path "${LLDB_FRAMEWORK_ABSOLUTE_BUILD_DIR}/LLDB.framework/Resources/Python/lldb")
@@ -109,7 +109,7 @@ if (LLDB_ENABLE_PYTHON)
   # to liblldb.so for the Python API(hardlink on Windows).
   add_custom_target(finish_swig ALL VERBATIM
     COMMAND ${CMAKE_COMMAND} -E make_directory ${lldb_python_build_path}
-    DEPENDS ${lldb_scripts_dir}/lldb.py
+    DEPENDS ${lldb_bindings_dir}/lldb.py
     COMMENT "Python script sym-linking LLDB Python API")
 
   if(NOT LLDB_USE_SYSTEM_SIX)
@@ -121,7 +121,7 @@ if (LLDB_ENABLE_PYTHON)
 
   add_custom_command(TARGET finish_swig POST_BUILD VERBATIM
     COMMAND ${CMAKE_COMMAND} -E copy
-      "${lldb_scripts_dir}/lldb.py"
+      "${lldb_bindings_dir}/lldb.py"
       "${lldb_python_build_path}/__init__.py")
 
   function(create_python_package pkg_dir)
@@ -131,7 +131,7 @@ if (LLDB_ENABLE_PYTHON)
     endif()
     if(NOT ARG_NOINIT)
       set(init_cmd COMMAND ${PYTHON_EXECUTABLE}
-          "${LLDB_SOURCE_DIR}/scripts/Python/createPythonInit.py"
+          "${LLDB_SOURCE_DIR}/bindings/python/createPythonInit.py"
           "${pkg_dir}" ${ARG_FILES})
     endif()
     add_custom_command(TARGET finish_swig POST_BUILD VERBATIM

diff  --git a/lldb/scripts/CMakeLists.txt b/lldb/bindings/CMakeLists.txt
similarity index 93%
rename from lldb/scripts/CMakeLists.txt
rename to lldb/bindings/CMakeLists.txt
index 515c63293bc2..92ae402c478e 100644
--- a/lldb/scripts/CMakeLists.txt
+++ b/lldb/bindings/CMakeLists.txt
@@ -1,4 +1,4 @@
-file(GLOB SWIG_INTERFACES interface/*.i)
+file(GLOB SWIG_INTERFACES interfaces/*.i)
 file(GLOB_RECURSE SWIG_SOURCES *.swig)
 file(GLOB SWIG_HEADERS
   ${LLDB_SOURCE_DIR}/include/lldb/API/*.h
@@ -46,7 +46,7 @@ if (LLDB_ENABLE_PYTHON)
         -python
         -threads
         -o ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp
-        ${LLDB_SOURCE_DIR}/scripts/lldb.swig
+        ${LLDB_SOURCE_DIR}/bindings/python.swig
     VERBATIM
     COMMENT "Builds LLDB Python wrapper")
 
@@ -67,7 +67,7 @@ if (LLDB_ENABLE_LUA)
         -lua
         -w503
         -o ${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapLua.cpp
-        ${LLDB_SOURCE_DIR}/scripts/lldb_lua.swig
+        ${LLDB_SOURCE_DIR}/bindings/lua.swig
     VERBATIM
     COMMENT "Builds LLDB Lua wrapper")
 

diff  --git a/lldb/scripts/headers.swig b/lldb/bindings/headers.swig
similarity index 100%
rename from lldb/scripts/headers.swig
rename to lldb/bindings/headers.swig

diff  --git a/lldb/scripts/interface/SBAddress.i b/lldb/bindings/interface/SBAddress.i
similarity index 100%
rename from lldb/scripts/interface/SBAddress.i
rename to lldb/bindings/interface/SBAddress.i

diff  --git a/lldb/scripts/interface/SBAttachInfo.i b/lldb/bindings/interface/SBAttachInfo.i
similarity index 100%
rename from lldb/scripts/interface/SBAttachInfo.i
rename to lldb/bindings/interface/SBAttachInfo.i

diff  --git a/lldb/scripts/interface/SBBlock.i b/lldb/bindings/interface/SBBlock.i
similarity index 100%
rename from lldb/scripts/interface/SBBlock.i
rename to lldb/bindings/interface/SBBlock.i

diff  --git a/lldb/scripts/interface/SBBreakpoint.i b/lldb/bindings/interface/SBBreakpoint.i
similarity index 100%
rename from lldb/scripts/interface/SBBreakpoint.i
rename to lldb/bindings/interface/SBBreakpoint.i

diff  --git a/lldb/scripts/interface/SBBreakpointLocation.i b/lldb/bindings/interface/SBBreakpointLocation.i
similarity index 100%
rename from lldb/scripts/interface/SBBreakpointLocation.i
rename to lldb/bindings/interface/SBBreakpointLocation.i

diff  --git a/lldb/scripts/interface/SBBreakpointName.i b/lldb/bindings/interface/SBBreakpointName.i
similarity index 100%
rename from lldb/scripts/interface/SBBreakpointName.i
rename to lldb/bindings/interface/SBBreakpointName.i

diff  --git a/lldb/scripts/interface/SBBroadcaster.i b/lldb/bindings/interface/SBBroadcaster.i
similarity index 100%
rename from lldb/scripts/interface/SBBroadcaster.i
rename to lldb/bindings/interface/SBBroadcaster.i

diff  --git a/lldb/scripts/interface/SBCommandInterpreter.i b/lldb/bindings/interface/SBCommandInterpreter.i
similarity index 100%
rename from lldb/scripts/interface/SBCommandInterpreter.i
rename to lldb/bindings/interface/SBCommandInterpreter.i

diff  --git a/lldb/scripts/interface/SBCommandReturnObject.i b/lldb/bindings/interface/SBCommandReturnObject.i
similarity index 100%
rename from lldb/scripts/interface/SBCommandReturnObject.i
rename to lldb/bindings/interface/SBCommandReturnObject.i

diff  --git a/lldb/scripts/interface/SBCommunication.i b/lldb/bindings/interface/SBCommunication.i
similarity index 100%
rename from lldb/scripts/interface/SBCommunication.i
rename to lldb/bindings/interface/SBCommunication.i

diff  --git a/lldb/scripts/interface/SBCompileUnit.i b/lldb/bindings/interface/SBCompileUnit.i
similarity index 100%
rename from lldb/scripts/interface/SBCompileUnit.i
rename to lldb/bindings/interface/SBCompileUnit.i

diff  --git a/lldb/scripts/interface/SBData.i b/lldb/bindings/interface/SBData.i
similarity index 100%
rename from lldb/scripts/interface/SBData.i
rename to lldb/bindings/interface/SBData.i

diff  --git a/lldb/scripts/interface/SBDebugger.i b/lldb/bindings/interface/SBDebugger.i
similarity index 100%
rename from lldb/scripts/interface/SBDebugger.i
rename to lldb/bindings/interface/SBDebugger.i

diff  --git a/lldb/scripts/interface/SBDeclaration.i b/lldb/bindings/interface/SBDeclaration.i
similarity index 100%
rename from lldb/scripts/interface/SBDeclaration.i
rename to lldb/bindings/interface/SBDeclaration.i

diff  --git a/lldb/scripts/interface/SBError.i b/lldb/bindings/interface/SBError.i
similarity index 100%
rename from lldb/scripts/interface/SBError.i
rename to lldb/bindings/interface/SBError.i

diff  --git a/lldb/scripts/interface/SBEvent.i b/lldb/bindings/interface/SBEvent.i
similarity index 100%
rename from lldb/scripts/interface/SBEvent.i
rename to lldb/bindings/interface/SBEvent.i

diff  --git a/lldb/scripts/interface/SBExecutionContext.i b/lldb/bindings/interface/SBExecutionContext.i
similarity index 100%
rename from lldb/scripts/interface/SBExecutionContext.i
rename to lldb/bindings/interface/SBExecutionContext.i

diff  --git a/lldb/scripts/interface/SBExpressionOptions.i b/lldb/bindings/interface/SBExpressionOptions.i
similarity index 100%
rename from lldb/scripts/interface/SBExpressionOptions.i
rename to lldb/bindings/interface/SBExpressionOptions.i

diff  --git a/lldb/scripts/interface/SBFile.i b/lldb/bindings/interface/SBFile.i
similarity index 100%
rename from lldb/scripts/interface/SBFile.i
rename to lldb/bindings/interface/SBFile.i

diff  --git a/lldb/scripts/interface/SBFileSpec.i b/lldb/bindings/interface/SBFileSpec.i
similarity index 100%
rename from lldb/scripts/interface/SBFileSpec.i
rename to lldb/bindings/interface/SBFileSpec.i

diff  --git a/lldb/scripts/interface/SBFileSpecList.i b/lldb/bindings/interface/SBFileSpecList.i
similarity index 100%
rename from lldb/scripts/interface/SBFileSpecList.i
rename to lldb/bindings/interface/SBFileSpecList.i

diff  --git a/lldb/scripts/interface/SBFrame.i b/lldb/bindings/interface/SBFrame.i
similarity index 100%
rename from lldb/scripts/interface/SBFrame.i
rename to lldb/bindings/interface/SBFrame.i

diff  --git a/lldb/scripts/interface/SBFunction.i b/lldb/bindings/interface/SBFunction.i
similarity index 100%
rename from lldb/scripts/interface/SBFunction.i
rename to lldb/bindings/interface/SBFunction.i

diff  --git a/lldb/scripts/interface/SBHostOS.i b/lldb/bindings/interface/SBHostOS.i
similarity index 100%
rename from lldb/scripts/interface/SBHostOS.i
rename to lldb/bindings/interface/SBHostOS.i

diff  --git a/lldb/scripts/interface/SBInstruction.i b/lldb/bindings/interface/SBInstruction.i
similarity index 100%
rename from lldb/scripts/interface/SBInstruction.i
rename to lldb/bindings/interface/SBInstruction.i

diff  --git a/lldb/scripts/interface/SBInstructionList.i b/lldb/bindings/interface/SBInstructionList.i
similarity index 100%
rename from lldb/scripts/interface/SBInstructionList.i
rename to lldb/bindings/interface/SBInstructionList.i

diff  --git a/lldb/scripts/interface/SBLanguageRuntime.i b/lldb/bindings/interface/SBLanguageRuntime.i
similarity index 100%
rename from lldb/scripts/interface/SBLanguageRuntime.i
rename to lldb/bindings/interface/SBLanguageRuntime.i

diff  --git a/lldb/scripts/interface/SBLaunchInfo.i b/lldb/bindings/interface/SBLaunchInfo.i
similarity index 100%
rename from lldb/scripts/interface/SBLaunchInfo.i
rename to lldb/bindings/interface/SBLaunchInfo.i

diff  --git a/lldb/scripts/interface/SBLineEntry.i b/lldb/bindings/interface/SBLineEntry.i
similarity index 100%
rename from lldb/scripts/interface/SBLineEntry.i
rename to lldb/bindings/interface/SBLineEntry.i

diff  --git a/lldb/scripts/interface/SBListener.i b/lldb/bindings/interface/SBListener.i
similarity index 100%
rename from lldb/scripts/interface/SBListener.i
rename to lldb/bindings/interface/SBListener.i

diff  --git a/lldb/scripts/interface/SBMemoryRegionInfo.i b/lldb/bindings/interface/SBMemoryRegionInfo.i
similarity index 100%
rename from lldb/scripts/interface/SBMemoryRegionInfo.i
rename to lldb/bindings/interface/SBMemoryRegionInfo.i

diff  --git a/lldb/scripts/interface/SBMemoryRegionInfoList.i b/lldb/bindings/interface/SBMemoryRegionInfoList.i
similarity index 100%
rename from lldb/scripts/interface/SBMemoryRegionInfoList.i
rename to lldb/bindings/interface/SBMemoryRegionInfoList.i

diff  --git a/lldb/scripts/interface/SBModule.i b/lldb/bindings/interface/SBModule.i
similarity index 100%
rename from lldb/scripts/interface/SBModule.i
rename to lldb/bindings/interface/SBModule.i

diff  --git a/lldb/scripts/interface/SBModuleSpec.i b/lldb/bindings/interface/SBModuleSpec.i
similarity index 100%
rename from lldb/scripts/interface/SBModuleSpec.i
rename to lldb/bindings/interface/SBModuleSpec.i

diff  --git a/lldb/scripts/interface/SBPlatform.i b/lldb/bindings/interface/SBPlatform.i
similarity index 100%
rename from lldb/scripts/interface/SBPlatform.i
rename to lldb/bindings/interface/SBPlatform.i

diff  --git a/lldb/scripts/interface/SBProcess.i b/lldb/bindings/interface/SBProcess.i
similarity index 100%
rename from lldb/scripts/interface/SBProcess.i
rename to lldb/bindings/interface/SBProcess.i

diff  --git a/lldb/scripts/interface/SBProcessInfo.i b/lldb/bindings/interface/SBProcessInfo.i
similarity index 100%
rename from lldb/scripts/interface/SBProcessInfo.i
rename to lldb/bindings/interface/SBProcessInfo.i

diff  --git a/lldb/scripts/interface/SBQueue.i b/lldb/bindings/interface/SBQueue.i
similarity index 100%
rename from lldb/scripts/interface/SBQueue.i
rename to lldb/bindings/interface/SBQueue.i

diff  --git a/lldb/scripts/interface/SBQueueItem.i b/lldb/bindings/interface/SBQueueItem.i
similarity index 100%
rename from lldb/scripts/interface/SBQueueItem.i
rename to lldb/bindings/interface/SBQueueItem.i

diff  --git a/lldb/scripts/interface/SBSection.i b/lldb/bindings/interface/SBSection.i
similarity index 100%
rename from lldb/scripts/interface/SBSection.i
rename to lldb/bindings/interface/SBSection.i

diff  --git a/lldb/scripts/interface/SBSourceManager.i b/lldb/bindings/interface/SBSourceManager.i
similarity index 100%
rename from lldb/scripts/interface/SBSourceManager.i
rename to lldb/bindings/interface/SBSourceManager.i

diff  --git a/lldb/scripts/interface/SBStream.i b/lldb/bindings/interface/SBStream.i
similarity index 100%
rename from lldb/scripts/interface/SBStream.i
rename to lldb/bindings/interface/SBStream.i

diff  --git a/lldb/scripts/interface/SBStringList.i b/lldb/bindings/interface/SBStringList.i
similarity index 100%
rename from lldb/scripts/interface/SBStringList.i
rename to lldb/bindings/interface/SBStringList.i

diff  --git a/lldb/scripts/interface/SBStructuredData.i b/lldb/bindings/interface/SBStructuredData.i
similarity index 100%
rename from lldb/scripts/interface/SBStructuredData.i
rename to lldb/bindings/interface/SBStructuredData.i

diff  --git a/lldb/scripts/interface/SBSymbol.i b/lldb/bindings/interface/SBSymbol.i
similarity index 100%
rename from lldb/scripts/interface/SBSymbol.i
rename to lldb/bindings/interface/SBSymbol.i

diff  --git a/lldb/scripts/interface/SBSymbolContext.i b/lldb/bindings/interface/SBSymbolContext.i
similarity index 100%
rename from lldb/scripts/interface/SBSymbolContext.i
rename to lldb/bindings/interface/SBSymbolContext.i

diff  --git a/lldb/scripts/interface/SBSymbolContextList.i b/lldb/bindings/interface/SBSymbolContextList.i
similarity index 100%
rename from lldb/scripts/interface/SBSymbolContextList.i
rename to lldb/bindings/interface/SBSymbolContextList.i

diff  --git a/lldb/scripts/interface/SBTarget.i b/lldb/bindings/interface/SBTarget.i
similarity index 100%
rename from lldb/scripts/interface/SBTarget.i
rename to lldb/bindings/interface/SBTarget.i

diff  --git a/lldb/scripts/interface/SBThread.i b/lldb/bindings/interface/SBThread.i
similarity index 100%
rename from lldb/scripts/interface/SBThread.i
rename to lldb/bindings/interface/SBThread.i

diff  --git a/lldb/scripts/interface/SBThreadCollection.i b/lldb/bindings/interface/SBThreadCollection.i
similarity index 100%
rename from lldb/scripts/interface/SBThreadCollection.i
rename to lldb/bindings/interface/SBThreadCollection.i

diff  --git a/lldb/scripts/interface/SBThreadPlan.i b/lldb/bindings/interface/SBThreadPlan.i
similarity index 100%
rename from lldb/scripts/interface/SBThreadPlan.i
rename to lldb/bindings/interface/SBThreadPlan.i

diff  --git a/lldb/scripts/interface/SBTrace.i b/lldb/bindings/interface/SBTrace.i
similarity index 100%
rename from lldb/scripts/interface/SBTrace.i
rename to lldb/bindings/interface/SBTrace.i

diff  --git a/lldb/scripts/interface/SBTraceOptions.i b/lldb/bindings/interface/SBTraceOptions.i
similarity index 100%
rename from lldb/scripts/interface/SBTraceOptions.i
rename to lldb/bindings/interface/SBTraceOptions.i

diff  --git a/lldb/scripts/interface/SBType.i b/lldb/bindings/interface/SBType.i
similarity index 100%
rename from lldb/scripts/interface/SBType.i
rename to lldb/bindings/interface/SBType.i

diff  --git a/lldb/scripts/interface/SBTypeCategory.i b/lldb/bindings/interface/SBTypeCategory.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeCategory.i
rename to lldb/bindings/interface/SBTypeCategory.i

diff  --git a/lldb/scripts/interface/SBTypeEnumMember.i b/lldb/bindings/interface/SBTypeEnumMember.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeEnumMember.i
rename to lldb/bindings/interface/SBTypeEnumMember.i

diff  --git a/lldb/scripts/interface/SBTypeFilter.i b/lldb/bindings/interface/SBTypeFilter.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeFilter.i
rename to lldb/bindings/interface/SBTypeFilter.i

diff  --git a/lldb/scripts/interface/SBTypeFormat.i b/lldb/bindings/interface/SBTypeFormat.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeFormat.i
rename to lldb/bindings/interface/SBTypeFormat.i

diff  --git a/lldb/scripts/interface/SBTypeNameSpecifier.i b/lldb/bindings/interface/SBTypeNameSpecifier.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeNameSpecifier.i
rename to lldb/bindings/interface/SBTypeNameSpecifier.i

diff  --git a/lldb/scripts/interface/SBTypeSummary.i b/lldb/bindings/interface/SBTypeSummary.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeSummary.i
rename to lldb/bindings/interface/SBTypeSummary.i

diff  --git a/lldb/scripts/interface/SBTypeSynthetic.i b/lldb/bindings/interface/SBTypeSynthetic.i
similarity index 100%
rename from lldb/scripts/interface/SBTypeSynthetic.i
rename to lldb/bindings/interface/SBTypeSynthetic.i

diff  --git a/lldb/scripts/interface/SBUnixSignals.i b/lldb/bindings/interface/SBUnixSignals.i
similarity index 100%
rename from lldb/scripts/interface/SBUnixSignals.i
rename to lldb/bindings/interface/SBUnixSignals.i

diff  --git a/lldb/scripts/interface/SBValue.i b/lldb/bindings/interface/SBValue.i
similarity index 100%
rename from lldb/scripts/interface/SBValue.i
rename to lldb/bindings/interface/SBValue.i

diff  --git a/lldb/scripts/interface/SBValueList.i b/lldb/bindings/interface/SBValueList.i
similarity index 100%
rename from lldb/scripts/interface/SBValueList.i
rename to lldb/bindings/interface/SBValueList.i

diff  --git a/lldb/scripts/interface/SBVariablesOptions.i b/lldb/bindings/interface/SBVariablesOptions.i
similarity index 100%
rename from lldb/scripts/interface/SBVariablesOptions.i
rename to lldb/bindings/interface/SBVariablesOptions.i

diff  --git a/lldb/scripts/interface/SBWatchpoint.i b/lldb/bindings/interface/SBWatchpoint.i
similarity index 100%
rename from lldb/scripts/interface/SBWatchpoint.i
rename to lldb/bindings/interface/SBWatchpoint.i

diff  --git a/lldb/scripts/interfaces.swig b/lldb/bindings/interfaces.swig
similarity index 99%
rename from lldb/scripts/interfaces.swig
rename to lldb/bindings/interfaces.swig
index cc6bb91febda..780fe34392ff 100644
--- a/lldb/scripts/interfaces.swig
+++ b/lldb/bindings/interfaces.swig
@@ -32,8 +32,8 @@
 %include "./interface/SBEvent.i"
 %include "./interface/SBExecutionContext.i"
 %include "./interface/SBExpressionOptions.i"
-%include "./interface/SBFileSpec.i"
 %include "./interface/SBFile.i"
+%include "./interface/SBFileSpec.i"
 %include "./interface/SBFileSpecList.i"
 %include "./interface/SBFrame.i"
 %include "./interface/SBFunction.i"
@@ -75,9 +75,8 @@
 %include "./interface/SBTypeNameSpecifier.i"
 %include "./interface/SBTypeSummary.i"
 %include "./interface/SBTypeSynthetic.i"
+%include "./interface/SBUnixSignals.i"
 %include "./interface/SBValue.i"
 %include "./interface/SBValueList.i"
 %include "./interface/SBVariablesOptions.i"
 %include "./interface/SBWatchpoint.i"
-%include "./interface/SBUnixSignals.i"
-

diff  --git a/lldb/scripts/lldb_lua.swig b/lldb/bindings/lua.swig
similarity index 100%
rename from lldb/scripts/lldb_lua.swig
rename to lldb/bindings/lua.swig

diff  --git a/lldb/scripts/macros.swig b/lldb/bindings/macros.swig
similarity index 100%
rename from lldb/scripts/macros.swig
rename to lldb/bindings/macros.swig

diff  --git a/lldb/scripts/lldb.swig b/lldb/bindings/python.swig
similarity index 98%
rename from lldb/scripts/lldb.swig
rename to lldb/bindings/python.swig
index bebf9bf534a3..cf716da4a477 100644
--- a/lldb/scripts/lldb.swig
+++ b/lldb/bindings/python.swig
@@ -117,7 +117,7 @@ def lldb_iter(obj, getsize, getelem):
 
 %{
 #include "../source/Plugins/ScriptInterpreter/Python/PythonDataObjects.h"
-#include "../scripts/Python/python-swigsafecast.swig"
+#include "../bindings/python/python-swigsafecast.swig"
 using namespace lldb_private;
 using namespace lldb_private::python;
 using namespace lldb;

diff  --git a/lldb/scripts/Python/createPythonInit.py b/lldb/bindings/python/createPythonInit.py
similarity index 100%
rename from lldb/scripts/Python/createPythonInit.py
rename to lldb/bindings/python/createPythonInit.py

diff  --git a/lldb/scripts/Python/python-extensions.swig b/lldb/bindings/python/python-extensions.swig
similarity index 100%
rename from lldb/scripts/Python/python-extensions.swig
rename to lldb/bindings/python/python-extensions.swig

diff  --git a/lldb/scripts/Python/python-swigsafecast.swig b/lldb/bindings/python/python-swigsafecast.swig
similarity index 100%
rename from lldb/scripts/Python/python-swigsafecast.swig
rename to lldb/bindings/python/python-swigsafecast.swig

diff  --git a/lldb/scripts/Python/python-typemaps.swig b/lldb/bindings/python/python-typemaps.swig
similarity index 100%
rename from lldb/scripts/Python/python-typemaps.swig
rename to lldb/bindings/python/python-typemaps.swig

diff  --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/bindings/python/python-wrapper.swig
similarity index 100%
rename from lldb/scripts/Python/python-wrapper.swig
rename to lldb/bindings/python/python-wrapper.swig

diff  --git a/lldb/docs/CMakeLists.txt b/lldb/docs/CMakeLists.txt
index 0082d004bd0d..8fa46860e5ce 100644
--- a/lldb/docs/CMakeLists.txt
+++ b/lldb/docs/CMakeLists.txt
@@ -30,9 +30,9 @@ if (LLDB_ENABLE_PYTHON)
     # Because we don't build liblldb, epydoc will complain that the import of
     # _lldb.so failed, but that doesn't prevent it from generating the docs.
     file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lldb)
-    get_target_property(lldb_scripts_dir swig_wrapper BINARY_DIR)
+    get_target_property(lldb_bindings_dir swig_wrapper BINARY_DIR)
     add_custom_target(lldb-python-doc-package
-      COMMAND "${CMAKE_COMMAND}" -E copy "${lldb_scripts_dir}/lldb.py" "${CMAKE_CURRENT_BINARY_DIR}/lldb/__init__.py"
+      COMMAND "${CMAKE_COMMAND}" -E copy "${lldb_bindings_dir}/lldb.py" "${CMAKE_CURRENT_BINARY_DIR}/lldb/__init__.py"
       COMMENT "Copying lldb.py to pretend package.")
     add_dependencies(lldb-python-doc-package swig_wrapper)
 

diff  --git a/lldb/source/API/CMakeLists.txt b/lldb/source/API/CMakeLists.txt
index eea409bed185..e0ecf29b502b 100644
--- a/lldb/source/API/CMakeLists.txt
+++ b/lldb/source/API/CMakeLists.txt
@@ -5,13 +5,13 @@ endif()
 get_property(LLDB_ALL_PLUGINS GLOBAL PROPERTY LLDB_PLUGINS)
 
 if(LLDB_ENABLE_PYTHON)
-  get_target_property(lldb_scripts_dir swig_wrapper BINARY_DIR)
-  set(lldb_python_wrapper ${lldb_scripts_dir}/LLDBWrapPython.cpp)
+  get_target_property(lldb_bindings_dir swig_wrapper BINARY_DIR)
+  set(lldb_python_wrapper ${lldb_bindings_dir}/LLDBWrapPython.cpp)
 endif()
 
 if(LLDB_ENABLE_LUA)
-  get_target_property(lldb_scripts_dir swig_wrapper_lua BINARY_DIR)
-  set(lldb_lua_wrapper ${lldb_scripts_dir}/LLDBWrapLua.cpp)
+  get_target_property(lldb_bindings_dir swig_wrapper_lua BINARY_DIR)
+  set(lldb_lua_wrapper ${lldb_bindings_dir}/LLDBWrapLua.cpp)
 endif()
 
 if(LLDB_BUILD_FRAMEWORK)

More information about the lldb-commits mailing list