From 4b9de4cb6a555c80be771fad26fe4c00ac3f4e2e Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 11 Apr 2018 22:32:32 +0800 Subject: seperate project and package --- xmake/core/project/project.lua | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) (limited to 'xmake/core/project/project.lua') diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua index f5b525470..e5785a645 100644 --- a/xmake/core/project/project.lua +++ b/xmake/core/project/project.lua @@ -41,6 +41,7 @@ local target = require("project/target") local config = require("project/config") local option = require("project/option") local deprecated_project = require("project/deprecated/project") +local package = require("package/package") local platform = require("platform/platform") local environment = require("platform/environment") local language = require("language/language") @@ -211,14 +212,12 @@ function project.interpreter() -- define apis for option interp:api_define(option.apis()) + -- define apis for package + interp:api_define(package.apis()) + -- define apis for language interp:api_define(language.apis()) - -- define registered apis - for _, apis in ipairs(project._APIS or {}) do - interp:api_define(apis) - end - -- define apis for project interp:api_define { @@ -303,16 +302,6 @@ function project.interpreter() return interp end --- define apis -function project.define_apis(apis) - - -- init apis - project._APIS = project._APIS or {} - - -- define these apis - table.insert(project._APIS, apis) -end - -- get the project file function project.file() return os.projectfile() -- cgit v1.3.1