diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/mime/core.so new file mode 100755 index 0000000..7a66cfd Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/mime/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/socket/core.so new file mode 100755 index 0000000..726deb5 Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.1/socket/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/mime/core.so new file mode 100755 index 0000000..7a66cfd Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/mime/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/socket/core.so new file mode 100755 index 0000000..726deb5 Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.2/socket/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/mime/core.so new file mode 100755 index 0000000..7a66cfd Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/mime/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/socket/core.so new file mode 100755 index 0000000..726deb5 Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.3/socket/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/lua b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/lua new file mode 100755 index 0000000..89be2b7 Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/lua differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/mime/core.so new file mode 100755 index 0000000..7a66cfd Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/mime/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/socket/core.so new file mode 100755 index 0000000..726deb5 Binary files /dev/null and b/luahelper-vscode/debugger/luasocket/mac/arm64/lua5.4/socket/core.so differ diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.1/lua b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.1/lua similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.1/lua rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.1/lua diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.1/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.1/mime/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.1/mime/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.1/mime/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.1/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.1/socket/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.1/socket/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.1/socket/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.2/lua b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.2/lua similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.2/lua rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.2/lua diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.2/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.2/mime/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.2/mime/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.2/mime/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.2/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.2/socket/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.2/socket/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.2/socket/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.3/lua b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.3/lua similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.3/lua rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.3/lua diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.3/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.3/mime/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.3/mime/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.3/mime/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.3/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.3/socket/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.3/socket/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.3/socket/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.4/lua b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.4/lua similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.4/lua rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.4/lua diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.4/mime/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.4/mime/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.4/mime/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.4/mime/core.so diff --git a/luahelper-vscode/debugger/luasocket/mac/lua5.4/socket/core.so b/luahelper-vscode/debugger/luasocket/mac/x64/lua5.4/socket/core.so similarity index 100% rename from luahelper-vscode/debugger/luasocket/mac/lua5.4/socket/core.so rename to luahelper-vscode/debugger/luasocket/mac/x64/lua5.4/socket/core.so diff --git a/luahelper-vscode/src/common/luaPath.ts b/luahelper-vscode/src/common/luaPath.ts index e504f97..9d10018 100644 --- a/luahelper-vscode/src/common/luaPath.ts +++ b/luahelper-vscode/src/common/luaPath.ts @@ -74,6 +74,7 @@ export class LuaPath { let retStr: string = ""; let suffixStr: string = ""; let platform: string = os.platform(); + let arch = os.machine(); switch (platform) { case "win32": let suffixVerStr: string = luaVersionStr.replace(".", ""); @@ -83,7 +84,11 @@ export class LuaPath { suffixStr = "/debugger/luasocket/linux/lua" + luaVersionStr + "/lua"; break; case "darwin": - suffixStr = "/debugger/luasocket/mac/lua" + luaVersionStr + "/lua"; + if (arch === "arm64") { + suffixStr = "/debugger/luasocket/mac/arm64/lua" + luaVersionStr + "/lua"; + } else { + suffixStr = "/debugger/luasocket/mac/x64/lua" + luaVersionStr + "/lua"; + } break; } retStr = stdPath + suffixStr; @@ -99,6 +104,7 @@ export class LuaPath { let retStr: string = ""; let suffixStr: string = ""; let platform: string = os.platform(); + let arch = os.machine(); switch (platform) { case "win32": suffixStr = "/debugger/luasocket/win/x64/lua" + luaVersionStr + "/?.dll"; @@ -107,7 +113,11 @@ export class LuaPath { suffixStr = "/debugger/luasocket/linux/lua" + luaVersionStr + "/?.so"; break; case "darwin": - suffixStr = "/debugger/luasocket/mac/lua" + luaVersionStr + "/?.so"; + if (arch === "arm64") { + suffixStr = "/debugger/luasocket/mac/arm64/lua" + luaVersionStr + "/?.so"; + } else { + suffixStr = "/debugger/luasocket/mac/x64/lua" + luaVersionStr + "/?.so"; + } break; } retStr = stdPath + suffixStr; diff --git a/luahelper-vscode/src/debug/luaDebug.ts b/luahelper-vscode/src/debug/luaDebug.ts index 9723076..ecd96b0 100644 --- a/luahelper-vscode/src/debug/luaDebug.ts +++ b/luahelper-vscode/src/debug/luaDebug.ts @@ -333,8 +333,9 @@ export class LuaDebugSession extends LoggingDebugSession { let runCMD = pathCMD + cpathCMD + reqCMD + doFileCMD; let LuaCMD = strVect[0] + " -e "; - this._debugFileTermianl.sendText(LuaCMD + runCMD, true); this._debugFileTermianl.show(); + //兼容terminal启动耗时较长的情况，延迟发送命令 + setTimeout(() => this._debugFileTermianl.sendText(LuaCMD + runCMD, true), 2000); } else{ // 非单文件调试模式下，拉起program diff --git a/luahelper-vscode/src/extension.ts b/luahelper-vscode/src/extension.ts index 5c32d76..cb7ea12 100644 --- a/luahelper-vscode/src/extension.ts +++ b/luahelper-vscode/src/extension.ts @@ -480,17 +480,31 @@ async function copyLuaSocket() { vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success."); } else if (process.platform === "darwin") { - srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/' + selectWord.label + "/socket"); - let cmdStr1 = "cp -R " + srcCopyDir + " " + dstPath + "/"; - console.log("cmdStr:%s", cmdStr1); - child_process.execSync(cmdStr1); - - srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/' + selectWord.label + "/mime"); - let cmdStr2 = "cp -R " + srcCopyDir + " " + dstPath + "/"; - console.log("cmdStr:%s", cmdStr2); - child_process.execSync(cmdStr2); - - vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success."); + if (process.arch === "arm64") { + srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/arm64/' + selectWord.label + "/socket"); + let cmdStr1 = "cp -R " + srcCopyDir + " " + dstPath + "/"; + console.log("cmdStr:%s", cmdStr1); + child_process.execSync(cmdStr1); + + srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/arm64/' + selectWord.label + "/mime"); + let cmdStr2 = "cp -R " + srcCopyDir + " " + dstPath + "/"; + console.log("cmdStr:%s", cmdStr2); + child_process.execSync(cmdStr2); + + vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success."); + } else { + srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/x64/' + selectWord.label + "/socket"); + let cmdStr1 = "cp -R " + srcCopyDir + " " + dstPath + "/"; + console.log("cmdStr:%s", cmdStr1); + child_process.execSync(cmdStr1); + + srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/mac/x64/' + selectWord.label + "/mime"); + let cmdStr2 = "cp -R " + srcCopyDir + " " + dstPath + "/"; + console.log("cmdStr:%s", cmdStr2); + child_process.execSync(cmdStr2); + + vscode.window.showInformationMessage("copy lua socket " + selectWord.label + " lib success."); + } } else if (process.platform === "linux") { srcCopyDir = path.join(Tools.VSCodeExtensionPath, '/debugger/luasocket/linux/' + selectWord.label + "/socket"); let cmdStr1 = "cp -a " + srcCopyDir + " " + dstPath + "/"; diff --git a/luahelper-vscode/src/luapandaDebug.ts b/luahelper-vscode/src/luapandaDebug.ts index e33da7c..9effc20 100644 --- a/luahelper-vscode/src/luapandaDebug.ts +++ b/luahelper-vscode/src/luapandaDebug.ts @@ -72,8 +72,9 @@ export class LuaConfigurationProvider implements vscode.DebugConfigurationProvid let LuaCMD = strVect[0] + " -e "; - LuaConfigurationProvider.RunFileTerminal.sendText(LuaCMD + runCMD, true); LuaConfigurationProvider.RunFileTerminal.show(); + //兼容terminal启动耗时较长的情况，延迟发送命令 + setTimeout(() => LuaConfigurationProvider.RunFileTerminal.sendText(LuaCMD + runCMD, true), 2000); return; }