diff options
| author | ruki <[email protected]> | 2017-06-06 18:41:05 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-06-06 18:41:05 +0800 |
| commit | 2309c5ec03eb09842814bcf03fffa8fa93999acf (patch) | |
| tree | d0e796ee7eff59a38eae6979b069a574eb51fe40 /xmake/plugins | |
| parent | b62c9a1a532058db12fb73cdfeb0e174c8cbf2f2 (diff) | |
add find_library and remove some old codes
Diffstat (limited to 'xmake/plugins')
| -rw-r--r-- | xmake/plugins/app2ipa/main.lua | 8 | ||||
| -rw-r--r-- | xmake/plugins/doxygen/main.lua | 8 | ||||
| -rw-r--r-- | xmake/plugins/lua/scripts/lipo.lua | 8 |
3 files changed, 9 insertions, 15 deletions
diff --git a/xmake/plugins/app2ipa/main.lua b/xmake/plugins/app2ipa/main.lua index 0cac7feab..7fba742dc 100644 --- a/xmake/plugins/app2ipa/main.lua +++ b/xmake/plugins/app2ipa/main.lua @@ -24,15 +24,13 @@ -- imports import("core.base.option") -import("core.tool.tool") +import("detect.tool.find_zip") -- main function main() - -- check the zip - local zip = tool.check("zip", nil, function (shellname) - os.run("%s -v", shellname) - end) + -- find zip + local zip = find_zip() assert(zip, "zip not found!") -- get the .app file path diff --git a/xmake/plugins/doxygen/main.lua b/xmake/plugins/doxygen/main.lua index 1788486c8..7129c7306 100644 --- a/xmake/plugins/doxygen/main.lua +++ b/xmake/plugins/doxygen/main.lua @@ -24,17 +24,15 @@ -- imports import("core.base.option") -import("core.tool.tool") import("core.project.config") import("core.project.project") +import("detect.tool.find_doxygen") -- main function main() - -- check the doxygen - local doxygen = tool.check("doxygen", nil, function (shellname) - os.run("%s -v", shellname) - end) + -- find doxygen + local doxygen = find_doxygen() assert(doxygen, "doxygen not found!") -- generate doxyfile first diff --git a/xmake/plugins/lua/scripts/lipo.lua b/xmake/plugins/lua/scripts/lipo.lua index 9cd9c4c96..8b87eb9e0 100644 --- a/xmake/plugins/lua/scripts/lipo.lua +++ b/xmake/plugins/lua/scripts/lipo.lua @@ -23,7 +23,7 @@ -- -- imports -import("core.tool.tool") +import("detect.tool.find_lipo") -- main -- @@ -39,10 +39,8 @@ function main(...) end args = args[1] - -- check the lipo - local lipo = tool.check("xcrun lipo", nil, function (shellname) - os.run("xcrun -find lipo") - end) + -- find the lipo + local lipo = find_lipo() assert(lipo, "lipo not found!") -- run it |