diff options
| -rw-r--r-- | azure-pipelines.yml | 10 | ||||
| -rw-r--r-- | client/out/extension.js | 4 | ||||
| -rw-r--r-- | client/src/extension.ts | 2 | ||||
| -rw-r--r-- | server/platform.lua | 4 | ||||
| -rw-r--r-- | server/publish.lua | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 18fd3868..be430a61 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -54,6 +54,7 @@ jobs: cd ../.. displayName: 'Compile luamake' - bash: | + rm server/macOS ./3rd/luamake/luamake rebuild displayName: 'Compile' - bash: | @@ -62,11 +63,8 @@ jobs: cd .. displayName: 'Install Client' - bash: | - cd server - ls - cd .. ulimit -n 10000 - ./server/Macos/bin/lua-language-server server/publish.lua + ./server/macOS/bin/lua-language-server server/publish.lua displayName: 'Publish' - task: CopyFiles@2 inputs: @@ -95,6 +93,7 @@ jobs: cd ../.. displayName: 'Compile luamake' - bash: | + rm server/Linux ./3rd/luamake/luamake rebuild displayName: 'Compile' - bash: | @@ -103,9 +102,6 @@ jobs: cd .. displayName: 'Install Client' - bash: | - cd server - ls - cd .. ulimit -n 10000 ./server/Linux/bin/lua-language-server server/publish.lua displayName: 'Publish' diff --git a/client/out/extension.js b/client/out/extension.js index 38f1b83d..8029df43 100644 --- a/client/out/extension.js +++ b/client/out/extension.js @@ -30,7 +30,7 @@ function activate(context) { command = context.asAbsolutePath(path.join('server', 'Linux', 'bin', 'lua-language-server')); break; case "darwin": - command = context.asAbsolutePath(path.join('server', 'Macos', 'bin', 'lua-language-server')); + command = context.asAbsolutePath(path.join('server', 'macOS', 'bin', 'lua-language-server')); break; } let serverOptions = { @@ -53,4 +53,4 @@ function deactivate() { return client.stop(); } exports.deactivate = deactivate; -//# sourceMappingURL=extension.js.map
\ No newline at end of file +//# sourceMappingURL=extension.js.map diff --git a/client/src/extension.ts b/client/src/extension.ts index 12418c14..2ca89cd6 100644 --- a/client/src/extension.ts +++ b/client/src/extension.ts @@ -45,7 +45,7 @@ export function activate(context: ExtensionContext) { case "darwin": command = context.asAbsolutePath( - path.join('server', 'Macos', 'bin', 'lua-language-server') + path.join('server', 'macOS', 'bin', 'lua-language-server') ); break; } diff --git a/server/platform.lua b/server/platform.lua index 3832a762..b89a76bc 100644 --- a/server/platform.lua +++ b/server/platform.lua @@ -7,8 +7,8 @@ end package.path = rootPath .. 'src/?.lua' .. ';' .. rootPath .. 'src/?/init.lua' -if package.loadlib(rootPath .. 'Macos/bin/bee.so', 'luaopen_bee_platform') then - package.cpath = rootPath .. 'Macos/bin/?.so' +if package.loadlib(rootPath .. 'macOS/bin/bee.so', 'luaopen_bee_platform') then + package.cpath = rootPath .. 'macOS/bin/?.so' elseif package.loadlib(rootPath .. 'Linux/bin/bee.so', 'luaopen_bee_platform') then package.cpath = rootPath .. 'Linux/bin/?.so' elseif package.loadlib(rootPath .. 'Windows/bin/bee.dll', 'luaopen_bee_platform') then diff --git a/server/publish.lua b/server/publish.lua index 12a4e9be..d340309f 100644 --- a/server/publish.lua +++ b/server/publish.lua @@ -141,7 +141,7 @@ local count = copyFiles(EXTENSION , out) { }, ['server'] = { ['Windows'] = true, - ['Macos'] = true, + ['macOS'] = true, ['Linux'] = true, ['libs'] = true, ['locale'] = true, |