improve requires and add export

7 files changed, 145 insertions, 73 deletions

diff --git a/xmake/actions/require/export.lua b/xmake/actions/require/export.lua
new file mode 100644
index 000000000..a265511e1
--- /dev/null
+++ b/xmake/actions/require/export.lua
@@ -0,0 +1,60 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed 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-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        export.lua
+--
+
+-- imports
+import("core.base.task")
+import("core.base.option")
+import("impl.package")
+import("impl.repository")
+import("impl.environment")
+import("impl.utils.get_requires")
+
+-- export the given packages
+function main(requires)
+
+    -- enter environment 
+    environment.enter()
+
+    -- pull all repositories first if not exists
+    if not repository.pulled() then
+        task.run("repo", {update = true})
+    end
+
+    -- get requires and extra config
+    local requires_extra = nil
+    requires, requires_extra = get_requires(requires)
+    if not requires or #requires == 0 then
+        raise("requires(%s) not found!", table.concat(requires, " "))
+        return 
+    end
+
+    -- export packages
+    local packages = package.export_packages(requires, {requires_extra = requires_extra})
+    for _, instance in ipairs(packages) do
+        print("export: %s%s ok!", instance:name(), instance:version_str() and ("-" .. instance:version_str()) or "")
+    end
+    if not packages or #packages == 0 then
+        print("local packages not found!")
+    end
+
+    -- leave environment
+    environment.leave()
+end
+
diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua
index acbbcb193..bf84b436c 100644
--- a/xmake/actions/require/impl/package.lua
+++ b/xmake/actions/require/impl/package.lua
@@ -834,6 +834,13 @@ function uninstall_packages(requires, opt)
     return packages
 end
 
+-- export packages
+function export_packages(requires, opt)
+
+    -- init options
+    opt = opt or {}
+end
+
 -- search packages
 function search_packages(names)
 
diff --git a/xmake/actions/require/impl/utils/get_requires.lua b/xmake/actions/require/impl/utils/get_requires.lua
new file mode 100644
index 000000000..179459c1b
--- /dev/null
+++ b/xmake/actions/require/impl/utils/get_requires.lua
@@ -0,0 +1,57 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed 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-2020, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        get_requires.lua
+--
+
+-- imports
+import("core.base.option")
+import("core.project.project")
+
+-- get requires and extra config
+function main(requires)
+
+    -- init requires
+    local requires_extra = nil
+    if not requires then
+        requires, requires_extra = project.requires_str()
+    end
+    if not requires or #requires == 0 then
+        return 
+    end
+
+    -- get extra info
+    local extra =  option.get("extra")
+    local extrainfo = nil
+    if extra then
+        local v, err = string.deserialize(extra)
+        if err then
+            raise(err)
+        else
+            extrainfo = v
+        end
+    end
+
+    -- force to use the given requires extra info
+    if extrainfo then
+        requires_extra = requires_extra or {}
+        for _, require_str in ipairs(requires) do
+            requires_extra[require_str] = extrainfo
+        end
+    end
+    return requires, requires_extra
+end
diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua
index 75f7ec9db..502abf5b7 100644
--- a/xmake/actions/require/install.lua
+++ b/xmake/actions/require/install.lua
@@ -26,6 +26,7 @@ import("lib.detect.find_tool")
 import("impl.package")
 import("impl.repository")
 import("impl.environment")
+import("impl.utils.get_requires")
 
 -- register the required local package
 function _register_required_package(instance, requireinfo)
@@ -132,40 +133,6 @@ function _check_missing_packages(packages)
     _g.optional_missing = optional_missing
 end
 
--- get requires and extra config
-function _get_requires(requires)
-
-    -- init requires
-    local requires_extra = nil
-    if not requires then
-        requires, requires_extra = project.requires_str()
-    end
-    if not requires or #requires == 0 then
-        return 
-    end
-
-    -- get extra info
-    local extra =  option.get("extra")
-    local extrainfo = nil
-    if extra then
-        local v, err = string.deserialize(extra)
-        if err then
-            raise(err)
-        else
-            extrainfo = v
-        end
-    end
-
-    -- force to use the given requires extra info
-    if extrainfo then
-        requires_extra = requires_extra or {}
-        for _, require_str in ipairs(requires) do
-            requires_extra[require_str] = extrainfo
-        end
-    end
-    return requires, requires_extra
-end
-
 -- install packages
 function main(requires)
 
