Optional python.

8thMage · Oct 16, 2019 · 1bc433b · 1bc433b
1 parent 2ac8df1
commit 1bc433b
Show file tree

Hide file tree

Showing 20 changed files with 802 additions and 529 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-.vscode
-build*
-target
-node_modules
+.vscode/
+build*/
+target/
+node_modules/
 *.pyc
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -1,6 +1,12 @@
 {
 	"version": "0.2.0",
 	"configurations": [
+		{
+			"type": "lldb",
+			"request": "attach",
+			"name": "Attach",
+			"pid": "${command:pickMyProcess}" // use ${command:pickProcess} to pick other users' processes
+		},
 		{
 			"name": "extension",
 			"preLaunchTask": "make dev_debugging",
@@ -40,14 +46,17 @@
 			"request": "launch",
 			"program": "${workspaceFolder}/build/adapter2/codelldb",
 			"args": [
-				"--preload=${workspaceFolder}/build/lldb/lib/liblldb.so.8.0.1-custom",
+				//"--liblldb=${workspaceFolder}/build/lldb/lib/liblldb.so",
 				"--multi-session",
 				"--port=4711"
 			],
 			"env": {
 				"RUST_LOG": "error,codelldb=debug",
 				"RUST_LOG_STYLE": "always",
 				"RUST_BACKTRACE": "1",
+				// "LLDB_DISABLE_PYTHON": "1",
+				// "LD_DEBUG": "all",
+				// "LD_DEBUG_OUTPUT": "/tmp/codelldb.log"
 			},
 			"sourceLanguages": [
 				"cpp",
@@ -62,7 +71,7 @@
 			"request": "launch",
 			"program": "${workspaceFolder}/build/adapter2/codelldb",
 			"args": [
-				"--preload=${workspaceFolder}/build/lldb/lib/liblldb.8.0.1-custom.dylib",
+				//"--preload=${workspaceFolder}/build/lldb/lib/liblldb.dylib",
 				"--multi-session",
 				"--port=4711"
 			],
@@ -84,7 +93,7 @@
 			"request": "launch",
 			"program": "${workspaceFolder}/build/adapter2/codelldb",
 			"args": [
-				"--preload=${workspaceFolder}/build/lldb/bin/liblldb.dll",
+				//"--preload=${workspaceFolder}/build/lldb/bin/liblldb.dll",
 				"--multi-session",
 				"--port=4711"
 			],
@@ -114,13 +123,27 @@
 			"stopAtEntry": false,
 			"cwd": "${workspaceFolder}",
 			"environment": [
-				{ "name": "PATH", "value":"${env:PATH};C:\\Python36-64;${workspaceFolder}\\build\\lldb\\bin" },
-				{ "name":"RUST_LOG", "value":"error,codelldb=debug"},
-				{ "name":"RUST_LOG_STYLE", "value":"always"},
-				{ "name":"RUST_BACKTRACE", "value":"full"},
+				{
+					"name": "PATH",
+					"value": "${env:PATH};C:\\Python36-64;${workspaceFolder}\\build\\lldb\\bin"
+				},
+				{
+					"name": "RUST_LOG",
+					"value": "error,codelldb=debug"
+				},
+				{
+					"name": "RUST_LOG_STYLE",
+					"value": "always"
+				},
+				{
+					"name": "RUST_BACKTRACE",
+					"value": "full"
+				},
 			],
 			//"externalConsole": true,
-			"sourceFileMap": { "C:\\_work\\4\\s": "c:\\NW\\cpython" }
+			"sourceFileMap": {
+				"C:\\_work\\4\\s": "c:\\NW\\cpython"
+			}
 		},
 		{
 			"name": "codelldb python",
@@ -155,7 +178,6 @@
 				"--test-threads=1"
 			],
 			"env": {
-				"PATH": "${env:PATH}:/usr/lib/llvm-6.0/bin",
 				"RUST_LOG": "debug",
 				"RUST_BACKTRACE": "1",
 			},
@@ -173,8 +195,10 @@
 			"cwd": "${workspaceRoot}/build",
 			"program": "${workspaceRoot}/build/node_modules/mocha/bin/_mocha",
 			"args": [
-				"-u", "tdd",
-				"--timeout", "999999",
+				"-u",
+				"tdd",
+				"--timeout",
+				"999999",
 				"--colors",
 				"--exit",
 				//"-g", "Environment",
@@ -213,5 +237,6 @@
 				"target modules load --file ${env:HOME}/tmp/echo -s 0x4000000000"
 			]
 		},
+
 	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -11,5 +11,5 @@
     "files.insertFinalNewline": true,
     "files.trimTrailingWhitespace": true,
     "python.linting.enabled": false,
-    "lldb.verboseLogging": true
+    "lldb.verboseLogging": true,
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -72,12 +72,6 @@
         "doc_lldb"
       ]
     },
-    {
-      "label": "make test_codelldb",
-      "args": [
-        "test_codelldb"
-      ]
-    },
     {
       "label": "make cargo_test",
       "args": [

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
+project(CodeLLDB)
 
 set(VERSION 1.3.1-dev)
 
@@ -9,6 +10,7 @@ set(LLDB_ROOT $ENV{LLDB_ROOT} CACHE PATH "Root of LLDB build directory")
 if (NOT LLDB_ROOT)
     message(FATAL_ERROR "LLDB_ROOT not set." )
 endif()
+message("Using LLDB from ${LLDB_ROOT}")
 
 set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_INSTALL_PREFIX $ENV{HOME}/.vscode/extensions/vscode-lldb CACHE PATH "Install location")
@@ -103,9 +105,12 @@ set(PackagedFilesFull
     adapter2/*.py
     adapter2/codelldb
     adapter2/libcodelldb.so
+    adapter2/libcodelldb_python.so
     adapter2/libcodelldb.dylib
+    adapter2/libcodelldb_python.dylib
     adapter2/codelldb.exe
     adapter2/codelldb.dll
+    adapter2/codelldb_python.dll
     lldb/bin/**/*
     lldb/lib/**/*
 )