diff options
| author | 最萌小汐 <sumneko@hotmail.com> | 2019-11-23 00:54:12 +0800 |
|---|---|---|
| committer | 最萌小汐 <sumneko@hotmail.com> | 2019-11-23 00:54:12 +0800 |
| commit | b171e92da5ce7f5c79e33003fbdfcbb65532ef57 (patch) | |
| tree | 52aff1100f9bc172dd525b6e026a5ef76f76896f /make | |
| parent | 137afac8fbda740b56c3e4b8f8e77260c29f0b10 (diff) | |
| download | lua-language-server-b171e92da5ce7f5c79e33003fbdfcbb65532ef57.zip | |
编译与自动集成
Diffstat (limited to 'make')
| -rw-r--r-- | make/install.lua | 8 | ||||
| -rw-r--r-- | make/unittest.lua | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/make/install.lua b/make/install.lua index 43e3b1e0..4ea31eaa 100644 --- a/make/install.lua +++ b/make/install.lua @@ -4,7 +4,7 @@ local sp = require 'bee.subprocess' local pf = require 'bee.platform' local CWD = fs.current_path() -local output = CWD / 'server' / pf.OS / 'bin' +local output = CWD / 'bin' / pf.OS local bindir = CWD / 'build' / platform / 'bin' local exe = platform == 'msvc' and ".exe" or "" local dll = platform == 'msvc' and ".dll" or ".so" @@ -13,12 +13,12 @@ fs.create_directories(output) fs.copy_file(bindir / 'lni'..dll, output / 'lni'..dll, true) fs.copy_file(bindir / 'lpeglabel'..dll, output / 'lpeglabel'..dll, true) fs.copy_file(bindir / 'bee'..dll, output / 'bee'..dll, true) -fs.copy_file(bindir / 'lua'..exe, output / 'lua'..exe, true) +fs.copy_file(bindir / 'lua'..exe, output / 'lua-language-server'..exe, true) local bootstrap = CWD / "3rd" / "bee.lua" / "bootstrap" fs.copy_file(bootstrap / "main.lua", CWD / 'build' / "main.lua", true) fs.copy_file(bindir / ('bee'..dll), CWD / 'build' / ('bee'..dll), true) -fs.copy_file(bindir / ('bootstrap'..exe), CWD / 'build' / ('lua-language-server'..exe), true) +fs.copy_file(bindir / ('bootstrap'..exe), CWD / 'build' / ('bootstrap'..exe), true) if platform == 'msvc' then fs.copy_file(bindir / 'lua54.dll', CWD / 'build' / 'lua54.dll', true) end @@ -31,7 +31,7 @@ if platform == 'msvc' then bindir / 'rcedit.exe', output / 'lua-language-server.exe', '--set-icon', - CWD / 'images' / 'icon.ico' + CWD / 'icon.ico' }) assert(process:wait()) end diff --git a/make/unittest.lua b/make/unittest.lua index eb9eda66..25839c96 100644 --- a/make/unittest.lua +++ b/make/unittest.lua @@ -6,8 +6,8 @@ local exe = platform == 'msvc' and ".exe" or "" local CWD = fs.current_path() local process = assert(sp.spawn { - CWD / 'server' / pf.OS / 'bin' / ('lua' .. exe), - CWD / 'server' / 'test.lua', + CWD / 'bin' / pf.OS / ('lua-language-server' .. exe), + CWD / 'test.lua', '-E', stdout = true, stderr = true, |