rename sdk detect modules

12 files changed, 28 insertions, 28 deletions

diff --git a/xmake/modules/detect/sdks/find_cuda_toolchains.lua b/xmake/modules/detect/sdks/find_cuda.lua
index 534b570ac..16e66107f 100644
--- a/xmake/modules/detect/sdks/find_cuda_toolchains.lua
+++ b/xmake/modules/detect/sdks/find_cuda.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2018, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        find_cuda_toolchains.lua
+-- @file        find_cuda.lua
 --
 
 -- imports
@@ -54,7 +54,7 @@ end
 --
 -- @code 
 --
--- local toolchains = find_cuda_toolchains("/Developer/NVIDIA/CUDA-9.1")
+-- local toolchains = find_cuda("/Developer/NVIDIA/CUDA-9.1")
 -- 
 -- @endcode
 --
diff --git a/xmake/modules/detect/sdks/find_ndk_toolchains.lua b/xmake/modules/detect/sdks/find_ndk.lua
index 235466661..235466661 100644
--- a/xmake/modules/detect/sdks/find_ndk_toolchains.lua
+++ b/xmake/modules/detect/sdks/find_ndk.lua
diff --git a/xmake/modules/detect/sdks/find_xcode_dir.lua b/xmake/modules/detect/sdks/find_xcode.lua
index a15182b84..143161c1a 100644
--- a/xmake/modules/detect/sdks/find_xcode_dir.lua
+++ b/xmake/modules/detect/sdks/find_xcode.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2018, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        find_xcode_dir.lua
+-- @file        find_xcode.lua
 --
 
 -- imports
@@ -31,7 +31,7 @@ import("lib.detect.find_directory")
 --
 -- @code 
 --
--- local xcode_dir = find_xcode_dir()
+-- local xcode_dir = find_xcode()
 -- 
 -- @endcode
 --
diff --git a/xmake/modules/detect/sdks/find_xcode_sdkvers.lua b/xmake/modules/detect/sdks/find_xcode_sdkvers.lua
index 3cc514201..adb327b79 100644
--- a/xmake/modules/detect/sdks/find_xcode_sdkvers.lua
+++ b/xmake/modules/detect/sdks/find_xcode_sdkvers.lua
@@ -24,7 +24,7 @@
 
 -- imports
 import("core.project.config")
-import("detect.sdks.find_xcode_dir")
+import("detect.sdks.find_xcode")
 
 -- find xcode sdk versions for the given platform 
 --
@@ -48,7 +48,7 @@ function main(opt)
 
     -- get xcode directory
     local xcode_sdkvers = {}
-    local xcode_dir = opt.xcode_dir or find_xcode_dir() 
+    local xcode_dir = opt.xcode_dir or find_xcode() 
     if not xcode_dir or not os.isdir(xcode_dir) then
         return xcode_sdkvers
     end
diff --git a/xmake/modules/detect/tools/find_nvcc.lua b/xmake/modules/detect/tools/find_nvcc.lua
index 6e361dd9c..3569c7172 100644
--- a/xmake/modules/detect/tools/find_nvcc.lua
+++ b/xmake/modules/detect/tools/find_nvcc.lua
@@ -26,7 +26,7 @@
 import("core.project.config")
 import("lib.detect.find_program")
 import("lib.detect.find_programver")
-import("detect.sdks.find_cuda_toolchains")
+import("detect.sdks.find_cuda")
 
 -- find nvcc 
 --
@@ -52,7 +52,7 @@ function main(opt)
 
     -- not found? attempt to find program from cuda toolchains
     if not program then
-        local toolchains = find_cuda_toolchains(config.get("cuda_dir"))
+        local toolchains = find_cuda(config.get("cuda_dir"))
         if toolchains and toolchains.bindir then
             program = find_program(path.join(toolchains.bindir, "nvcc"), opt)
         end
diff --git a/xmake/platforms/android/check.lua b/xmake/platforms/android/check.lua
index a2fbc4d56..530231371 100644
--- a/xmake/platforms/android/check.lua
+++ b/xmake/platforms/android/check.lua
@@ -25,7 +25,7 @@
 -- imports
 import(".checker")
 import("detect.sdks.find_ndk_sdkvers")
-import("detect.sdks.find_ndk_toolchains")
+import("detect.sdks.find_ndk")
 
 -- check the sdk version for ndk
 function _check_ndk_sdkver(config)
@@ -72,7 +72,7 @@ function _check_toolchains(config)
     if not toolchains then
 
         -- find first toolchains 
-        for _, toolchains in ipairs(find_ndk_toolchains(config.get("ndk"), config.get("arch"))) do
+        for _, toolchains in ipairs(find_ndk(config.get("ndk"), config.get("arch"))) do
             config.set("toolchains", toolchains.bin)
             config.set("cross", toolchains.cross)
             break
diff --git a/xmake/platforms/checker.lua b/xmake/platforms/checker.lua
index 517c8baff..d0d9621ea 100644
--- a/xmake/platforms/checker.lua
+++ b/xmake/platforms/checker.lua
@@ -24,9 +24,9 @@
 
 -- imports
 import("core.base.option")
