rename package envs

8 files changed, 12 insertions, 13 deletions

diff --git a/tests/projects/c/cosmocc/console/xmake.lua b/tests/projects/c/cosmocc/console/xmake.lua
index 1327045c1..babd520a2 100644
--- a/tests/projects/c/cosmocc/console/xmake.lua
+++ b/tests/projects/c/cosmocc/console/xmake.lua
@@ -2,12 +2,6 @@ add_rules("mode.debug", "mode.release")
 
 add_requires("cosmocc")
 
--- TODO, we should add envs to toolchains/cosmocc
-if is_subhost("windoows") then
-    add_requires("msys2")
-    add_packages("msys2")
-end
-
 target("test")
     set_kind("binary")
     add_files("src/*.c")
diff --git a/xmake/core/project/package.lua b/xmake/core/project/package.lua
index 63267a04e..c253ee0a2 100644
--- a/xmake/core/project/package.lua
+++ b/xmake/core/project/package.lua
@@ -271,6 +271,11 @@ function _instance:enable(enabled)
     self:set("__enabled", enabled)
 end
 
+-- get environments
+function _instance:envs()
+    return self:get("envs")
+end
+
 -- get the given rule
 function _instance:rule(name)
     return self:rules()[name]
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index c84e6fbcb..ace54441c 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -1335,7 +1335,7 @@ function _instance:pkgenvs()
             end
         end
         for _, pkg in pkgs:orderkeys() do
-            local envs = pkg:get("envs")
+            local envs = pkg:envs()
             if envs then
                 for name, values in table.orderpairs(envs) do
                     if type(values) == "table" then
diff --git a/xmake/toolchains/emcc/xmake.lua b/xmake/toolchains/emcc/xmake.lua
index b95e67145..2282afe93 100644
--- a/xmake/toolchains/emcc/xmake.lua
+++ b/xmake/toolchains/emcc/xmake.lua
@@ -58,7 +58,7 @@ toolchain("emcc")
         toolchain:add("ldflags", "")
         toolchain:add("shflags", "")
         for _, package in ipairs(toolchain:packages()) do
-            local envs = package:get("envs")
+            local envs = package:envs()
             if envs then
                 for _, name in ipairs({"EMSDK", "EMSDK_NODE", "EMSDK_PYTHON", "JAVA_HOME"}) do
                     local values = envs[name]
diff --git a/xmake/toolchains/iverilog/xmake.lua b/xmake/toolchains/iverilog/xmake.lua
index 30f83fabc..659922441 100644
--- a/xmake/toolchains/iverilog/xmake.lua
+++ b/xmake/toolchains/iverilog/xmake.lua
@@ -28,7 +28,7 @@ toolchain("iverilog")
         import("lib.detect.find_tool")
         local paths = {}
         for _, package in ipairs(toolchain:packages()) do
-            local envs = package:get("envs")
+            local envs = package:envs()
             if envs then
                 table.join2(paths, envs.PATH)
             end
diff --git a/xmake/toolchains/nim/xmake.lua b/xmake/toolchains/nim/xmake.lua
index 9afd491da..826f3196e 100644
--- a/xmake/toolchains/nim/xmake.lua
+++ b/xmake/toolchains/nim/xmake.lua
@@ -26,7 +26,7 @@ toolchain("nim")
         import("lib.detect.find_tool")
         local paths = {}
         for _, package in ipairs(toolchain:packages()) do
-            local envs = package:get("envs")
+            local envs = package:envs()
             if envs then
                 table.join2(paths, envs.PATH)
             end
diff --git a/xmake/toolchains/verilator/xmake.lua b/xmake/toolchains/verilator/xmake.lua
index 59edcf6db..5bb38b387 100644
--- a/xmake/toolchains/verilator/xmake.lua
+++ b/xmake/toolchains/verilator/xmake.lua
@@ -26,7 +26,7 @@ toolchain("verilator")
         import("lib.detect.find_tool")
         local paths = {}
         for _, package in ipairs(toolchain:packages()) do
-            local envs = package:get("envs")
+            local envs = package:envs()
             if envs then
                 table.join2(paths, envs.PATH)
             end
@@ -46,7 +46,7 @@ toolchain("verilator")
     on_load(function (toolchain)
         if is_host("windows") then
             for _, package in ipairs(toolchain:packages()) do
-                local envs = package:get("envs")
+                local envs = package:envs()
                 if envs then
                     local verilator_root = envs.VERILATOR_ROOT
                     if verilator_root then
diff --git a/xmake/toolchains/zig/xmake.lua b/xmake/toolchains/zig/xmake.lua
index 082dcba32..711334762 100644
--- a/xmake/toolchains/zig/xmake.lua
+++ b/xmake/toolchains/zig/xmake.lua
@@ -30,7 +30,7 @@ toolchain("zig")
         import("lib.detect.find_tool")
         local paths = {}
         for _, package in ipairs(toolchain:packages()) do
-            local envs = package:get("envs")
+            local envs = package:envs()
             if envs then
                 table.join2(paths, envs.PATH)
             end