@@ -175,7 +142,7 @@ function main(requires)
 
     -- get requires and extra config
     local requires_extra = nil
-    requires, requires_extra = _get_requires(requires)
+    requires, requires_extra = get_requires(requires)
     if not requires or #requires == 0 then
         raise("requires(%s) not found!", table.concat(requires, " "))
         return 
diff --git a/xmake/actions/require/main.lua b/xmake/actions/require/main.lua
index 18aa567b5..340fa1895 100644
--- a/xmake/actions/require/main.lua
+++ b/xmake/actions/require/main.lua
@@ -29,6 +29,7 @@ import("scan")
 import("info")
 import("clean")
 import("search")
+import("export")
 import("install")
 import("uninstall")
 
@@ -84,6 +85,11 @@ function main()
     elseif option.get("uninstall") then
 
         uninstall(option.get("requires"))
+        
+    -- export the installed packages 
+    elseif option.get("export") then
+
+        export(option.get("requires"))
 
     -- show the given package info
     elseif option.get("info") then
diff --git a/xmake/actions/require/uninstall.lua b/xmake/actions/require/uninstall.lua
index 2ce1d4137..376a05b36 100644
--- a/xmake/actions/require/uninstall.lua
+++ b/xmake/actions/require/uninstall.lua
@@ -21,44 +21,10 @@
 -- imports
 import("core.base.task")
 import("core.base.option")
-import("core.project.project")
 import("impl.package")
 import("impl.repository")
 import("impl.environment")
-
--- get requires and extra config
-function _get_requires(requires)
-
-    -- init requires
-    local requires_extra = nil
-    if not requires then
-        requires, requires_extra = project.requires_str()
-    end
-    if not requires or #requires == 0 then
-        return 
-    end
-
-    -- get extra info
-    local extra =  option.get("extra")
-    local extrainfo = nil
-    if extra then
-        local v, err = string.deserialize(extra)
-        if err then
-            raise(err)
-        else
-            extrainfo = v
-        end
-    end
-
-    -- force to use the given requires extra info
-    if extrainfo then
-        requires_extra = requires_extra or {}
-        for _, require_str in ipairs(requires) do
-            requires_extra[require_str] = extrainfo
-        end
-    end
-    return requires, requires_extra
-end
+import("impl.utils.get_requires")
 
 -- uninstall the given packages
 function main(requires)
@@ -73,7 +39,7 @@ function main(requires)
 
     -- get requires and extra config
     local requires_extra = nil
-    requires, requires_extra = _get_requires(requires)
+    requires, requires_extra = get_requires(requires)
     if not requires or #requires == 0 then
         raise("requires(%s) not found!", table.concat(requires, " "))
         return 
@@ -84,7 +50,7 @@ function main(requires)
     for _, instance in ipairs(packages) do
         print("uninstall: %s%s ok!", instance:name(), instance:version_str() and ("-" .. instance:version_str()) or "")
     end
-    if #packages == 0 then
+    if not packages or #packages == 0 then
         print("local packages not found!")
     end
 
diff --git a/xmake/actions/require/xmake.lua b/xmake/actions/require/xmake.lua
index bdd4e40bd..61d25c1a9 100644
--- a/xmake/actions/require/xmake.lua
+++ b/xmake/actions/require/xmake.lua
@@ -63,7 +63,16 @@ task("require")
                                                          "    $ xmake require --search tbox"                                   }
                 ,   {nil, "uninstall",  "k",  nil,       "Uninstall the installed packages.",
                                                          "e.g.",
-                                                         "    $ xmake require --uninstall tbox"                                }
+                                                         "    $ xmake require --uninstall",
+                                                         "    $ xmake require --uninstall tbox",
+                                                         "    $ xmake require --uninstall --extra=\"{debug=true}\" tbox"       }
+                ,   {nil, "export",     "k", nil,        "Export the installed packages.",
+                                                         "e.g.",
+                                                         "    $ xmake require --export",
+                                                         "    $ xmake require --export tbox zlib",
+                                                         "    $ xmake require --export --exportdir=packagesdir zlib",
+                                                         "    $ xmake require --export --extra=\"{debug=true}\" tbox"          }
+                ,   {nil, "exportdir",  "kv", "packages","Set the exported packages directory."                                }
                 ,   {nil, "extra",      "kv", nil,       "Set the extra info of packages."                                     }
                 ,   {                                                                                                          }
                 ,   {nil, "requires",   "vs", nil,       "The package requires.",