diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -56,7 +56,7 @@ 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 @@ 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 @@ # 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 @@ 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 @@ 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 rename from lldb/scripts/CMakeLists.txt rename to lldb/bindings/CMakeLists.txt --- 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 @@ -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 @@ -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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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 rename from lldb/scripts/interfaces.swig rename to lldb/bindings/interfaces.swig --- 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 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 rename from lldb/scripts/macros.swig rename to lldb/bindings/macros.swig diff --git a/lldb/scripts/lldb.swig b/lldb/bindings/python.swig rename from lldb/scripts/lldb.swig rename to lldb/bindings/python.swig --- a/lldb/scripts/lldb.swig +++ b/lldb/bindings/python.swig @@ -117,7 +117,7 @@ %{ #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 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 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 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 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 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 --- a/lldb/docs/CMakeLists.txt +++ b/lldb/docs/CMakeLists.txt @@ -30,9 +30,9 @@ # 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 --- a/lldb/source/API/CMakeLists.txt +++ b/lldb/source/API/CMakeLists.txt @@ -5,13 +5,13 @@ 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)