rename package.manager.install to install_package

8 files changed, 79 insertions, 14 deletions

diff --git a/xmake/modules/package/manager/apt/install.lua b/xmake/modules/package/manager/apt/install_package.lua
index 12eed657b..419d87288 100644
--- a/xmake/modules/package/manager/apt/install.lua
+++ b/xmake/modules/package/manager/apt/install_package.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        install.lua
+-- @file        install_package.lua
 --
 
 -- imports
diff --git a/xmake/modules/package/manager/brew/install.lua b/xmake/modules/package/manager/brew/install_package.lua
index 0acb0c8a5..9f2a4dd92 100644
--- a/xmake/modules/package/manager/brew/install.lua
+++ b/xmake/modules/package/manager/brew/install_package.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        install.lua
+-- @file        install_package.lua
 --
 
 -- imports
diff --git a/xmake/modules/package/manager/conan/find_package.lua b/xmake/modules/package/manager/conan/find_package.lua
new file mode 100644
index 000000000..bec025128
--- /dev/null
+++ b/xmake/modules/package/manager/conan/find_package.lua
@@ -0,0 +1,32 @@
+--!A cross-platform 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 - 2019, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_package.lua
+--
+
+-- find package using the conan package manager
+--
+-- @param name  the package name
+-- @param opt   the options, .e.g {verbose = true, version = "1.12.x")
+--
+function main(name, opt)
+
+end
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua
new file mode 100644
index 000000000..8de7c483f
--- /dev/null
+++ b/xmake/modules/package/manager/find_package.lua
@@ -0,0 +1,33 @@
+--!A cross-platform 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 - 2019, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        find_package.lua
+--
+
+-- find package using the package manager
+--
+-- @param name  the package name, e.g. zlib 1.12.x (try all), XMAKE::zlib 1.12.x, BREW::zlib, VCPKG::zlib, CONAN::OpenSSL/1.0.2n@conan/stable
+-- @param opt   the options, .e.g {verbose = true, version = "1.12.x")
+--
+--
+function main(name, opt)
+
+end
diff --git a/xmake/modules/package/manager/install.lua b/xmake/modules/package/manager/install_package.lua
index 911646004..4981d5746 100644
--- a/xmake/modules/package/manager/install.lua
+++ b/xmake/modules/package/manager/install_package.lua
@@ -19,10 +19,10 @@
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        install.lua
+-- @file        install_package.lua
 --
 
--- install package using third-party package manager
+-- install package using the package manager
 --
 -- @param name  the package name
 -- @param opt   the options, .e.g {verbose = true, brew = "the package name in brew", pacman = "xxx", apt = "xxx", yum = "xxx"}
@@ -34,16 +34,16 @@ function main(name, opt)
     local scripts = {}
     local host = os.host()
     if host == "macosx" then
-        table.insert(scripts, import("brew.install",   {anonymous = true}))
+        table.insert(scripts, import("brew.install_package",   {anonymous = true}))
     elseif host == "linux" then
-        table.insert(scripts, import("apt.install",    {anonymous = true}))
-        table.insert(scripts, import("yum.install",    {anonymous = true}))
-        table.insert(scripts, import("pacman.install", {anonymous = true}))
-        table.insert(scripts, import("brew.install",   {anonymous = true}))
+        table.insert(scripts, import("apt.install_package",    {anonymous = true}))
+        table.insert(scripts, import("yum.install_package",    {anonymous = true}))
+        table.insert(scripts, import("pacman.install_package", {anonymous = true}))
+        table.insert(scripts, import("brew.install_package",   {anonymous = true}))
     elseif host == "windows" then
-        table.insert(scripts, import("pacman.install", {anonymous = true})) -- msys/mingw
+        table.insert(scripts, import("pacman.install_package", {anonymous = true})) -- msys/mingw
     end
-    assert(#scripts > 0, "package manager not found!")
+    assert(#scripts > 0, "the package manager not found!")
 
     -- run install script
     for _, script in ipairs(scripts) do
diff --git a/xmake/modules/package/manager/pacman/install.lua b/xmake/modules/package/manager/pacman/install_package.lua
index 3c7ae5e77..cfdabd30c 100644
--- a/xmake/modules/package/manager/pacman/install.lua
+++ b/xmake/modules/package/manager/pacman/install_package.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        install.lua
+-- @file        install_package.lua
 --
 
 -- imports
diff --git a/xmake/modules/package/manager/yum/install.lua b/xmake/modules/package/manager/yum/install_package.lua
index 6465f7c0b..4986df28a 100644
--- a/xmake/modules/package/manager/yum/install.lua
+++ b/xmake/modules/package/manager/yum/install_package.lua
@@ -19,7 +19,7 @@
 -- Copyright (C) 2015 - 2019, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        install.lua
+-- @file        install_package.lua
 --
 
 -- imports
diff --git a/xmake/repository/packages/g/git/xmake.lua b/xmake/repository/packages/g/git/xmake.lua
index cfe711fda..74f000b65 100644
--- a/xmake/repository/packages/g/git/xmake.lua
+++ b/xmake/repository/packages/g/git/xmake.lua
@@ -31,7 +31,7 @@ package("git")
     end)
 
     on_install("macosx", "linux", function (package)
-        import("package.manager.install")("git")
+        import("package.manager.install_package")("git")
     end)
 
     on_install("windows", function (package)