diff options
| author | OpportunityLiu <[email protected]> | 2019-07-15 20:49:21 +0800 |
|---|---|---|
| committer | OpportunityLiu <[email protected]> | 2019-07-15 20:49:21 +0800 |
| commit | 8cd138e181b63fa327b4b3caa3250fb1dce4b407 (patch) | |
| tree | 74350c167cdba037d60e48e2a0ef2b52df75a656 | |
| parent | 2f687640d02b4ea1a912037de6e3affb5987e8f1 (diff) | |
add configfiles
| -rw-r--r-- | xmake/plugins/project/vsxmake/getinfo.lua | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua index eb6c5850a..4567adb1e 100644 --- a/xmake/plugins/project/vsxmake/getinfo.lua +++ b/xmake/plugins/project/vsxmake/getinfo.lua @@ -29,6 +29,7 @@ import("core.tool.compiler") import("core.tool.linker") import("lib.detect.find_tool") import("actions.config.configheader", {alias = "generate_configheader", rootdir = os.programdir()}) +import("actions.config.configfiles", {alias = "generate_configfiles", rootdir = os.programdir()}) function _make_dirs(dir) if dir == nil then @@ -196,25 +197,25 @@ function main(outputdir, vsinfo) print("checking for the %s.%s ...", mode, arch) -- reload config, project and platform - if mode ~= config.mode() or arch ~= config.arch() then + -- modify config + config.set("as", nil, {force = true}) -- force to re-check as for ml/ml64 + config.set("mode", mode, {readonly = true, force = true}) + config.set("arch", arch, {readonly = true, force = true}) - -- modify config - config.set("as", nil, {force = true}) -- force to re-check as for ml/ml64 - config.set("mode", mode, {readonly = true, force = true}) - config.set("arch", arch, {readonly = true, force = true}) + -- clear project to reload and recheck it + project.clear() - -- clear project to reload and recheck it - project.clear() + -- check project options + project.check() - -- check project options - project.check() + -- reload platform + platform.load(config.plat()) - -- reload platform - platform.load(config.plat()) + -- re-generate configheader + generate_configheader() - -- re-generate configheader - generate_configheader() - end + -- re-generate configfiles + generate_configfiles() -- ensure to enter project directory os.cd(project.directory()) |
