80 files changed, 17 insertions, 18 deletions

diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt
index 6170ab625c5..573b8556989 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
index 515c63293bc..92ae402c478 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
index 69fd28e33c5..69fd28e33c5 100644
--- a/lldb/scripts/headers.swig
+++ b/lldb/bindings/headers.swig
diff --git a/lldb/scripts/interface/SBAddress.i b/lldb/bindings/interface/SBAddress.i
index 4658534d153..4658534d153 100644
--- a/lldb/scripts/interface/SBAddress.i
+++ b/lldb/bindings/interface/SBAddress.i
diff --git a/lldb/scripts/interface/SBAttachInfo.i b/lldb/bindings/interface/SBAttachInfo.i
index 3f4634e1461..3f4634e1461 100644
--- a/lldb/scripts/interface/SBAttachInfo.i
+++ b/lldb/bindings/interface/SBAttachInfo.i
diff --git a/lldb/scripts/interface/SBBlock.i b/lldb/bindings/interface/SBBlock.i
index 8bd8e37953c..8bd8e37953c 100644
--- a/lldb/scripts/interface/SBBlock.i
+++ b/lldb/bindings/interface/SBBlock.i
diff --git a/lldb/scripts/interface/SBBreakpoint.i b/lldb/bindings/interface/SBBreakpoint.i
index 20354346be9..20354346be9 100644
--- a/lldb/scripts/interface/SBBreakpoint.i
+++ b/lldb/bindings/interface/SBBreakpoint.i
diff --git a/lldb/scripts/interface/SBBreakpointLocation.i b/lldb/bindings/interface/SBBreakpointLocation.i
index dc39c83c2d6..dc39c83c2d6 100644
--- a/lldb/scripts/interface/SBBreakpointLocation.i
+++ b/lldb/bindings/interface/SBBreakpointLocation.i
diff --git a/lldb/scripts/interface/SBBreakpointName.i b/lldb/bindings/interface/SBBreakpointName.i
index e280d422459..e280d422459 100644
--- a/lldb/scripts/interface/SBBreakpointName.i
+++ b/lldb/bindings/interface/SBBreakpointName.i
diff --git a/lldb/scripts/interface/SBBroadcaster.i b/lldb/bindings/interface/SBBroadcaster.i
index 79100e171b4..79100e171b4 100644
--- a/lldb/scripts/interface/SBBroadcaster.i
+++ b/lldb/bindings/interface/SBBroadcaster.i
diff --git a/lldb/scripts/interface/SBCommandInterpreter.i b/lldb/bindings/interface/SBCommandInterpreter.i
index ad2e8f1662c..ad2e8f1662c 100644
--- a/lldb/scripts/interface/SBCommandInterpreter.i
+++ b/lldb/bindings/interface/SBCommandInterpreter.i
diff --git a/lldb/scripts/interface/SBCommandReturnObject.i b/lldb/bindings/interface/SBCommandReturnObject.i
index affa16520f2..affa16520f2 100644
--- a/lldb/scripts/interface/SBCommandReturnObject.i
+++ b/lldb/bindings/interface/SBCommandReturnObject.i
diff --git a/lldb/scripts/interface/SBCommunication.i b/lldb/bindings/interface/SBCommunication.i
index 87d3d0c9c5e..87d3d0c9c5e 100644
--- a/lldb/scripts/interface/SBCommunication.i
+++ b/lldb/bindings/interface/SBCommunication.i
diff --git a/lldb/scripts/interface/SBCompileUnit.i b/lldb/bindings/interface/SBCompileUnit.i
index d6a4c07038c..d6a4c07038c 100644
--- a/lldb/scripts/interface/SBCompileUnit.i
+++ b/lldb/bindings/interface/SBCompileUnit.i
diff --git a/lldb/scripts/interface/SBData.i b/lldb/bindings/interface/SBData.i
index 3e74240329e..3e74240329e 100644
--- a/lldb/scripts/interface/SBData.i
+++ b/lldb/bindings/interface/SBData.i
diff --git a/lldb/scripts/interface/SBDebugger.i b/lldb/bindings/interface/SBDebugger.i
index f2e23a7ed78..f2e23a7ed78 100644
--- a/lldb/scripts/interface/SBDebugger.i
+++ b/lldb/bindings/interface/SBDebugger.i
diff --git a/lldb/scripts/interface/SBDeclaration.i b/lldb/bindings/interface/SBDeclaration.i
index 621c1a0ab7c..621c1a0ab7c 100644
--- a/lldb/scripts/interface/SBDeclaration.i
+++ b/lldb/bindings/interface/SBDeclaration.i
diff --git a/lldb/scripts/interface/SBError.i b/lldb/bindings/interface/SBError.i
index ea48e2263a7..ea48e2263a7 100644
--- a/lldb/scripts/interface/SBError.i
+++ b/lldb/bindings/interface/SBError.i
diff --git a/lldb/scripts/interface/SBEvent.i b/lldb/bindings/interface/SBEvent.i
index 99aa5319e37..99aa5319e37 100644
--- a/lldb/scripts/interface/SBEvent.i
+++ b/lldb/bindings/interface/SBEvent.i
diff --git a/lldb/scripts/interface/SBExecutionContext.i b/lldb/bindings/interface/SBExecutionContext.i
index 46968d04ae3..46968d04ae3 100644
--- a/lldb/scripts/interface/SBExecutionContext.i
+++ b/lldb/bindings/interface/SBExecutionContext.i
diff --git a/lldb/scripts/interface/SBExpressionOptions.i b/lldb/bindings/interface/SBExpressionOptions.i
index 5dbd7007c01..5dbd7007c01 100644
--- a/lldb/scripts/interface/SBExpressionOptions.i
+++ b/lldb/bindings/interface/SBExpressionOptions.i
diff --git a/lldb/scripts/interface/SBFile.i b/lldb/bindings/interface/SBFile.i
index a19666995cd..a19666995cd 100644
--- a/lldb/scripts/interface/SBFile.i
+++ b/lldb/bindings/interface/SBFile.i
diff --git a/lldb/scripts/interface/SBFileSpec.i b/lldb/bindings/interface/SBFileSpec.i
index d287a940c05..d287a940c05 100644
--- a/lldb/scripts/interface/SBFileSpec.i
+++ b/lldb/bindings/interface/SBFileSpec.i
diff --git a/lldb/scripts/interface/SBFileSpecList.i b/lldb/bindings/interface/SBFileSpecList.i
index 96641613f45..96641613f45 100644
--- a/lldb/scripts/interface/SBFileSpecList.i
+++ b/lldb/bindings/interface/SBFileSpecList.i
diff --git a/lldb/scripts/interface/SBFrame.i b/lldb/bindings/interface/SBFrame.i
index c65b88f863e..c65b88f863e 100644
--- a/lldb/scripts/interface/SBFrame.i
+++ b/lldb/bindings/interface/SBFrame.i
diff --git a/lldb/scripts/interface/SBFunction.i b/lldb/bindings/interface/SBFunction.i
index 630c4db22c5..630c4db22c5 100644
--- a/lldb/scripts/interface/SBFunction.i
+++ b/lldb/bindings/interface/SBFunction.i
diff --git a/lldb/scripts/interface/SBHostOS.i b/lldb/bindings/interface/SBHostOS.i
index 14f4186cb9f..14f4186cb9f 100644
--- a/lldb/scripts/interface/SBHostOS.i
+++ b/lldb/bindings/interface/SBHostOS.i
diff --git a/lldb/scripts/interface/SBInstruction.i b/lldb/bindings/interface/SBInstruction.i
index d50a080fd04..d50a080fd04 100644
--- a/lldb/scripts/interface/SBInstruction.i
+++ b/lldb/bindings/interface/SBInstruction.i
diff --git a/lldb/scripts/interface/SBInstructionList.i b/lldb/bindings/interface/SBInstructionList.i
index 13573230275..13573230275 100644
--- a/lldb/scripts/interface/SBInstructionList.i
+++ b/lldb/bindings/interface/SBInstructionList.i
diff --git a/lldb/scripts/interface/SBLanguageRuntime.i b/lldb/bindings/interface/SBLanguageRuntime.i
index f28170b9ce7..f28170b9ce7 100644
--- a/lldb/scripts/interface/SBLanguageRuntime.i
+++ b/lldb/bindings/interface/SBLanguageRuntime.i
diff --git a/lldb/scripts/interface/SBLaunchInfo.i b/lldb/bindings/interface/SBLaunchInfo.i
index e76950c6fb4..e76950c6fb4 100644
--- a/lldb/scripts/interface/SBLaunchInfo.i
+++ b/lldb/bindings/interface/SBLaunchInfo.i
diff --git a/lldb/scripts/interface/SBLineEntry.i b/lldb/bindings/interface/SBLineEntry.i
index be365377ba8..be365377ba8 100644
--- a/lldb/scripts/interface/SBLineEntry.i
+++ b/lldb/bindings/interface/SBLineEntry.i
diff --git a/lldb/scripts/interface/SBListener.i b/lldb/bindings/interface/SBListener.i
index 535aef9f0ae..535aef9f0ae 100644
--- a/lldb/scripts/interface/SBListener.i
+++ b/lldb/bindings/interface/SBListener.i
diff --git a/lldb/scripts/interface/SBMemoryRegionInfo.i b/lldb/bindings/interface/SBMemoryRegionInfo.i
index 6a2ad6a3e36..6a2ad6a3e36 100644
--- a/lldb/scripts/interface/SBMemoryRegionInfo.i
+++ b/lldb/bindings/interface/SBMemoryRegionInfo.i
diff --git a/lldb/scripts/interface/SBMemoryRegionInfoList.i b/lldb/bindings/interface/SBMemoryRegionInfoList.i
index e408fc0f88b..e408fc0f88b 100644
--- a/lldb/scripts/interface/SBMemoryRegionInfoList.i
+++ b/lldb/bindings/interface/SBMemoryRegionInfoList.i
diff --git a/lldb/scripts/interface/SBModule.i b/lldb/bindings/interface/SBModule.i
index a9d9480cd7c..a9d9480cd7c 100644
--- a/lldb/scripts/interface/SBModule.i
+++ b/lldb/bindings/interface/SBModule.i
diff --git a/lldb/scripts/interface/SBModuleSpec.i b/lldb/bindings/interface/SBModuleSpec.i
index 64d0aa641a7..64d0aa641a7 100644
--- a/lldb/scripts/interface/SBModuleSpec.i
+++ b/lldb/bindings/interface/SBModuleSpec.i
diff --git a/lldb/scripts/interface/SBPlatform.i b/lldb/bindings/interface/SBPlatform.i
index 9baa2eb970c..9baa2eb970c 100644
--- a/lldb/scripts/interface/SBPlatform.i
+++ b/lldb/bindings/interface/SBPlatform.i
diff --git a/lldb/scripts/interface/SBProcess.i b/lldb/bindings/interface/SBProcess.i
index ac6a265faec..ac6a265faec 100644
--- a/lldb/scripts/interface/SBProcess.i
+++ b/lldb/bindings/interface/SBProcess.i
diff --git a/lldb/scripts/interface/SBProcessInfo.i b/lldb/bindings/interface/SBProcessInfo.i
index 009842599bf..009842599bf 100644
--- a/lldb/scripts/interface/SBProcessInfo.i
+++ b/lldb/bindings/interface/SBProcessInfo.i
diff --git a/lldb/scripts/interface/SBQueue.i b/lldb/bindings/interface/SBQueue.i
index f209d59f1bf..f209d59f1bf 100644
--- a/lldb/scripts/interface/SBQueue.i
+++ b/lldb/bindings/interface/SBQueue.i
diff --git a/lldb/scripts/interface/SBQueueItem.i b/lldb/bindings/interface/SBQueueItem.i
index 089771e8037..089771e8037 100644
--- a/lldb/scripts/interface/SBQueueItem.i
+++ b/lldb/bindings/interface/SBQueueItem.i
diff --git a/lldb/scripts/interface/SBSection.i b/lldb/bindings/interface/SBSection.i
index 3d1c900917f..3d1c900917f 100644
--- a/lldb/scripts/interface/SBSection.i
+++ b/lldb/bindings/interface/SBSection.i
diff --git a/lldb/scripts/interface/SBSourceManager.i b/lldb/bindings/interface/SBSourceManager.i
index dfbdc612a06..dfbdc612a06 100644
--- a/lldb/scripts/interface/SBSourceManager.i
+++ b/lldb/bindings/interface/SBSourceManager.i
diff --git a/lldb/scripts/interface/SBStream.i b/lldb/bindings/interface/SBStream.i
index 31fb3802bf6..31fb3802bf6 100644
--- a/lldb/scripts/interface/SBStream.i
+++ b/lldb/bindings/interface/SBStream.i
diff --git a/lldb/scripts/interface/SBStringList.i b/lldb/bindings/interface/SBStringList.i
index c8e1e357ed2..c8e1e357ed2 100644
--- a/lldb/scripts/interface/SBStringList.i
+++ b/lldb/bindings/interface/SBStringList.i
diff --git a/lldb/scripts/interface/SBStructuredData.i b/lldb/bindings/interface/SBStructuredData.i
index c7601bf6cf9..c7601bf6cf9 100644
--- a/lldb/scripts/interface/SBStructuredData.i
+++ b/lldb/bindings/interface/SBStructuredData.i
diff --git a/lldb/scripts/interface/SBSymbol.i b/lldb/bindings/interface/SBSymbol.i
index 4e17ab5af0f..4e17ab5af0f 100644
--- a/lldb/scripts/interface/SBSymbol.i
+++ b/lldb/bindings/interface/SBSymbol.i
diff --git a/lldb/scripts/interface/SBSymbolContext.i b/lldb/bindings/interface/SBSymbolContext.i
index b6b336516c9..b6b336516c9 100644
--- a/lldb/scripts/interface/SBSymbolContext.i
+++ b/lldb/bindings/interface/SBSymbolContext.i
diff --git a/lldb/scripts/interface/SBSymbolContextList.i b/lldb/bindings/interface/SBSymbolContextList.i
index f5adcfcebfb..f5adcfcebfb 100644
--- a/lldb/scripts/interface/SBSymbolContextList.i
+++ b/lldb/bindings/interface/SBSymbolContextList.i
diff --git a/lldb/scripts/interface/SBTarget.i b/lldb/bindings/interface/SBTarget.i
index 371bf5c35eb..371bf5c35eb 100644
--- a/lldb/scripts/interface/SBTarget.i
+++ b/lldb/bindings/interface/SBTarget.i
diff --git a/lldb/scripts/interface/SBThread.i b/lldb/bindings/interface/SBThread.i
index 95b15b182ec..95b15b182ec 100644
--- a/lldb/scripts/interface/SBThread.i
+++ b/lldb/bindings/interface/SBThread.i
diff --git a/lldb/scripts/interface/SBThreadCollection.i b/lldb/bindings/interface/SBThreadCollection.i
index c2d9d8318dc..c2d9d8318dc 100644
--- a/lldb/scripts/interface/SBThreadCollection.i
+++ b/lldb/bindings/interface/SBThreadCollection.i
diff --git a/lldb/scripts/interface/SBThreadPlan.i b/lldb/bindings/interface/SBThreadPlan.i
index 36131d529b7..36131d529b7 100644
--- a/lldb/scripts/interface/SBThreadPlan.i
+++ b/lldb/bindings/interface/SBThreadPlan.i
diff --git a/lldb/scripts/interface/SBTrace.i b/lldb/bindings/interface/SBTrace.i
index a4cb2667ec1..a4cb2667ec1 100644
--- a/lldb/scripts/interface/SBTrace.i
+++ b/lldb/bindings/interface/SBTrace.i
diff --git a/lldb/scripts/interface/SBTraceOptions.i b/lldb/bindings/interface/SBTraceOptions.i
index ce17af5376c..ce17af5376c 100644
--- a/lldb/scripts/interface/SBTraceOptions.i
+++ b/lldb/bindings/interface/SBTraceOptions.i
diff --git a/lldb/scripts/interface/SBType.i b/lldb/bindings/interface/SBType.i
index 3cd82452084..3cd82452084 100644
--- a/lldb/scripts/interface/SBType.i
+++ b/lldb/bindings/interface/SBType.i
diff --git a/lldb/scripts/interface/SBTypeCategory.i b/lldb/bindings/interface/SBTypeCategory.i
index b762bf8a95a..b762bf8a95a 100644
--- a/lldb/scripts/interface/SBTypeCategory.i
+++ b/lldb/bindings/interface/SBTypeCategory.i
diff --git a/lldb/scripts/interface/SBTypeEnumMember.i b/lldb/bindings/interface/SBTypeEnumMember.i
index 006bdeaa8ce..006bdeaa8ce 100644
--- a/lldb/scripts/interface/SBTypeEnumMember.i
+++ b/lldb/bindings/interface/SBTypeEnumMember.i
diff --git a/lldb/scripts/interface/SBTypeFilter.i b/lldb/bindings/interface/SBTypeFilter.i
index c1d282c6d4f..c1d282c6d4f 100644
--- a/lldb/scripts/interface/SBTypeFilter.i
+++ b/lldb/bindings/interface/SBTypeFilter.i
diff --git a/lldb/scripts/interface/SBTypeFormat.i b/lldb/bindings/interface/SBTypeFormat.i
index 765a2a7bb99..765a2a7bb99 100644
--- a/lldb/scripts/interface/SBTypeFormat.i
+++ b/lldb/bindings/interface/SBTypeFormat.i
diff --git a/lldb/scripts/interface/SBTypeNameSpecifier.i b/lldb/bindings/interface/SBTypeNameSpecifier.i
index 772f7c17409..772f7c17409 100644
--- a/lldb/scripts/interface/SBTypeNameSpecifier.i
+++ b/lldb/bindings/interface/SBTypeNameSpecifier.i
diff --git a/lldb/scripts/interface/SBTypeSummary.i b/lldb/bindings/interface/SBTypeSummary.i
index adcc79b5a6e..adcc79b5a6e 100644
--- a/lldb/scripts/interface/SBTypeSummary.i
+++ b/lldb/bindings/interface/SBTypeSummary.i
diff --git a/lldb/scripts/interface/SBTypeSynthetic.i b/lldb/bindings/interface/SBTypeSynthetic.i
index f57139ebf9f..f57139ebf9f 100644
--- a/lldb/scripts/interface/SBTypeSynthetic.i
+++ b/lldb/bindings/interface/SBTypeSynthetic.i
diff --git a/lldb/scripts/interface/SBUnixSignals.i b/lldb/bindings/interface/SBUnixSignals.i
index 8fe3e2a3911..8fe3e2a3911 100644
--- a/lldb/scripts/interface/SBUnixSignals.i
+++ b/lldb/bindings/interface/SBUnixSignals.i
diff --git a/lldb/scripts/interface/SBValue.i b/lldb/bindings/interface/SBValue.i
index fb899805c39..fb899805c39 100644
--- a/lldb/scripts/interface/SBValue.i
+++ b/lldb/bindings/interface/SBValue.i
diff --git a/lldb/scripts/interface/SBValueList.i b/lldb/bindings/interface/SBValueList.i
index 17ba2056f0c..17ba2056f0c 100644
--- a/lldb/scripts/interface/SBValueList.i
+++ b/lldb/bindings/interface/SBValueList.i
diff --git a/lldb/scripts/interface/SBVariablesOptions.i b/lldb/bindings/interface/SBVariablesOptions.i
index 362f7159d7d..362f7159d7d 100644
--- a/lldb/scripts/interface/SBVariablesOptions.i
+++ b/lldb/bindings/interface/SBVariablesOptions.i
diff --git a/lldb/scripts/interface/SBWatchpoint.i b/lldb/bindings/interface/SBWatchpoint.i
index cb0bc5f9859..cb0bc5f9859 100644
--- a/lldb/scripts/interface/SBWatchpoint.i
+++ b/lldb/bindings/interface/SBWatchpoint.i
diff --git a/lldb/scripts/interfaces.swig b/lldb/bindings/interfaces.swig
index cc6bb91febd..780fe34392f 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
index 3b279a6b69e..3b279a6b69e 100644
--- a/lldb/scripts/lldb_lua.swig
+++ b/lldb/bindings/lua.swig
diff --git a/lldb/scripts/macros.swig b/lldb/bindings/macros.swig
index 0387f27f3cb..0387f27f3cb 100644
--- a/lldb/scripts/macros.swig
+++ b/lldb/bindings/macros.swig
diff --git a/lldb/scripts/lldb.swig b/lldb/bindings/python.swig
index bebf9bf534a..cf716da4a47 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
index 3deb9159b70..3deb9159b70 100644
--- a/lldb/scripts/Python/createPythonInit.py
+++ b/lldb/bindings/python/createPythonInit.py
diff --git a/lldb/scripts/Python/python-extensions.swig b/lldb/bindings/python/python-extensions.swig
index 0b23fdd4000..0b23fdd4000 100644
--- a/lldb/scripts/Python/python-extensions.swig
+++ b/lldb/bindings/python/python-extensions.swig
diff --git a/lldb/scripts/Python/python-swigsafecast.swig b/lldb/bindings/python/python-swigsafecast.swig
index d5cafbfa67c..d5cafbfa67c 100644
--- a/lldb/scripts/Python/python-swigsafecast.swig
+++ b/lldb/bindings/python/python-swigsafecast.swig
diff --git a/lldb/scripts/Python/python-typemaps.swig b/lldb/bindings/python/python-typemaps.swig
index 2ba380bdf0d..2ba380bdf0d 100644
--- a/lldb/scripts/Python/python-typemaps.swig
+++ b/lldb/bindings/python/python-typemaps.swig
diff --git a/lldb/scripts/Python/python-wrapper.swig b/lldb/bindings/python/python-wrapper.swig
index 3a63165cf58..3a63165cf58 100644
--- a/lldb/scripts/Python/python-wrapper.swig
+++ b/lldb/bindings/python/python-wrapper.swig
diff --git a/lldb/docs/CMakeLists.txt b/lldb/docs/CMakeLists.txt
index 0082d004bd0..8fa46860e5c 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 eea409bed18..e0ecf29b502 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)