summaryrefslogtreecommitdiff
path: root/xmake/scripts/platform/windows
diff options
context:
space:
mode:
authorruki <[email protected]>2015-06-10 20:50:58 +0800
committerruki <[email protected]>2015-06-10 20:50:58 +0800
commitb5815f7c047221ea4a85333f7a8b6be5a2a4c737 (patch)
treef53349989af5e057d77233d333ef5efc46d03ed3 /xmake/scripts/platform/windows
parent62f8e7581602d698a341db16257bd3d9304fa30d (diff)
modify the checking verbose info
Diffstat (limited to 'xmake/scripts/platform/windows')
-rw-r--r--xmake/scripts/platform/windows/prober.lua37
1 files changed, 15 insertions, 22 deletions
diff --git a/xmake/scripts/platform/windows/prober.lua b/xmake/scripts/platform/windows/prober.lua
index bc39f2382..099212179 100644
--- a/xmake/scripts/platform/windows/prober.lua
+++ b/xmake/scripts/platform/windows/prober.lua
@@ -43,6 +43,9 @@ function prober._probe_arch(configs)
-- init the default architecture
configs.set("arch", xmake._ARCH)
+ -- trace
+ utils.verbose("checking the architecture ... %s", configs.get("arch"))
+
-- ok
return true
end
@@ -86,10 +89,14 @@ function prober._probe_vs_version(configs)
-- probe ok? update it
if vs then
+ -- save it
configs.set("vs", vs)
+
+ -- trace
+ utils.verbose("checking the Microsoft Visual Studio version ... %s", vs)
else
-- failed
- utils.error("The Microsoft Visual Studio is unknown now, please config it first!")
+ utils.error("checking the Microsoft Visual Studio version ... no")
utils.error(" - xmake config --vs=xxx")
utils.error("or - xmake global --vs=xxx")
return false
@@ -191,17 +198,10 @@ end
function prober.config()
-- call all probe functions
- utils.call( prober
- , { "_probe_arch"
- , "_probe_vs_version"
- , "_probe_vs_path"}
-
- , function (name, result)
- -- trace
- utils.verbose("checking %s ...: %s", name:gsub("_probe_", ""), utils.ifelse(result, "ok", "no"))
- return result
- end
-
+ utils.call( { prober._probe_arch
+ , prober._probe_vs_version
+ , prober._probe_vs_path}
+ , nil
, config)
end
@@ -209,16 +209,9 @@ end
function prober.global()
-- call all probe functions
- utils.call( prober
- , { "_probe_vs_version"
- , "_probe_vs_path"}
-
- , function (name, result)
- -- trace
- utils.verbose("checking %s ...: %s", name:gsub("_probe_", ""), utils.ifelse(result, "ok", "no"))
- return result
- end
-
+ utils.call( { prober._probe_vs_version
+ , prober._probe_vs_path}
+ , nil
, global)
end