From da041a08d3e2faf3bdb88e9699af4a54f7a50f99 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 15 Dec 2015 10:51:07 +0800 Subject: update tbox for linux and fix prober --- xmake/scripts/platform/iphoneos/prober.lua | 6 +++++- xmake/scripts/platform/iphonesimulator/prober.lua | 6 +++++- xmake/scripts/platform/linux/prober.lua | 6 +++++- xmake/scripts/platform/macosx/prober.lua | 6 +++++- xmake/scripts/platform/mingw/prober.lua | 6 +++++- xmake/scripts/platform/watchos/prober.lua | 6 +++++- xmake/scripts/platform/watchsimulator/prober.lua | 6 +++++- xmake/scripts/platform/windows/prober.lua | 6 +++++- 8 files changed, 40 insertions(+), 8 deletions(-) (limited to 'xmake/scripts') diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua index f63f8ea5c..3b096fba2 100644 --- a/xmake/scripts/platform/iphoneos/prober.lua +++ b/xmake/scripts/platform/iphoneos/prober.lua @@ -240,7 +240,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/iphonesimulator/prober.lua b/xmake/scripts/platform/iphonesimulator/prober.lua index 3683b9c57..86f6b70c6 100644 --- a/xmake/scripts/platform/iphonesimulator/prober.lua +++ b/xmake/scripts/platform/iphonesimulator/prober.lua @@ -240,7 +240,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/linux/prober.lua b/xmake/scripts/platform/linux/prober.lua index b476b0b8a..91b2ff685 100644 --- a/xmake/scripts/platform/linux/prober.lua +++ b/xmake/scripts/platform/linux/prober.lua @@ -132,7 +132,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/macosx/prober.lua b/xmake/scripts/platform/macosx/prober.lua index d7f031c12..d4602e22a 100644 --- a/xmake/scripts/platform/macosx/prober.lua +++ b/xmake/scripts/platform/macosx/prober.lua @@ -240,7 +240,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/mingw/prober.lua b/xmake/scripts/platform/mingw/prober.lua index f70449697..b8471485f 100644 --- a/xmake/scripts/platform/mingw/prober.lua +++ b/xmake/scripts/platform/mingw/prober.lua @@ -132,7 +132,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/watchos/prober.lua b/xmake/scripts/platform/watchos/prober.lua index 8428909c4..b6563603c 100644 --- a/xmake/scripts/platform/watchos/prober.lua +++ b/xmake/scripts/platform/watchos/prober.lua @@ -240,7 +240,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/watchsimulator/prober.lua b/xmake/scripts/platform/watchsimulator/prober.lua index 29564edf1..a14d92054 100644 --- a/xmake/scripts/platform/watchsimulator/prober.lua +++ b/xmake/scripts/platform/watchsimulator/prober.lua @@ -240,7 +240,11 @@ function prober._probe_toolpath(configs, kind, cross, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true diff --git a/xmake/scripts/platform/windows/prober.lua b/xmake/scripts/platform/windows/prober.lua index d32fac686..d5ccdef88 100644 --- a/xmake/scripts/platform/windows/prober.lua +++ b/xmake/scripts/platform/windows/prober.lua @@ -216,7 +216,11 @@ function prober._probe_toolpath(configs, kind, name, description) if toolpath then configs.set(kind, toolpath) end -- trace - utils.verbose("checking for %s (%s) ... %s", description, kind, utils.ifelse(toolpath, path.filename(toolpath), "no")) + if toolpath then + utils.verbose("checking for %s (%s) ... %s", description, kind, path.filename(toolpath), "no") + else + utils.verbose("checking for %s (%s) ... no", description, kind) + end -- ok return true -- cgit v1.3.1