summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-09-10 22:32:48 +0800
committerruki <[email protected]>2025-09-10 21:52:30 +0800
commitc54be3773f1723268a1b0abbd65f38a8ac8b95f4 (patch)
tree642b888c63b0401c1ac379638a305af9b2751a9c
parenta0cc61b1894a427731beebbb2f3d2005895c212c (diff)
improve detectcache save
-rw-r--r--tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua1
-rw-r--r--xmake/actions/build/main.lua7
-rw-r--r--xmake/actions/config/main.lua4
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_program.lua1
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_programver.lua1
-rw-r--r--xmake/modules/core/tools/ar/has_flags.lua3
-rw-r--r--xmake/modules/core/tools/armasm_msvc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/armclang/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/cl/parse_include.lua1
-rw-r--r--xmake/modules/core/tools/cl6x/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/clang_cl/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/cosmocc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/dmd/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/fpc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/gcc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/gdc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/gfortran/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/go/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/iccarm/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/kotlinc_native/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/ml/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/nim/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/nvcc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/rc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/rustc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/sdcc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/swiftc/has_flags.lua1
-rw-r--r--xmake/modules/core/tools/zig/has_flags.lua1
-rw-r--r--xmake/modules/detect/sdks/find_android_sdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_c51.lua1
-rw-r--r--xmake/modules/detect/sdks/find_cuda.lua1
-rw-r--r--xmake/modules/detect/sdks/find_dia_sdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_dotnet.lua1
-rw-r--r--xmake/modules/detect/sdks/find_emsdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_hdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_iarsdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_masm32.lua1
-rw-r--r--xmake/modules/detect/sdks/find_mdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_mingw.lua1
-rw-r--r--xmake/modules/detect/sdks/find_ndk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_qt.lua1
-rw-r--r--xmake/modules/detect/sdks/find_vcpkgdir.lua1
-rw-r--r--xmake/modules/detect/sdks/find_wasisdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_wdk.lua1
-rw-r--r--xmake/modules/detect/sdks/find_xcode.lua1
-rw-r--r--xmake/modules/lib/detect/find_cudadevices.lua1
-rw-r--r--xmake/modules/lib/detect/find_package.lua1
-rw-r--r--xmake/modules/lib/detect/has_flags.lua1
-rw-r--r--xmake/modules/net/ping.lua1
49 files changed, 11 insertions, 49 deletions
diff --git a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua b/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua
index bb2d955a5..629f25c12 100644
--- a/tests/apis/custom_toolchain/xmake/modules/core/tools/cl6x/has_flags.lua
+++ b/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]
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua
index 8560cb1bd..c0d3761df 100644
--- a/xmake/actions/build/main.lua
+++ b/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)
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 9a03c2992..8f6640881 100644
--- a/xmake/actions/config/main.lua
+++ b/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
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
index b0c65071a..68fbc59ae 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
+++ b/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
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua b/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
index 45dd4488b..0d76526e5 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
+++ b/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
diff --git a/xmake/modules/core/tools/ar/has_flags.lua b/xmake/modules/core/tools/ar/has_flags.lua
index b716e5080..e02a14b52 100644
--- a/xmake/modules/core/tools/ar/has_flags.lua
+++ b/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
diff --git a/xmake/modules/core/tools/armasm_msvc/has_flags.lua b/xmake/modules/core/tools/armasm_msvc/has_flags.lua
index 67f72e647..938100a0c 100644
--- a/xmake/modules/core/tools/armasm_msvc/has_flags.lua
+++ b/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
diff --git a/xmake/modules/core/tools/armclang/has_flags.lua b/xmake/modules/core/tools/armclang/has_flags.lua
index 988393ff8..43e246f36 100644
--- a/xmake/modules/core/tools/armclang/has_flags.lua
+++ b/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
diff --git a/xmake/modules/core/tools/cl/parse_include.lua b/xmake/modules/core/tools/cl/parse_include.lua
index 961ffca95..e53163e8f 100644
--- a/xmake/modules/core/tools/cl/parse_include.lua
+++ b/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
diff --git a/xmake/modules/core/tools/cl6x/has_flags.lua b/xmake/modules/core/tools/cl6x/has_flags.lua
index bb2d955a5..629f25c12 100644
--- a/xmake/modules/core/tools/cl6x/has_flags.lua
+++ b/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]
diff --git a/xmake/modules/core/tools/clang_cl/has_flags.lua b/xmake/modules/core/tools/clang_cl/has_flags.lua
index 9dda7f5fb..2f92a8a37 100644
--- a/xmake/modules/core/tools/clang_cl/has_flags.lua
+++ b/xmake/modules/core/tools/clang_cl/has_flags.lua
@@ -51,7 +51,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]:gsub("/", "-")]
end
diff --git a/xmake/modules/core/tools/cosmocc/has_flags.lua b/xmake/modules/core/tools/cosmocc/has_flags.lua
index b3a788a44..589c1fdc0 100644
--- a/xmake/modules/core/tools/cosmocc/has_flags.lua
+++ b/xmake/modules/core/tools/cosmocc/has_flags.lua
@@ -71,7 +71,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
diff --git a/xmake/modules/core/tools/dmd/has_flags.lua b/xmake/modules/core/tools/dmd/has_flags.lua
index c2694e3ce..184a70c7f 100644
--- a/xmake/modules/core/tools/dmd/has_flags.lua
+++ b/xmake/modules/core/tools/dmd/has_flags.lua
@@ -72,7 +72,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/fpc/has_flags.lua b/xmake/modules/core/tools/fpc/has_flags.lua
index 4a5e29a5a..4d197337a 100644
--- a/xmake/modules/core/tools/fpc/has_flags.lua
+++ b/xmake/modules/core/tools/fpc/has_flags.lua
@@ -58,7 +58,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/gcc/has_flags.lua b/xmake/modules/core/tools/gcc/has_flags.lua
index 693ce4381..731e5da2f 100644
--- a/xmake/modules/core/tools/gcc/has_flags.lua
+++ b/xmake/modules/core/tools/gcc/has_flags.lua
@@ -68,7 +68,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
diff --git a/xmake/modules/core/tools/gdc/has_flags.lua b/xmake/modules/core/tools/gdc/has_flags.lua
index 3568defcc..e21fb5804 100644
--- a/xmake/modules/core/tools/gdc/has_flags.lua
+++ b/xmake/modules/core/tools/gdc/has_flags.lua
@@ -71,7 +71,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/gfortran/has_flags.lua b/xmake/modules/core/tools/gfortran/has_flags.lua
index c570cdbbd..d01334230 100644
--- a/xmake/modules/core/tools/gfortran/has_flags.lua
+++ b/xmake/modules/core/tools/gfortran/has_flags.lua
@@ -71,7 +71,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/go/has_flags.lua b/xmake/modules/core/tools/go/has_flags.lua
index ade118292..1e84ac279 100644
--- a/xmake/modules/core/tools/go/has_flags.lua
+++ b/xmake/modules/core/tools/go/has_flags.lua
@@ -76,7 +76,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/iccarm/has_flags.lua b/xmake/modules/core/tools/iccarm/has_flags.lua
index 35ce23c53..c931c5dad 100644
--- a/xmake/modules/core/tools/iccarm/has_flags.lua
+++ b/xmake/modules/core/tools/iccarm/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]
diff --git a/xmake/modules/core/tools/kotlinc_native/has_flags.lua b/xmake/modules/core/tools/kotlinc_native/has_flags.lua
index b6559a09a..de191166d 100644
--- a/xmake/modules/core/tools/kotlinc_native/has_flags.lua
+++ b/xmake/modules/core/tools/kotlinc_native/has_flags.lua
@@ -64,7 +64,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/ml/has_flags.lua b/xmake/modules/core/tools/ml/has_flags.lua
index 1b607f496..2980d6051 100644
--- a/xmake/modules/core/tools/ml/has_flags.lua
+++ b/xmake/modules/core/tools/ml/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
diff --git a/xmake/modules/core/tools/nim/has_flags.lua b/xmake/modules/core/tools/nim/has_flags.lua
index 74173f0f5..41e2dba84 100644
--- a/xmake/modules/core/tools/nim/has_flags.lua
+++ b/xmake/modules/core/tools/nim/has_flags.lua
@@ -58,7 +58,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/nvcc/has_flags.lua b/xmake/modules/core/tools/nvcc/has_flags.lua
index 3aa33c5c3..c94c5f53e 100644
--- a/xmake/modules/core/tools/nvcc/has_flags.lua
+++ b/xmake/modules/core/tools/nvcc/has_flags.lua
@@ -92,7 +92,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/rc/has_flags.lua b/xmake/modules/core/tools/rc/has_flags.lua
index dd584528d..af246d409 100644
--- a/xmake/modules/core/tools/rc/has_flags.lua
+++ b/xmake/modules/core/tools/rc/has_flags.lua
@@ -51,7 +51,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]:gsub("/", "-")]
end
diff --git a/xmake/modules/core/tools/rustc/has_flags.lua b/xmake/modules/core/tools/rustc/has_flags.lua
index ced150618..e2b863561 100644
--- a/xmake/modules/core/tools/rustc/has_flags.lua
+++ b/xmake/modules/core/tools/rustc/has_flags.lua
@@ -68,7 +68,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/sdcc/has_flags.lua b/xmake/modules/core/tools/sdcc/has_flags.lua
index 5229d8e8c..65e653039 100644
--- a/xmake/modules/core/tools/sdcc/has_flags.lua
+++ b/xmake/modules/core/tools/sdcc/has_flags.lua
@@ -73,7 +73,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/swiftc/has_flags.lua b/xmake/modules/core/tools/swiftc/has_flags.lua
index 5df577cdf..290a6de83 100644
--- a/xmake/modules/core/tools/swiftc/has_flags.lua
+++ b/xmake/modules/core/tools/swiftc/has_flags.lua
@@ -57,7 +57,6 @@ function _check_from_arglist(flags, opt)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/core/tools/zig/has_flags.lua b/xmake/modules/core/tools/zig/has_flags.lua
index 8fdd611ce..a70d02b54 100644
--- a/xmake/modules/core/tools/zig/has_flags.lua
+++ b/xmake/modules/core/tools/zig/has_flags.lua
@@ -66,7 +66,6 @@ function _check_from_arglist(flags, opt, islinker)
-- save cache
detectcache:set2(key, flagskey, allflags)
- detectcache:save()
end
return allflags[flags[1]]
end
diff --git a/xmake/modules/detect/sdks/find_android_sdk.lua b/xmake/modules/detect/sdks/find_android_sdk.lua
index 7bb2e7121..24ea02c4c 100644
--- a/xmake/modules/detect/sdks/find_android_sdk.lua
+++ b/xmake/modules/detect/sdks/find_android_sdk.lua
@@ -124,6 +124,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.sdk = sdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return sdk
end
diff --git a/xmake/modules/detect/sdks/find_c51.lua b/xmake/modules/detect/sdks/find_c51.lua
index b6f22dd90..4cc7c5d6f 100644
--- a/xmake/modules/detect/sdks/find_c51.lua
+++ b/xmake/modules/detect/sdks/find_c51.lua
@@ -117,6 +117,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.c51 = c51 or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return c51
end
diff --git a/xmake/modules/detect/sdks/find_cuda.lua b/xmake/modules/detect/sdks/find_cuda.lua
index 14b6b42c0..0a4756bee 100644
--- a/xmake/modules/detect/sdks/find_cuda.lua
+++ b/xmake/modules/detect/sdks/find_cuda.lua
@@ -176,6 +176,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.cuda = cuda or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return cuda
end
diff --git a/xmake/modules/detect/sdks/find_dia_sdk.lua b/xmake/modules/detect/sdks/find_dia_sdk.lua
index 5a4ffc5a5..e9dd88ca0 100644
--- a/xmake/modules/detect/sdks/find_dia_sdk.lua
+++ b/xmake/modules/detect/sdks/find_dia_sdk.lua
@@ -155,6 +155,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.dia_sdk = dia_sdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return dia_sdk
end
diff --git a/xmake/modules/detect/sdks/find_dotnet.lua b/xmake/modules/detect/sdks/find_dotnet.lua
index 3b9acc74d..2dfd2a916 100644
--- a/xmake/modules/detect/sdks/find_dotnet.lua
+++ b/xmake/modules/detect/sdks/find_dotnet.lua
@@ -130,6 +130,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.dotnet = dotnet or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return dotnet
end
diff --git a/xmake/modules/detect/sdks/find_emsdk.lua b/xmake/modules/detect/sdks/find_emsdk.lua
index 9d49fd969..642e7aeb9 100644
--- a/xmake/modules/detect/sdks/find_emsdk.lua
+++ b/xmake/modules/detect/sdks/find_emsdk.lua
@@ -110,6 +110,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.sdk = sdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return sdk
end
diff --git a/xmake/modules/detect/sdks/find_hdk.lua b/xmake/modules/detect/sdks/find_hdk.lua
index eac429691..c74a4d880 100644
--- a/xmake/modules/detect/sdks/find_hdk.lua
+++ b/xmake/modules/detect/sdks/find_hdk.lua
@@ -110,6 +110,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.hdk = hdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return hdk
end
diff --git a/xmake/modules/detect/sdks/find_iarsdk.lua b/xmake/modules/detect/sdks/find_iarsdk.lua
index b75085d81..7fb42874a 100644
--- a/xmake/modules/detect/sdks/find_iarsdk.lua
+++ b/xmake/modules/detect/sdks/find_iarsdk.lua
@@ -90,6 +90,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.iarsdk = iarsdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return iarsdk
end
diff --git a/xmake/modules/detect/sdks/find_masm32.lua b/xmake/modules/detect/sdks/find_masm32.lua
index b7242ae42..74230aa12 100644
--- a/xmake/modules/detect/sdks/find_masm32.lua
+++ b/xmake/modules/detect/sdks/find_masm32.lua
@@ -89,6 +89,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.masm32 = masm32 or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return masm32
end
diff --git a/xmake/modules/detect/sdks/find_mdk.lua b/xmake/modules/detect/sdks/find_mdk.lua
index 6de275a14..4fb9ef313 100644
--- a/xmake/modules/detect/sdks/find_mdk.lua
+++ b/xmake/modules/detect/sdks/find_mdk.lua
@@ -118,6 +118,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.mdk = mdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return mdk
end
diff --git a/xmake/modules/detect/sdks/find_mingw.lua b/xmake/modules/detect/sdks/find_mingw.lua
index 88f65ada7..e1b3571ec 100644
--- a/xmake/modules/detect/sdks/find_mingw.lua
+++ b/xmake/modules/detect/sdks/find_mingw.lua
@@ -158,6 +158,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.mingw = mingw or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return mingw
end
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua
index a388fa294..0ac0a4f83 100644
--- a/xmake/modules/detect/sdks/find_ndk.lua
+++ b/xmake/modules/detect/sdks/find_ndk.lua
@@ -304,6 +304,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.ndk = ndk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return ndk
end
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua
index 8b7cc3207..8935be2c6 100644
--- a/xmake/modules/detect/sdks/find_qt.lua
+++ b/xmake/modules/detect/sdks/find_qt.lua
@@ -379,6 +379,5 @@ function main(sdkdir, opt)
else
detectcache:set(key, cacheinfo)
end
- detectcache:save()
return qt
end
diff --git a/xmake/modules/detect/sdks/find_vcpkgdir.lua b/xmake/modules/detect/sdks/find_vcpkgdir.lua
index 260791406..0b1103c8d 100644
--- a/xmake/modules/detect/sdks/find_vcpkgdir.lua
+++ b/xmake/modules/detect/sdks/find_vcpkgdir.lua
@@ -68,7 +68,6 @@ function main()
end
end
detectcache:set("detect.sdks.find_vcpkgdir", vcpkgdir or false)
- detectcache:save()
end
return vcpkgdir or nil
end
diff --git a/xmake/modules/detect/sdks/find_wasisdk.lua b/xmake/modules/detect/sdks/find_wasisdk.lua
index cae657a32..f85408e0d 100644
--- a/xmake/modules/detect/sdks/find_wasisdk.lua
+++ b/xmake/modules/detect/sdks/find_wasisdk.lua
@@ -100,6 +100,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.sdk = sdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return sdk
end
diff --git a/xmake/modules/detect/sdks/find_wdk.lua b/xmake/modules/detect/sdks/find_wdk.lua
index 0ac7e06a9..ae380ce8b 100644
--- a/xmake/modules/detect/sdks/find_wdk.lua
+++ b/xmake/modules/detect/sdks/find_wdk.lua
@@ -182,6 +182,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.wdk = wdk or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return wdk
end
diff --git a/xmake/modules/detect/sdks/find_xcode.lua b/xmake/modules/detect/sdks/find_xcode.lua
index 3f62f5221..6382ae577 100644
--- a/xmake/modules/detect/sdks/find_xcode.lua
+++ b/xmake/modules/detect/sdks/find_xcode.lua
@@ -199,6 +199,5 @@ function main(sdkdir, opt)
-- save to cache
cacheinfo.xcode = xcode or false
detectcache:set(key, cacheinfo)
- detectcache:save()
return xcode
end
diff --git a/xmake/modules/lib/detect/find_cudadevices.lua b/xmake/modules/lib/detect/find_cudadevices.lua
index c780bf311..0f459c711 100644
--- a/xmake/modules/lib/detect/find_cudadevices.lua
+++ b/xmake/modules/lib/detect/find_cudadevices.lua
@@ -202,7 +202,6 @@ function _get_devices(opt)
-- fill cache
detectcache:set(cachekey, cachedata)
- detectcache:save()
return devices
end
diff --git a/xmake/modules/lib/detect/find_package.lua b/xmake/modules/lib/detect/find_package.lua
index f43c4656a..eedce1cec 100644
--- a/xmake/modules/lib/detect/find_package.lua
+++ b/xmake/modules/lib/detect/find_package.lua
@@ -98,7 +98,6 @@ function main(name, opt)
-- cache result
detectcache:set2(cachekey, packagekey, result and result or false)
- detectcache:save()
-- trace
if opt.verbose or option.get("verbose") then
diff --git a/xmake/modules/lib/detect/has_flags.lua b/xmake/modules/lib/detect/has_flags.lua
index af4197e4a..b122bcebb 100644
--- a/xmake/modules/lib/detect/has_flags.lua
+++ b/xmake/modules/lib/detect/has_flags.lua
@@ -150,7 +150,6 @@ function main(name, flags, opt)
-- save result to cache
cacheinfo[key] = result
detectcache:set("lib.detect.has_flags", cacheinfo)
- detectcache:save()
scheduler.co_unlock(key)
return result
end
diff --git a/xmake/modules/net/ping.lua b/xmake/modules/net/ping.lua
index f9a6d5ff0..b711da60b 100644
--- a/xmake/modules/net/ping.lua
+++ b/xmake/modules/net/ping.lua
@@ -142,7 +142,6 @@ function main(hosts, opt)
if cacheinfo then
detectcache:set("net.ping", cacheinfo)
- detectcache:save()
end
return results
end