From 6e0271d2e38f9b4d48ec271af225f71a0faa4f49 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Wed, 5 Jul 2017 20:48:55 +0800
Subject: rename has_cxsnippets to check_vxsnippets

---
 xmake/core/project/option.lua                 |   6 +-
 xmake/modules/lib/detect/check_cxsnippets.lua | 227 ++++++++++++++++++++++++++
 xmake/modules/lib/detect/has_cxsnippets.lua   | 227 --------------------------
 3 files changed, 230 insertions(+), 230 deletions(-)
 create mode 100644 xmake/modules/lib/detect/check_cxsnippets.lua
 delete mode 100644 xmake/modules/lib/detect/has_cxsnippets.lua

diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua
index 501f9ce69..e7231de8b 100644
--- a/xmake/core/project/option.lua
+++ b/xmake/core/project/option.lua
@@ -58,8 +58,8 @@ end
 -- check option for c/c++
 function option:_cx_check()
 
-    -- import has_cxsnippets()
-    self._has_cxsnippets = self._has_cxsnippets or import("lib.detect.has_cxsnippets")
+    -- import check_cxsnippets()
+    self._check_cxsnippets = self._check_cxsnippets or import("lib.detect.check_cxsnippets")
 
     -- check for c and c++
     for _, kind in ipairs({"c", "cxx"}) do
@@ -81,7 +81,7 @@ function option:_cx_check()
             end
 
             -- check it
-            local ok, results_or_errors = sandbox.load(self._has_cxsnippets, snippets, {target = self, sourcekind = sourcekind, types = types, funcs = funcs, includes = includes})
+            local ok, results_or_errors = sandbox.load(self._check_cxsnippets, snippets, {target = self, sourcekind = sourcekind, types = types, funcs = funcs, includes = includes})
             if not ok then
                 return false, results_or_errors
             end
