diff options
-rw-r--r-- | make.lua | 2 | ||||
-rw-r--r-- | make/bootstrap.lua | 2 | ||||
-rw-r--r-- | test.lua | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -2,7 +2,7 @@ local lm = require 'luamake' local platform = require 'bee.platform' local exe = platform.OS == 'Windows' and ".exe" or "" -lm.bindir = 'bin/' .. platform.OS +lm.bindir = "bin" lm.EXE_DIR = "" lm:import "3rd/bee.lua/make.lua" diff --git a/make/bootstrap.lua b/make/bootstrap.lua index e9e61c77..36b9ce96 100644 --- a/make/bootstrap.lua +++ b/make/bootstrap.lua @@ -49,7 +49,7 @@ local root; do sep = '/\\'
end
local pattern = "["..sep.."][^"..sep.."]+"
- root = package.cpath:match("([^;]+)"..pattern..pattern..pattern.."$")
+ root = package.cpath:match("([^;]+)"..pattern..pattern.."$")
arg[0] = root .. package.config:sub(1,1) .. 'main.lua'
end
root = root:gsub('[/\\]', package.config:sub(1,1))
@@ -2,7 +2,7 @@ package.path = package.path .. ';./test/?.lua' .. ';./test/?/init.lua' local fs = require 'bee.filesystem' -local rootPath = fs.exe_path():parent_path():parent_path():parent_path():string() +local rootPath = fs.exe_path():parent_path():parent_path():string() ROOT = fs.path(rootPath) TEST = true DEVELOP = true |