From deb72f080db825bc30262476279238874f0d9cea Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 7 Sep 2024 23:31:47 +0800
Subject: add envs for xrepo #5580

---
 xmake/includes/xrepo/xmake.lua | 50 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 xmake/includes/xrepo/xmake.lua

diff --git a/xmake/includes/xrepo/xmake.lua b/xmake/includes/xrepo/xmake.lua
new file mode 100644
index 000000000..596a3b1ca
--- /dev/null
+++ b/xmake/includes/xrepo/xmake.lua
@@ -0,0 +1,50 @@
+--!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-present, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        xmake.lua
+--
+
+-- add envs for `xrepo env`
+-- @see https://github.com/xmake-io/xmake/issues/5580
+--
+-- @code
+    includes("@builtin/xrepo")
+
+    xrepo_addenvs(function (package)
+        package:addenv("FOO", "FOO")
+    end)
+
+    xrepo_addenvs({BAR = "BAR"})
+-- @endcode
+--
+function xrepo_addenvs(envs)
+    package("__xrepo_addenvs_" .. (tostring(envs):gsub("%s", "_")))
+        on_load(function (package)
+            if type(envs) == "function" then
+                envs(package)
+            elseif type(envs) == "table" then
+                for k, v in pairs(envs) do
+                    package:addenv(k, v)
+                end
+            end
+        end)
+        on_fetch(function (package, opt)
+            return {}
+        end)
+    package_end()
+    add_requires("__xrepo_addenvs_" .. (tostring(envs):gsub("%s", "_")))
+end
-- 
cgit v1.3.1


From cd43ea6e22998194201a548fbb969808e354dbe1 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 7 Sep 2024 23:46:11 +0800
Subject: xrepo_addenv

---
 xmake/includes/xrepo/xmake.lua | 42 +++++++++++++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 9 deletions(-)

diff --git a/xmake/includes/xrepo/xmake.lua b/xmake/includes/xrepo/xmake.lua
index 596a3b1ca..8891e4f0b 100644
--- a/xmake/includes/xrepo/xmake.lua
+++ b/xmake/includes/xrepo/xmake.lua
@@ -22,17 +22,18 @@
 -- @see https://github.com/xmake-io/xmake/issues/5580
 --
 -- @code
-    includes("@builtin/xrepo")
-
-    xrepo_addenvs(function (package)
-        package:addenv("FOO", "FOO")
-    end)
-
-    xrepo_addenvs({BAR = "BAR"})
+-- includes("@builtin/xrepo")
+--
+-- xrepo_addenvs(function (package)
+--     package:addenv("FOO", "FOO")
+-- end)
+--
+-- xrepo_addenvs({BAR = "BAR"})
 -- @endcode
 --
 function xrepo_addenvs(envs)
-    package("__xrepo_addenvs_" .. (tostring(envs):gsub("%s", "_")))
+    local packagename = "__xrepo_addenvs_" .. (tostring(envs):gsub("%s", "_"))
+    package(packagename)
         on_load(function (package)
             if type(envs) == "function" then
                 envs(package)
@@ -46,5 +47,28 @@ function xrepo_addenvs(envs)
             return {}
         end)
     package_end()
-    add_requires("__xrepo_addenvs_" .. (tostring(envs):gsub("%s", "_")))
+    add_requires(packagename)
+end
+
+-- add env for `xrepo env`
+-- @see https://github.com/xmake-io/xmake/issues/5580
+--
+-- @code
+-- includes("@builtin/xrepo")
+--
+-- xrepo_addenv("ZOO", ...)
+-- @endcode
+--
+function xrepo_addenv(name, ...)
+    local args = table.pack(...)
+    local packagename = "xrepo_addenv_" .. name .. (table.concat(args):gsub("%s", "_"))
+    package(packagename)
+        on_load(function (package)
+            package:addenv(name, table.unpack(args))
+        end)
+        on_fetch(function (package, opt)
+            return {}
+        end)
+    package_end()
+    add_requires(packagename)
 end
-- 
cgit v1.3.1