improve detectcache save

Author: waruqi

tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua

@@ -60,7 +60,6 @@ function _check_from_arglist(flags, opt, islinker)
             end
         end
         detectcache:set2(key, flagskey, allflags)
-        detectcache:save()
     end
     local flag = flags[1]
     return allflags[flag]

xmake/actions/build/main.lua

@@ -23,6 +23,7 @@ import("core.base.option")
 import("core.base.global")
 import("core.base.task")
 import("core.tool.toolchain")
+import("core.cache.detectcache")
 import("core.project.rule")
 import("core.project.config")
 import("core.project.project")
@@ -130,6 +131,9 @@ function build_targets(targetnames, opt)
             -- save toolchain configs
             toolchain.save()
 
+            -- save detect cache
+            detectcache:save()
+
             -- dump cache stats
             if option.get("diagnosis") then
                 build_cache.dump_stats()
@@ -148,6 +152,9 @@ function build_targets(targetnames, opt)
                 -- save toolchain configs
                 toolchain.save()
 
+                -- save detect cache
+                detectcache:save()
+
                 -- raise
                 if errors then
                     raise(errors)

xmake/actions/config/main.lua

@@ -28,6 +28,7 @@ import("core.project.project")
 import("core.platform.platform")
 import("private.detect.find_platform")
 import("core.cache.localcache")
+import("core.cache.detectcache")
 import("scangen")
 import("menuconf", {alias = "menuconf_show"})
 import("configfiles", {alias = "generate_configfiles"})
@@ -448,6 +449,9 @@ force to build in current directory via run `xmake -P .`]], os.projectdir())
     -- save toolchain cache
     toolchain.save()
 
+    -- save detect cache
+    detectcache:save()
+
     -- unlock the whole project
     project.unlock()
 end

xmake/core/sandbox/modules/import/lib/detect/find_program.lua

@@ -338,7 +338,6 @@ function sandbox_lib_detect_find_program.main(name, opt)
 
     -- cache result
     detectcache:set2(cachekey, name, result and result or false)
-    detectcache:save()
 
     -- trace
     if option.get("verbose") or opt.verbose then

xmake/core/sandbox/modules/import/lib/detect/find_programver.lua

@@ -109,7 +109,6 @@ function sandbox_lib_detect_find_programver.main(program, opt)
 
     -- save result
     detectcache:set2(cachekey, program, result and result or false)
-    detectcache:save()
     scheduler.co_unlock(lockname)
     return result
 end

xmake/modules/core/tools/ar/has_flags.lua

@@ -63,10 +63,7 @@ function _check_from_arglist(flags, opt)
 
         -- save cache
         detectcache:set2(key, flagskey, allflags)
-        detectcache:save()
     end
-
-    -- ok?
     return allflags[flags[1]]
 end
 

xmake/modules/core/tools/armasm_msvc/has_flags.lua

@@ -50,7 +50,6 @@ function _check_from_arglist(flags, opt)
 
         -- save cache
         detectcache:set2(key, flagskey, allflags)
-        detectcache:save()
     end
     return allflags[flags[1]:gsub("/", "-")]
 end

xmake/modules/core/tools/armclang/has_flags.lua

@@ -67,7 +67,6 @@ function _check_from_arglist(flags, opt, islinker)
             end
         end
         detectcache:set2(key, flagskey, allflags)
-        detectcache:save()
     end
     local flag = flags[1]
     if islinker and flag then

xmake/modules/core/tools/cl/parse_include.lua

@@ -60,7 +60,6 @@ function probe_include_note_from_cl()
             os.tryrm(projectdir)
         end
         detectcache:set(key, note)
-        detectcache:save()
     end
     return note
 end

xmake/modules/core/tools/cl6x/has_flags.lua

@@ -60,7 +60,6 @@ function _check_from_arglist(flags, opt, islinker)
             end
         end
         detectcache:set2(key, flagskey, allflags)
-        detectcache:save()
     end
     local flag = flags[1]
     return allflags[flag]