From f01d5364141a3e2a965bd9d46e65a2bd851e27ec Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 30 May 2017 23:14:27 +0800 Subject: add winreg.query and improve program --- xmake/modules/detect/tool/find_vsjitdebugger.lua | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) (limited to 'xmake/modules/detect/tool/find_vsjitdebugger.lua') diff --git a/xmake/modules/detect/tool/find_vsjitdebugger.lua b/xmake/modules/detect/tool/find_vsjitdebugger.lua index bc7b12144..0d3368c72 100644 --- a/xmake/modules/detect/tool/find_vsjitdebugger.lua +++ b/xmake/modules/detect/tool/find_vsjitdebugger.lua @@ -46,16 +46,12 @@ function main(opt) if os.host() ~= "windows" then return end - - -- find program, TODO from winreg - local program = find_program(opt.program or "vsjitdebugger", {}) - - -- find program version - local version = nil - if program and opt and opt.version then - version = find_programver(program) - end - -- ok? - return program, version + -- init options + opt = opt or {} + + -- find program + return find_program(opt.program or "vsjitdebugger", {"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger]" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug;Debugger]"} + , function (program) if not os.isfile(program) then raise() end end) end -- cgit v1.3.1