Support for namespace

core/src/xmake/xmake.lua

@@ -2,7 +2,12 @@ target("xmake")
     set_kind("static")
 
     -- add deps
-    add_deps("sv", "lz4", "tbox")
+    add_deps("sv", "lz4")
+    if false then--namespace then
+        add_deps("tbox::tbox")
+    else
+        add_deps("tbox")
+    end
     if is_config("runtime", "luajit") then
         add_deps("luajit")
     else

core/xmake.lua

@@ -131,7 +131,14 @@ if is_plat("windows") then
 end
 
 -- add projects
-includes("src/sv", "src/lz4", "src/tbox", "src/xmake", "src/cli")
+includes("src/sv", "src/lz4", "src/xmake", "src/cli")
+if false then --namespace then
+    namespace("tbox", function ()
+        includes("src/tbox")
+    end)
+else
+    includes("src/tbox")
+end
 if has_config("lua_cjson") then
     includes("src/lua-cjson")
 end

tests/apis/namespace/basic/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/basic/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/basic/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/basic/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/basic/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/basic/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;
+}

tests/apis/namespace/basic/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end

tests/apis/namespace/basic/xmake.lua

@@ -0,0 +1,19 @@
+add_rules("mode.debug", "mode.release")
+
+namespace("ns1", function ()
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+end)
+
+namespace("ns2")
+    target("bar")
+        set_kind("static")
+        add_files("src/bar.cpp")
+namespace_end()
+
+target("test")
+    set_kind("binary")
+    add_deps("ns1::foo", "ns2::bar")
+    add_files("src/main.cpp")
+

tests/apis/namespace/includes/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/includes/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/includes/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/includes/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/includes/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/includes/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;
+}

tests/apis/namespace/includes/src/xmake.lua

@@ -0,0 +1,8 @@
+namespace("ns2", function ()
+    add_defines("NS2_ROOT")
+    target("bar")
+        set_kind("static")
+        add_files("bar.cpp")
+        add_defines("BAR")
+end)
+

tests/apis/namespace/includes/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end

tests/apis/namespace/includes/xmake.lua

@@ -0,0 +1,20 @@
+add_rules("mode.debug", "mode.release")
+
+add_defines("ROOT")
+
+namespace("ns1", function ()
+    add_defines("NS1_ROOT")
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+        add_defines("FOO")
+
+    includes("src")
+end)
+
+target("test")
+    set_kind("binary")
+    add_deps("ns1::foo", "ns1::ns2::bar")
+    add_files("src/main.cpp")
+    add_defines("TEST")
+

tests/apis/namespace/inner/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/inner/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/inner/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/inner/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/inner/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/inner/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;
+}

tests/apis/namespace/inner/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end

tests/apis/namespace/inner/xmake.lua

@@ -0,0 +1,19 @@
+add_rules("mode.debug", "mode.release")
+
+namespace("ns1", function ()
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+
+    namespace("ns2", function()
+        target("bar")
+            set_kind("static")
+            add_files("src/bar.cpp")
+    end)
+
+    target("test")
+        set_kind("binary")
+        add_deps("foo", "ns2::bar")
+        add_files("src/main.cpp")
+end)
+

tests/apis/namespace/nested/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/nested/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/nested/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/nested/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/nested/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/nested/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;
+}

tests/apis/namespace/nested/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end

tests/apis/namespace/nested/xmake.lua

@@ -0,0 +1,19 @@
+add_rules("mode.debug", "mode.release")
+
+namespace("ns1", function ()
+    target("foo")
+        set_kind("static")
+        add_files("src/foo.cpp")
+
+    namespace("ns2")
+        target("bar")
+            set_kind("static")
+            add_files("src/bar.cpp")
+    namespace_end()
+end)
+
+target("test")
+    set_kind("binary")
+    add_deps("ns1::foo", "ns1::ns2::bar")
+    add_files("src/main.cpp")
+

tests/apis/namespace/option/.gitignore

@@ -0,0 +1,8 @@
+# Xmake cache
+.xmake/
+build/
+
+# MacOS Cache
+.DS_Store
+
+

tests/apis/namespace/option/src/bar.cpp

@@ -0,0 +1,5 @@
+#include "bar.h"
+
+int sub(int a, int b) {
+    return a - b;
+}

tests/apis/namespace/option/src/bar.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int sub(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/option/src/foo.cpp

@@ -0,0 +1,5 @@
+#include "foo.h"
+
+int add(int a, int b) {
+    return a + b;
+}

tests/apis/namespace/option/src/foo.h

@@ -0,0 +1,9 @@
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int add(int a, int b);
+
+#ifdef __cplusplus
+}
+#endif

tests/apis/namespace/option/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;
+}

tests/apis/namespace/option/test.lua

@@ -0,0 +1,3 @@
+function main()
+    os.exec("xmake -vD")
+end