From 34b6123628ccce51f23207cea7c9c5f025f0a3c1 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 30 Sep 2015 15:46:13 +0800 Subject: fix set_installscript api and add import --- xmake/scripts/base/project.lua | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'xmake/scripts/base/project.lua') diff --git a/xmake/scripts/base/project.lua b/xmake/scripts/base/project.lua index 9e003a59d..89bee0cd6 100644 --- a/xmake/scripts/base/project.lua +++ b/xmake/scripts/base/project.lua @@ -20,7 +20,7 @@ -- @file project.lua -- --- define module: config +-- define module: project local project = project or {} -- load modules @@ -35,6 +35,13 @@ local linker = require("base/linker") local compiler = require("base/compiler") local platform = require("platform/platform") +-- import module +function project._api_import(env, module) + + -- import + return require("module/" .. module) +end + -- the current os is belong to the given os? function project._api_os(env, ...) @@ -947,6 +954,9 @@ function project._load_options(file) end}) setfenv(script, newenv) + -- register import + newenv.import = function (module) return project._api_import(newenv, module) end + -- register interfaces for the condition newenv.os = function (...) return project._api_os(newenv, ...) end newenv.modes = function (...) return project._api_modes(newenv, ...) end @@ -1051,6 +1061,9 @@ function project._load_targets(file) end}) setfenv(script, newenv) + -- register import + newenv.import = function (module) return project._api_import(newenv, module) end + -- register interfaces for the condition newenv.os = function (...) return project._api_os(newenv, ...) end newenv.modes = function (...) return project._api_modes(newenv, ...) end -- cgit v1.3.1