diff options
| author | ruki <[email protected]> | 2017-08-17 09:19:20 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-08-17 09:19:20 +0800 |
| commit | dd10f487c769ec584e3f4aa915bb7940deb4223f (patch) | |
| tree | 34669de5b1588187eaf3eb0fd6ef3208a0ed6eca | |
| parent | 4d19e91040673885f4f8da57276c748a3af69695 (diff) | |
improve build
| -rw-r--r-- | xmake/actions/build/main.lua | 15 | ||||
| -rw-r--r-- | xmake/actions/config/main.lua | 5 |
2 files changed, 1 insertions, 19 deletions
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua index 3a9f4ca86..1578b9e8d 100644 --- a/xmake/actions/build/main.lua +++ b/xmake/actions/build/main.lua @@ -27,7 +27,6 @@ import("core.base.option") import("core.base.task") import("core.project.config") import("core.project.project") -import("core.project.cache", {nocache = true}) import("core.platform.platform") import("builder") @@ -40,18 +39,6 @@ function main() -- config it first task.run("config", {target = targetname}) - -- enter cache scope - cache.enter("local.config") - - -- rebuild? - local rebuild = option.get("rebuild") or cache.get("rebuild") - - -- clear 'rebuild' mark in cache - if cache.get("rebuild") then - cache.set("rebuild", nil) - cache.flush() - end - -- enter project directory local oldir = os.cd(project.directory()) @@ -59,7 +46,7 @@ function main() try { function () - builder.build(targetname, rebuild) + builder.build(targetname, option.get("rebuild")) end, catch diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua index 9b84b58bc..db530e730 100644 --- a/xmake/actions/config/main.lua +++ b/xmake/actions/config/main.lua @@ -62,11 +62,6 @@ function _need_check(changed) changed = option.get("clean") end - -- rebuild? - if changed then - cache.set("rebuild", true) - end - -- get the current mtimes local mtimes = project.mtimes() |