-import("detect.sdks.find_xcode_dir")
+import("detect.sdks.find_xcode")
 import("detect.sdks.find_xcode_sdkvers")
-import("detect.sdks.find_cuda_toolchains")
+import("detect.sdks.find_cuda")
 import("lib.detect.find_tool")
 
 -- find the given tool
@@ -117,14 +117,14 @@ function check_arch(config, default)
 end
 
 -- check the xcode application directory
-function check_xcode_dir(config, optional)
+function check_xcode(config, optional)
 
     -- get the xcode directory
     local xcode_dir = config.get("xcode_dir")
     if not xcode_dir then
 
         -- check ok? update it
-        xcode_dir = find_xcode_dir()
+        xcode_dir = find_xcode()
         if xcode_dir then
 
             -- save it
@@ -181,14 +181,14 @@ function check_xcode_sdkver(config, optional)
 end
 
 -- check the cuda sdk toolchains
-function check_cuda_toolchains(config)
+function check_cuda(config)
 
     -- get the cuda directory
     local cuda_dir = config.get("cuda_dir")
     if not cuda_dir then
 
         -- check ok? update it
-        local toolchains = find_cuda_toolchains()
+        local toolchains = find_cuda()
         if toolchains then
 
             -- save it
diff --git a/xmake/platforms/iphoneos/check.lua b/xmake/platforms/iphoneos/check.lua
index 15718fa72..4432e5960 100644
--- a/xmake/platforms/iphoneos/check.lua
+++ b/xmake/platforms/iphoneos/check.lua
@@ -90,14 +90,14 @@ function main(kind, toolkind)
     _g.config = 
     {
         { checker.check_arch, "armv7" }
-    ,   checker.check_xcode_dir
+    ,   checker.check_xcode
     ,   checker.check_xcode_sdkver
     }
 
     -- init the check list of global
     _g.global = 
     {
-        checker.check_xcode_dir
+        checker.check_xcode
     }
 
     -- check it
diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua
index f5d4c4359..6031839e1 100644
--- a/xmake/platforms/linux/check.lua
+++ b/xmake/platforms/linux/check.lua
@@ -169,14 +169,14 @@ function main(kind, toolkind)
     _g.config = 
     {
         __check_arch
-    ,   checker.check_cuda_toolchains
+    ,   checker.check_cuda
     }
 
     -- init the check list of global
     _g.global = 
     {
         _check_ndk_sdkver
-    ,   checker.check_cuda_toolchains
+    ,   checker.check_cuda
     }
 
     -- check it
diff --git a/xmake/platforms/macosx/check.lua b/xmake/platforms/macosx/check.lua
index 5fd68f314..959b90c3b 100644
--- a/xmake/platforms/macosx/check.lua
+++ b/xmake/platforms/macosx/check.lua
@@ -135,16 +135,16 @@ function main(kind, toolkind)
     _g.config = 
     {
         checker.check_arch
-    ,   { checker.check_xcode_dir, true }
+    ,   { checker.check_xcode, true }
     ,   { checker.check_xcode_sdkver, true }
-    ,   checker.check_cuda_toolchains
+    ,   checker.check_cuda
     }
 
     -- init the check list of global
     _g.global = 
     {
-        checker.check_xcode_dir
-    ,   checker.check_cuda_toolchains
+        checker.check_xcode
+    ,   checker.check_cuda
     }
 
     -- check it
diff --git a/xmake/platforms/watchos/check.lua b/xmake/platforms/watchos/check.lua
index dec7ddea9..07b619dac 100644
--- a/xmake/platforms/watchos/check.lua
+++ b/xmake/platforms/watchos/check.lua
@@ -90,14 +90,14 @@ function main(kind, toolkind)
     _g.config = 
     {
         { checker.check_arch, "armv7k" }
-    ,   checker.check_xcode_dir
+    ,   checker.check_xcode
     ,   checker.check_xcode_sdkver
     }
 
     -- init the check list of global
     _g.global = 
     {
-        checker.check_xcode_dir
+        checker.check_xcode
     }
 
     -- check it
diff --git a/xmake/platforms/windows/check.lua b/xmake/platforms/windows/check.lua
index 2225f5dc9..912f6fb8c 100644
--- a/xmake/platforms/windows/check.lua
+++ b/xmake/platforms/windows/check.lua
@@ -202,7 +202,7 @@ function main(kind, toolkind)
     {
         { checker.check_arch, "x86" }
     ,   _check_vs
-    ,   checker.check_cuda_toolchains
+    ,   checker.check_cuda
     }
 
     -- init the check list of global
@@ -210,7 +210,7 @@ function main(kind, toolkind)
     {
         { checker.check_arch, "x86" }
     ,   _check_vs
-    ,   checker.check_cuda_toolchains
+    ,   checker.check_cuda
     ,   _clean_global
     }