diff --git a/xmake/modules/lib/detect/check_cxsnippets.lua b/xmake/modules/lib/detect/check_cxsnippets.lua
new file mode 100644
index 000000000..812d55c08
--- /dev/null
+++ b/xmake/modules/lib/detect/check_cxsnippets.lua
@@ -0,0 +1,227 @@
+--!The Make-like Build Utility based on Lua
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+-- 
+-- Copyright (C) 2015 - 2017, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        check_cxsnippets.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.tool.linker")
+import("core.tool.compiler")
+import("core.language.language")
+
+-- get function name 
+--
+-- sigsetjmp
+-- sigsetjmp((void*)0, 0)
+-- sigsetjmp{sigsetjmp((void*)0, 0);}
+-- sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
+--
+function _funcname(funcinfo)
+
+    -- parse function name 
+    local name = string.match(funcinfo, "(.+){.+}")
+    if name == nil then
+        local pos = funcinfo:find("%(")
+        if pos then
+            name = funcinfo:sub(1, pos - 1)
+        else
+            name = funcinfo
+        end
+    end
+
+    -- ok
+    return name:trim()
+end
+
+-- get function code
+--
+-- sigsetjmp
+-- sigsetjmp((void*)0, 0)
+-- sigsetjmp{sigsetjmp((void*)0, 0);}
+-- sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
+--
+function _funccode(funcinfo)
+
+    -- parse function code
+    local code = string.match(funcinfo, ".+{(.+)}")
+    if code == nil then
+        local pos = funcinfo:find("%(")
+        if pos then
+            code = funcinfo
+        else
+            code = string.format("volatile void* p%s = (void*)&%s;", funcinfo, funcinfo)
+        end
+    end
+
+    -- ok
+    return code
+end
+
+-- make source code
+function _sourcecode(snippets, opt)
+
+    -- add includes
+    local sourcecode = ""
+    for _, include in ipairs(opt.includes) do
+        sourcecode = format("%s\n#include <%s>", sourcecode, include)
+    end
+    sourcecode = sourcecode .. "\n"
+
+    -- add types
+    for _, typename in ipairs(opt.types) do
+        sourcecode = format("%s\ntypedef %s __type_%s;", sourcecode, typename, typename:gsub("[^%a]", "_"))
+    end
+    sourcecode = sourcecode .. "\n"
+
+    -- add snippets
+    for _, snippet in ipairs(snippets) do
+        sourcecode = sourcecode .. "\n" .. snippet
+    end
+    sourcecode = sourcecode .. "\n"
+
+    -- enter main function
+    sourcecode = sourcecode .. "int main(int argc, char** argv)\n{\n"
+
+    -- add funcs
+    for _, funcinfo in ipairs(opt.funcs) do
+        sourcecode = format("%s\n    %s;", sourcecode, _funccode(funcinfo))
+    end
+
+    -- leave main function
+    sourcecode = sourcecode .. "\n    return 0;\n}\n"
+
+    -- done
+    return sourcecode
+end
+
+-- check the given c snippets?
+--
+-- @param snippets  the snippets
+-- @param opt       the argument options
+--                  .e.g 
+--                  { verbose = false, target = [target|option], sourcekind = "[cc|cxx]"
+--                  , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}}
+--
+-- funcs:
+--      sigsetjmp
+--      sigsetjmp((void*)0, 0)
+--      sigsetjmp{sigsetjmp((void*)0, 0);}
+--      sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
+--
+-- @return          true or false
+--
+-- @code
+-- local ok = check_cxsnippets("void test() {}")
+-- local ok = check_cxsnippets({"void test(){}", "#define TEST 1"}, {types = "wchar_t", includes = "stdio.h"})
+-- @endcode
+--
+function main(snippets, opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- init snippets
+    snippets = snippets or {}
+
+    -- get links
+    local links = table.wrap(opt.links)
+    if opt.target then
+        table.join2(links, opt.target:get("links"))
+    end
+
+    -- get types
+    local types = table.wrap(opt.types)
+
+    -- get includes
+    local includes = table.wrap(opt.includes)
+
+    -- get funcs
+    local funcs = {}
+    for _, funcinfo in ipairs(opt.funcs) do
+        table.insert(funcs, _funcname(funcinfo))
+    end
+
+    -- make source code
+    local sourcecode = _sourcecode(snippets, opt)
+
+    -- get c/c++ extension
+    local extension = ".c"
+    if opt.sourcekind then
+        extension = table.wrap(language.sourcekinds()[opt.sourcekind])[1] or ".c"
+    end
+
+    -- make the source file
+    local sourcefile = os.tmpfile() .. extension
+    local objectfile = os.tmpfile() .. ".o"
+    local binaryfile = os.tmpfile() .. ".b"
+    io.writefile(sourcefile, sourcecode)
+
+    -- @note cannot cache result, all conditions will be changed
+    -- attempt to compile it
+    local ok = try
+    {
+        function () 
+            compiler.compile(sourcefile, objectfile, opt)
+            if #links > 0 then
+                linker.link("binary", {"cc", "cxx"}, objectfile, binaryfile, opt)
+            end
+            return true
+        end,
+        catch 
+        {
+            function (errors)
+                if option.get("verbose") then
+                    cprint("${red}%s", errors)
+                end
+            end
+        }
+    }
+
+    -- remove some files
+    os.tryrm(sourcefile)
+    os.tryrm(objectfile)
+    os.tryrm(binaryfile)
+
+    -- trace
+    if opt.verbose or option.get("verbose") then
+        local kind = ifelse(sourcekind == "cc", "c", "c++")
+        if #includes > 0 then
+            cprint("checking for the %s includes %s ... %s", kind, table.concat(includes, ", "), ifelse(ok, "${green}ok", "${red}no"))
+        end
+        if #types > 0 then
+            cprint("checking for the %s types %s ... %s", kind, table.concat(types, ", "), ifelse(ok, "${green}ok", "${red}no"))
+        end
+        if #funcs > 0 then
+            cprint("checking for the %s funcs %s ... %s", kind, table.concat(funcs, ", "), ifelse(ok, "${green}ok", "${red}no"))
+        end
+        if #links > 0 then
+            cprint("checking for the %s links %s ... %s", kind, table.concat(links, ", "), ifelse(ok, "${green}ok", "${red}no"))
+        end
+        for _, snippet in ipairs(snippets) do
+            cprint("checking for the %s snippet %s ... %s", kind, snippet:sub(1, 16), ifelse(ok, "${green}ok", "${red}no"))
+        end
+    end
+
+    -- ok?
+    return ok
+end
+
diff --git a/xmake/modules/lib/detect/has_cxsnippets.lua b/xmake/modules/lib/detect/has_cxsnippets.lua
deleted file mode 100644
index 59ef12872..000000000
--- a/xmake/modules/lib/detect/has_cxsnippets.lua
+++ /dev/null
@@ -1,227 +0,0 @@
---!The Make-like Build Utility based on Lua
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file
--- distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"); you may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
--- 
--- Copyright (C) 2015 - 2017, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        has_csnippets.lua
---
-
--- imports
-import("core.base.option")
-import("core.tool.linker")
-import("core.tool.compiler")
-import("core.language.language")
-
--- get function name 
---
--- sigsetjmp
--- sigsetjmp((void*)0, 0)
--- sigsetjmp{sigsetjmp((void*)0, 0);}
--- sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
---
-function _funcname(funcinfo)
-
-    -- parse function name 
-    local name = string.match(funcinfo, "(.+){.+}")
-    if name == nil then
-        local pos = funcinfo:find("%(")
-        if pos then
-            name = funcinfo:sub(1, pos - 1)
-        else
-            name = funcinfo
-        end
-    end
-
-    -- ok
-    return name:trim()
-end
-
--- get function code
---
--- sigsetjmp
--- sigsetjmp((void*)0, 0)
--- sigsetjmp{sigsetjmp((void*)0, 0);}
--- sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
---
-function _funccode(funcinfo)
-
-    -- parse function code
-    local code = string.match(funcinfo, ".+{(.+)}")
-    if code == nil then
-        local pos = funcinfo:find("%(")
-        if pos then
-            code = funcinfo
-        else
-            code = string.format("volatile void* p%s = (void*)&%s;", funcinfo, funcinfo)
-        end
-    end
-
-    -- ok
-    return code
-end
-
--- make source code
-function _sourcecode(snippets, opt)
-
-    -- add includes
-    local sourcecode = ""
-    for _, include in ipairs(opt.includes) do
-        sourcecode = format("%s\n#include <%s>", sourcecode, include)
-    end
-    sourcecode = sourcecode .. "\n"
-
-    -- add types
-    for _, typename in ipairs(opt.types) do
-        sourcecode = format("%s\ntypedef %s __type_%s;", sourcecode, typename, typename:gsub("[^%a]", "_"))
-    end
-    sourcecode = sourcecode .. "\n"
-
-    -- add snippets
-    for _, snippet in ipairs(snippets) do
-        sourcecode = sourcecode .. "\n" .. snippet
-    end
-    sourcecode = sourcecode .. "\n"
-
-    -- enter main function
-    sourcecode = sourcecode .. "int main(int argc, char** argv)\n{\n"
-
-    -- add funcs
-    for _, funcinfo in ipairs(opt.funcs) do
-        sourcecode = format("%s\n    %s;", sourcecode, _funccode(funcinfo))
-    end
-
-    -- leave main function
-    sourcecode = sourcecode .. "\n    return 0;\n}\n"
-
-    -- done
-    return sourcecode
-end
-
--- has the given c snippets?
---
--- @param snippets  the snippets
--- @param opt       the argument options
---                  .e.g 
---                  { verbose = false, target = [target|option], sourcekind = "[cc|cxx]"
---                  , types = {"wchar_t", "char*"}, includes = "stdio.h", funcs = {"sigsetjmp", "sigsetjmp((void*)0, 0)"}}
---
--- funcs:
---      sigsetjmp
---      sigsetjmp((void*)0, 0)
---      sigsetjmp{sigsetjmp((void*)0, 0);}
---      sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
---
--- @return          true or false
---
--- @code
--- local ok = has_csnippets("void test() {}")
--- local ok = has_csnippets({"void test(){}", "#define TEST 1"}, {types = "wchar_t", includes = "stdio.h"})
--- @endcode
---
-function main(snippets, opt)
-
-    -- init options
-    opt = opt or {}
-
-    -- init snippets
-    snippets = snippets or {}
-
-    -- get links
-    local links = table.wrap(opt.links)
-    if opt.target then
-        table.join2(links, opt.target:get("links"))
-    end
-
-    -- get types
-    local types = table.wrap(opt.types)
-
-    -- get includes
-    local includes = table.wrap(opt.includes)
-
-    -- get funcs
-    local funcs = {}
-    for _, funcinfo in ipairs(opt.funcs) do
-        table.insert(funcs, _funcname(funcinfo))
-    end
-
-    -- make source code
-    local sourcecode = _sourcecode(snippets, opt)
-
-    -- get c/c++ extension
-    local extension = ".c"
-    if opt.sourcekind then
-        extension = table.wrap(language.sourcekinds()[opt.sourcekind])[1] or ".c"
-    end
-
-    -- make the source file
-    local sourcefile = os.tmpfile() .. extension
-    local objectfile = os.tmpfile() .. ".o"
-    local binaryfile = os.tmpfile() .. ".b"
-    io.writefile(sourcefile, sourcecode)
-
-    -- @note cannot cache result, all conditions will be changed
-    -- attempt to compile it
-    local ok = try
-    {
-        function () 
-            compiler.compile(sourcefile, objectfile, opt)
-            if #links > 0 then
-                linker.link("binary", {"cc", "cxx"}, objectfile, binaryfile, opt)
-            end
-            return true
-        end,
-        catch 
-        {
-            function (errors)
-                if option.get("verbose") then
-                    cprint("${red}%s", errors)
-                end
-            end
-        }
-    }
-
-    -- remove some files
-    os.tryrm(sourcefile)
-    os.tryrm(objectfile)
-    os.tryrm(binaryfile)
-
-    -- trace
-    if opt.verbose or option.get("verbose") then
-        local kind = ifelse(sourcekind == "cc", "c", "c++")
-        if #includes > 0 then
-            cprint("checking for the %s includes %s ... %s", kind, table.concat(includes, ", "), ifelse(ok, "${green}ok", "${red}no"))
-        end
-        if #types > 0 then
-            cprint("checking for the %s types %s ... %s", kind, table.concat(types, ", "), ifelse(ok, "${green}ok", "${red}no"))
-        end
-        if #funcs > 0 then
-            cprint("checking for the %s funcs %s ... %s", kind, table.concat(funcs, ", "), ifelse(ok, "${green}ok", "${red}no"))
-        end
-        if #links > 0 then
-            cprint("checking for the %s links %s ... %s", kind, table.concat(links, ", "), ifelse(ok, "${green}ok", "${red}no"))
-        end
-        for _, snippet in ipairs(snippets) do
-            cprint("checking for the %s snippet %s ... %s", kind, snippet:sub(1, 16), ifelse(ok, "${green}ok", "${red}no"))
-        end
-    end
-
-    -- ok?
-    return ok
-end
-
-- 
cgit v1.3.1