This revision was automatically updated to reflect the committed changes.
Closed by commit rG6498aff249a1: [lldb/Bindings] Move bindings into their own
subdirectory (authored by JDevlieghere).
Changed prior to commit:
https://reviews.llvm.org/D72437?vs=236968&id=237102#toc
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D72437/new/
https://reviews.llvm.org/D72437
Files:
lldb/CMakeLists.txt
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
lldb/docs/CMakeLists.txt
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
lldb/source/API/CMakeLists.txt
Index: lldb/source/API/CMakeLists.txt
===================================================================
--- lldb/source/API/CMakeLists.txt
+++ 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)
Index: lldb/docs/CMakeLists.txt
===================================================================
--- lldb/docs/CMakeLists.txt
+++ 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)
Index: lldb/bindings/python.swig
===================================================================
--- lldb/bindings/python.swig
+++ 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;
Index: lldb/bindings/interfaces.swig
===================================================================
--- lldb/bindings/interfaces.swig
+++ 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"
-
Index: lldb/bindings/CMakeLists.txt
===================================================================
--- lldb/bindings/CMakeLists.txt
+++ 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")
Index: lldb/CMakeLists.txt
===================================================================
--- lldb/CMakeLists.txt
+++ 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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
