From dbce160c77c6bc28f42b506cd6fbfc2bd051621f Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 25 Aug 2023 22:45:08 +0800 Subject: add emmylua debugger --- xmake/core/base/debugger.lua | 66 ++++++++++++++++++++++++++++++++++++++++++++ xmake/core/main.lua | 13 +++++++-- 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 xmake/core/base/debugger.lua diff --git a/xmake/core/base/debugger.lua b/xmake/core/base/debugger.lua new file mode 100644 index 000000000..535c70831 --- /dev/null +++ b/xmake/core/base/debugger.lua @@ -0,0 +1,66 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- Copyright (C) 2015-present, TBOOX Open Source Group. +-- +-- @author ruki +-- @file debugger.lua +-- + +-- define module +local debugger = {} + +-- load modules +local os = require("base/os") +local path = require("base/path") + +-- start emmylua debugger +function debugger:_start_emmylua_debugger() + local debugger_libfile = os.getenv("EMMYLUA_DEBUGGER") + local script, errors = package.loadlib(debugger_libfile) + if not script then + return false, errors + end + local debugger_inst = script() + if not debugger_inst then + return false, "cannot get debugger module!" + end + debugger_inst.tcpListen("localhost", 9966) + debugger_inst.waitIDE() + debugger_inst.breakHere() +end + +-- start debugging +function debugger:start() + if self:has_emmylua() then + return self:_start_emmylua_debugger() + end +end + +-- has emmylua debugger? +function debugger:has_emmylua() + local debugger_libfile = os.getenv("EMMYLUA_DEBUGGER") + if debugger_libfile and os.isfile(debugger_libfile) then + return true + end +end + +-- debugger is enabled? +function debugger:enabled() + return self:has_emmylua() +end + +-- return module +return debugger + diff --git a/xmake/core/main.lua b/xmake/core/main.lua index bb883d659..796a69b44 100644 --- a/xmake/core/main.lua +++ b/xmake/core/main.lua @@ -40,6 +40,7 @@ local config = require("project/config") local project = require("project/project") local localcache = require("cache/localcache") local profiler = require("base/profiler") +local debugger = require("base/debugger") -- init the option menu local menu = @@ -139,6 +140,14 @@ end -- the init function for main function main._init() + -- start debugger + if debugger:enabled() then + local ok, errors = debugger:start() + if not ok then + return false, errors + end + end + -- disable scheduler first scheduler:enable(false) @@ -148,9 +157,9 @@ function main._init() -- e.g. `xmake f -c -P xxx` will be parsed as `-c=-P`, it's incorrect. -- -- maybe we will improve this later - local options, err = main._basicparse() + local options, errors = main._basicparse() if not options then - return false, err + return false, errors end -- init project paths only for xmake engine -- cgit v1.3.1 From 98aae2126c80d4e0f3019675666c5c09b4e021f8 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 25 Aug 2023 22:54:41 +0800 Subject: fix load symbols --- xmake/core/base/debugger.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmake/core/base/debugger.lua b/xmake/core/base/debugger.lua index 535c70831..65267d21d 100644 --- a/xmake/core/base/debugger.lua +++ b/xmake/core/base/debugger.lua @@ -28,7 +28,7 @@ local path = require("base/path") -- start emmylua debugger function debugger:_start_emmylua_debugger() local debugger_libfile = os.getenv("EMMYLUA_DEBUGGER") - local script, errors = package.loadlib(debugger_libfile) + local script, errors = package.loadlib(debugger_libfile, "luaopen_emmy_core") if not script then return false, errors end -- cgit v1.3.1 From ad2f9e0aea89b1886aa2d15e1d08c8f0ac786e4d Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 25 Aug 2023 22:54:50 +0800 Subject: add comment --- xmake/core/base/debugger.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xmake/core/base/debugger.lua b/xmake/core/base/debugger.lua index 65267d21d..baeedf684 100644 --- a/xmake/core/base/debugger.lua +++ b/xmake/core/base/debugger.lua @@ -26,6 +26,11 @@ local os = require("base/os") local path = require("base/path") -- start emmylua debugger +-- +-- e.g. +-- +-- xrepo env -b emmylua_debugger xmake --version +-- function debugger:_start_emmylua_debugger() local debugger_libfile = os.getenv("EMMYLUA_DEBUGGER") local script, errors = package.loadlib(debugger_libfile, "luaopen_emmy_core") -- cgit v1.3.1 From 52ac92a586cb42a008906ef67a921050d22a64bc Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 25 Aug 2023 22:57:35 +0800 Subject: fix return state --- xmake/core/base/debugger.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/xmake/core/base/debugger.lua b/xmake/core/base/debugger.lua index baeedf684..87762bceb 100644 --- a/xmake/core/base/debugger.lua +++ b/xmake/core/base/debugger.lua @@ -44,6 +44,7 @@ function debugger:_start_emmylua_debugger() debugger_inst.tcpListen("localhost", 9966) debugger_inst.waitIDE() debugger_inst.breakHere() + return true end -- start debugging -- cgit v1.3.1