From 0c8c6bbf23082d0b858646846a47a3001f718ae2 Mon Sep 17 00:00:00 2001
From: actboy168 <actboy168@gmail.com>
Date: Tue, 14 Sep 2021 22:01:07 +0800
Subject: [PATCH] update bee
---
3rd/bee.lua | 2 +-
make.lua | 3 +--
make/install.lua | 9 +++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/3rd/bee.lua b/3rd/bee.lua
index ad2299954..b025c8514 160000
--- a/3rd/bee.lua
+++ b/3rd/bee.lua
@@ -1 +1 @@
-Subproject commit ad229995449b928ffe5fa165693dd0fe884670a8
+Subproject commit b025c851433cc698b6e6f6af2043f54cd085f0c3
diff --git a/make.lua b/make.lua
index ae12d8642..638c6b907 100644
--- a/make.lua
+++ b/make.lua
@@ -1,5 +1,6 @@
local lm = require 'luamake'
+lm.EXE = "lua"
lm.EXE_RESOURCE = "../../make/lua-language-server.rc"
lm:import "3rd/bee.lua/make.lua"
@@ -18,7 +19,6 @@ lm:build 'install' {
'lua',
'lpeglabel',
'bee',
- 'bootstrap',
}
}
@@ -30,7 +30,6 @@ lm:build 'unittest' {
pool = "console",
deps = {
'install',
- 'test',
}
}
diff --git a/make/install.lua b/make/install.lua
index 036f0f4ba..e80787707 100644
--- a/make/install.lua
+++ b/make/install.lua
@@ -7,13 +7,14 @@ local output = CWD / 'bin' / pf.OS
local bindir = CWD / builddir / 'bin'
local exe = pf.OS == 'Windows' and ".exe" or ""
local dll = pf.OS == 'Windows' and ".dll" or ".so"
+local OVERWRITE = fs.copy_options.overwrite_existing
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)
+fs.copy_file(bindir / 'lpeglabel'..dll, output / 'lpeglabel'..dll, OVERWRITE)
+fs.copy_file(bindir / 'bee'..dll, output / 'bee'..dll, OVERWRITE)
+fs.copy_file(bindir / 'lua'..exe, output / 'lua-language-server'..exe, OVERWRITE)
if pf.OS == 'Windows' then
- fs.copy_file(bindir / 'lua54'..dll, output / 'lua54'..dll, true)
+ fs.copy_file(bindir / 'lua54'..dll, output / 'lua54'..dll, OVERWRITE)
require 'msvc'.copy_vcrt('x64', output)
end
--
GitLab