Skip to content
Snippets Groups Projects
Commit a82525de authored by actboy168's avatar actboy168
Browse files

fixes bug

parent ab86c720
Branches
No related tags found
No related merge requests found
......@@ -21,7 +21,7 @@ lm:lua_dll 'lpeglabel' {
}
lm:build 'install' {
'$luamake', 'lua', 'make/install.lua', lm.plat,
'$luamake', 'lua', 'make/install.lua', lm.builddir,
deps = {
'lua',
'lpeglabel',
......@@ -31,7 +31,7 @@ lm:build 'install' {
}
lm:build 'unittest' {
'$luamake', 'lua', 'make/unittest.lua', lm.plat,
'$luamake', 'lua', 'make/unittest.lua',
deps = {
'install',
'test',
......
local platform = ...
local builddir = ...
local fs = require 'bee.filesystem'
local sp = require 'bee.subprocess'
local pf = require 'bee.platform'
local CWD = fs.current_path()
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"
local bindir = CWD / builddir / 'bin'
local exe = pf.OS == 'Windows' and ".exe" or ""
local dll = pf.OS == 'Windows' and ".dll" or ".so"
fs.create_directories(output)
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-language-server'..exe, true)
if platform == 'msvc' then
if pf.OS == 'Windows' then
fs.copy_file(bindir / 'lua54'..dll, output / 'lua54'..dll, true)
require 'msvc'.copy_vcrt('x64', output)
end
local platform = ...
local fs = require 'bee.filesystem'
local sp = require 'bee.subprocess'
local pf = require 'bee.platform'
local exe = platform == 'msvc' and ".exe" or ""
local exe = pf.OS == 'Windows' and ".exe" or ""
local CWD = fs.current_path()
local process = assert(sp.spawn {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment