add package for namespace

10 files changed, 113 insertions, 1 deletions

diff --git a/tests/apis/namespace/package/.gitignore b/tests/apis/namespace/package/.gitignore
new file mode 100644
index 000000000..152105761
--- /dev/null
+++ b/tests/apis/namespace/package/.gitignore
@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+
diff --git a/tests/apis/namespace/package/src/bar.cpp b/tests/apis/namespace/package/src/bar.cpp
new file mode 100644
index 000000000..2c00cc6b6
--- /dev/null
+++ b/tests/apis/namespace/package/src/bar.cpp
@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}
diff --git a/tests/apis/namespace/package/src/bar.h b/tests/apis/namespace/package/src/bar.h
new file mode 100644
index 000000000..47d8a7251
--- /dev/null
+++ b/tests/apis/namespace/package/src/bar.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/apis/namespace/package/src/foo.cpp b/tests/apis/namespace/package/src/foo.cpp
new file mode 100644
index 000000000..1a1fb3425
--- /dev/null
+++ b/tests/apis/namespace/package/src/foo.cpp
@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}
diff --git a/tests/apis/namespace/package/src/foo.h b/tests/apis/namespace/package/src/foo.h
new file mode 100644
index 000000000..d2506bca9
--- /dev/null
+++ b/tests/apis/namespace/package/src/foo.h
@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/tests/apis/namespace/package/src/main.cpp b/tests/apis/namespace/package/src/main.cpp
new file mode 100644
index 000000000..4cf7b5e62
--- /dev/null
+++ b/tests/apis/namespace/package/src/main.cpp
@@ -0,0 +1,9 @@
+#include "foo.h"
+#include "bar.h"
+#include <iostream>
+
+int main(int argc, char** argv) {
+    std::cout << "add(1, 2) = " << add(1, 2) << std::endl;
+    std::cout << "sub(2, 1) = " << sub(2, 1) << std::endl;
+    return 0;
+}
diff --git a/tests/apis/namespace/package/test.lua b/tests/apis/namespace/package/test.lua
new file mode 100644
index 000000000..83c0a9546
--- /dev/null
+++ b/tests/apis/namespace/package/test.lua
@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end
diff --git a/tests/apis/namespace/package/xmake.lua b/tests/apis/namespace/package/xmake.lua
new file mode 100644
index 000000000..b2bc61d73
--- /dev/null
+++ b/tests/apis/namespace/package/xmake.lua
@@ -0,0 +1,44 @@
+
+add_requires("package0")
+
+package("package0")
+    on_fetch(function (package)
+        return {defines = "PACKAGE0"}
+    end)
+
+namespace("ns1", function ()
+
+    add_requires("package1")
+
+    package("package1")
+        on_fetch(function (package)
+            return {defines = "NS1_PACKAGE1"}
+        end)
+
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+        add_packages("package1")
+
+    namespace("ns2", function()
+
+        add_requires("package2")
+
+        package("package2")
+            on_fetch(function (package)
+                return {defines = "NS2_PACKAGE2"}
+            end)
+
+        target("bar")
+            set_kind("static")
+            add_files("src/bar.cpp")
+            add_packages("package2")
+    end)
+
+    target("test")
+        set_kind("binary")
+        add_deps("foo", "ns2::bar")
+        add_files("src/main.cpp")
+        add_packages("package0", "package1", "ns2::package2")
+end)
+
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 068e95ab6..d3032f15b 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -56,7 +56,12 @@ local sandbox_module = require("sandbox/modules/import/core/sandbox/module")
 function _instance.new(name, info, opt)
     opt = opt or {}
     local instance = table.inherit(_instance)
-    instance._NAME      = name
+    local parts = name:split("::", {plain = true})
+    instance._NAME = parts[#parts]
+    table.remove(parts)
+    if #parts > 0 then
+        instance._NAMESPACE = table.concat(parts, "::")
+    end
     instance._INFO      = info
     instance._REPO      = opt.repo
     instance._SCRIPTDIR = opt.scriptdir and path.absolute(opt.scriptdir)
@@ -78,6 +83,17 @@ function _instance:name()
     return self._NAME
 end
 
+-- get the namespace
+function _instance:namespace()
+    return self._NAMESPACE
+end
+
+-- get the full name
+function _instance:fullname()
+    local namespace = self:namespace()
+    return namespace and namespace .. "::" .. self:name() or self:name()
+end
+
 -- get the type: package
 function _instance:type()
     return "package"
@@ -1276,6 +1292,7 @@ function _instance:toolchains()
             local toolchain_opt = project and project.extraconf("target.toolchains", name) or {}
             toolchain_opt.plat = self:plat()
             toolchain_opt.arch = self:arch()
+            toolchain_opt.namespace = self:namespace()
             local toolchain_inst, errors = toolchain.load(name, toolchain_opt)
             if not toolchain_inst and project then
                 toolchain_inst = project.toolchain(name, toolchain_opt)
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 30c571592..a06ee7a29 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -1064,6 +1064,9 @@ function _load_package(packagename, requireinfo, opt)
         end
         _memcache():set2("packageids", packagename, (packageid or 0) + 1)
     end
+    if displayname and package:namespace() then
+        displayname = package:namespace() .. "::" .. displayname
+    end
     package:displayname_set(displayname)
 
     -- disable parallelize if the package cache directory conflicts