add git.clone and http.download module

6 files changed, 203 insertions, 3 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00b1e4720..aa0b1bb77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 * [#83](https://github.com/tboox/xmake/issues/83): Add `add_csnippet` and `add_cxxsnippet` into `option` for detecting some compiler features.
 * [#83](https://github.com/tboox/xmake/issues/83): Add user extension modules to detect program, libraries and files.
 * Add `find_program`, `find_file` and `find_library` module interfaces.
+* Add `net.*` and `devel.*` extension modules
 
 ### Changes
 
@@ -294,6 +295,7 @@
 * [#83](https://github.com/tboox/xmake/issues/83): 添加 `add_csnippet`，`add_cxxsnippet`到`option`来检测一些编译器特性
 * [#83](https://github.com/tboox/xmake/issues/83): 添加用户扩展模块去探测程序，库文件以及其他主机环境
 * 添加`find_program`, `find_file` 和 `find_library` 等模块接口
+* 添加`net.*`和`devel.*`扩展模块
 
 ### 改进
 
diff --git a/xmake/core/sandbox/modules/import.lua b/xmake/core/sandbox/modules/import.lua
index 56e517e5b..c4011f7a4 100644
--- a/xmake/core/sandbox/modules/import.lua
+++ b/xmake/core/sandbox/modules/import.lua
@@ -159,6 +159,11 @@ function sandbox_import._load(dir, name, instance)
                     return nil, errors
                 end
 
+                -- bind main entry 
+                if result.main then
+                    setmetatable(result, { __call = function (_, ...) return result.main(...) end})
+                end
+
                 -- get the module path
                 local modulepath = path.relative(modulefile, moduleroot)
                 if not modulepath then
diff --git a/xmake/core/sandbox/modules/os.lua b/xmake/core/sandbox/modules/os.lua
index 04fac619d..03943072d 100644
--- a/xmake/core/sandbox/modules/os.lua
+++ b/xmake/core/sandbox/modules/os.lua
@@ -250,6 +250,30 @@ function sandbox_os.runv(shellname, argv)
     end
 end
 
+-- quietly run shell and echo verbose info if [-v|--verbose] option is enabled
+function sandbox_os.vrun(cmd, ...)
+
+    -- echo command
+    if option.get("verbose") then
+        print(vformat(cmd, ...))
+    end
+
+    -- run it
+    utils.ifelse(option.get("verbose"), sandbox_os.exec, sandbox_os.run)(cmd, ...)  
+end
+
+-- quietly run shell with arguments list and echo verbose info if [-v|--verbose] option is enabled
+function sandbox_os.vrunv(shellname, argv)
+
+    -- echo command
+    if option.get("verbose") then
+        print(vformat(shellname), table.concat(argv, " "))
+    end
+
+    -- run it
+    utils.ifelse(option.get("verbose"), sandbox_os.execv, sandbox_os.runv)(shellname, argv)  
+end
+
 -- run shell and return output and error data
 function sandbox_os.iorun(cmd, ...)
 
diff --git a/xmake/modules/devel/git/clone.lua b/xmake/modules/devel/git/clone.lua
new file mode 100644
index 000000000..c717065b8
--- /dev/null
+++ b/xmake/modules/devel/git/clone.lua
@@ -0,0 +1,74 @@
+--!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        clone.lua
+--
+
+-- imports
+import("core.base.option")
+import("detect.tool.find_git")
+
+-- clone url
+--
+-- @param url   the git url
+-- @param opt   the argument options
+--
+-- @code
+--
+-- import("devel.git")
+-- 
+-- git.clone("[email protected]:tboox/xmake.git")
+-- git.clone("[email protected]:tboox/xmake.git", {depth = 1, branch = "master", outputdir = "/tmp/xmake"})
+--
+-- @endcode
+--
+function main(url, opt)
+
+    -- find git
+    local program = find_git()
+    if not program then
+        return 
+    end
+
+    -- init argv
+    local argv = {"clone", url}
+
+    -- set branch
+    opt = opt or {}
+    if opt.branch then
+        table.insert(argv, "-b")
+        table.insert(argv, opt.branch)
+    end
+
+    -- set depth
+    if opt.depth then
+        table.insert(argv, "--depth")
+        table.insert(argv, ifelse(type(opt.depth) == "number", tostring(opt.depth), opt.depth))
+    end
+
+    -- set outputdir
+    if opt.outputdir then
+        table.insert(argv, path.translate(opt.outputdir))
+    end
+
+    -- clone it
+    os.vrunv(program, argv)
+end
diff --git a/xmake/modules/net/http/download.lua b/xmake/modules/net/http/download.lua
new file mode 100644
index 000000000..66e211578
--- /dev/null
+++ b/xmake/modules/net/http/download.lua
@@ -0,0 +1,98 @@
+--!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        download.lua
+--
+
+-- imports
+import("core.base.option")
+import("detect.tool.find_curl")
+import("detect.tool.find_wget")
+
+-- download url using curl
+function _curl_download(program, url, outputfile)
+
+    -- set basic arguments
+    local argv = {}
+    if option.get("verbose") then
+        table.insert(argv, "-SL")
+    else
+        table.insert(argv, "-fsSL")
+    end
+
+    -- set url
+    table.insert(argv, url)
+
+    -- ensure output directory
+    local outputdir = path.directory(outputfile)
+    if not os.isdir(outputdir) then
+        os.mkdir(outputdir)
+    end
+
+    -- set outputfile
+    table.insert(argv, "-o")
+    table.insert(argv, outputfile)
+
+    -- clone it
+    os.vrunv(program, argv)
+end
+
+-- download url using wget
+function _wget_download(program, url, outputfile)
+
+    -- ensure output directory
+    local argv = {url}
+    local outputdir = path.directory(outputfile)
+    if not os.isdir(outputdir) then
+        os.mkdir(outputdir)
+    end
+
+    -- set outputfile
+    table.insert(argv, "-O")
+    table.insert(argv, outputfile)
+
+    -- clone it
+    os.vrunv(program, argv)
+end
+
+-- download url
+--
+-- @param url           the input url
+-- @param outputfile    the output file
+--
+--
+function main(url, outputfile)
+
+    -- init output file
+    outputfile = outputfile or path.filename(url)
+    
+    -- attempt to download url using curl first
+    local program = find_curl()
+    if program then
+        return _curl_download(program, url, outputfile)
+    end
+
+    -- download url using wget
+    program = find_wget()
+    if program then
+        return _wget_download(program, url, outputfile)
+    end
+end
diff --git a/xmake/platforms/checker.lua b/xmake/platforms/checker.lua
index e81846353..32124ec97 100644
--- a/xmake/platforms/checker.lua
+++ b/xmake/platforms/checker.lua
@@ -182,9 +182,6 @@ end
 -- check the xcode sdk version
 function check_xcode_sdkver(config)
 
-    -- get plat
-    local plat = config.get("plat")
-
     -- get the xcode sdk version
     local xcode_sdkver  = config.get("xcode_sdkver")
     if not xcode_sdkver then