improve project template

113 files changed, 24 insertions, 23 deletions

diff --git a/xmake/actions/create/xmake.lua b/xmake/actions/create/xmake.lua
index f05a352f6..dee04b4b8 100644
--- a/xmake/actions/create/xmake.lua
+++ b/xmake/actions/create/xmake.lua
@@ -64,20 +64,27 @@ task("create")
                                                                 -- import template
                                                                 import("core.project.template")
 
-                                                                -- make description
+                                                                -- get templates
                                                                 local templates = {}
-                                                                local description = {}
                                                                 for _, l in ipairs(template.languages()) do
                                                                     for _, t in ipairs(template.templates(l)) do
                                                                         templates[t.name] = templates[t.name] or {}
                                                                         table.insert(templates[t.name], l)
                                                                     end
                                                                 end
+
+                                                                -- get sorted templates
+                                                                local templates_sorted = {}
                                                                 for name, languages in pairs(templates) do
-                                                                    table.insert(description, "    - " .. name .. ": " .. table.concat(languages, ", "))
+                                                                    table.insert(templates_sorted, {name = name, languages = languages})
                                                                 end
+                                                                table.sort(templates_sorted, function(a, b) return a.name < b.name end)
 
-                                                                -- get it
+                                                                -- make description
+                                                                local description = {}
+                                                                for _, t in ipairs(templates_sorted) do
+                                                                    table.insert(description, "    - " .. t.name .. ": " .. table.concat(t.languages, ", "))
+                                                                end
                                                                 return description
                                                             end                                                             }
 
diff --git a/xmake/core/project/template.lua b/xmake/core/project/template.lua
index 27dc34e42..1d61e0572 100644
--- a/xmake/core/project/template.lua
+++ b/xmake/core/project/template.lua
@@ -160,11 +160,6 @@ function template.templates(language)
             table.insert(templates, results:info())
         end
     end
-
-    -- sort templates
-    table.sort(templates, function(a, b) return a.description < b.description end)
-
-    -- ok?
     return templates
 end
 
@@ -181,7 +176,6 @@ function template.create(language, templateid, targetname)
         return false, "no template id!"
     end
 
-
     -- get interpreter
     local interp = template._interpreter()
     assert(interp) 
diff --git a/xmake/templates/c++/console_qt/project/src/main.cpp b/xmake/templates/c++/qt.console/project/src/main.cpp
index de25444ff..de25444ff 100644
--- a/xmake/templates/c++/console_qt/project/src/main.cpp
+++ b/xmake/templates/c++/qt.console/project/src/main.cpp
diff --git a/xmake/templates/c++/console_qt/project/xmake.lua b/xmake/templates/c++/qt.console/project/xmake.lua
index 5dba5a131..5dba5a131 100644
--- a/xmake/templates/c++/console_qt/project/xmake.lua
+++ b/xmake/templates/c++/qt.console/project/xmake.lua
diff --git a/xmake/templates/c++/console_qt/template.lua b/xmake/templates/c++/qt.console/template.lua
index e5ed714e6..5ca8ed018 100644
--- a/xmake/templates/c++/console_qt/template.lua
+++ b/xmake/templates/c++/qt.console/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("console_qt")
+set_name("qt.console")
 
 -- set description
 set_description("The Console Program (Qt)")
diff --git a/xmake/templates/c++/quickapp_qt/project/src/main.cpp b/xmake/templates/c++/qt.quickapp/project/src/main.cpp
index 6333b85c4..6333b85c4 100644
--- a/xmake/templates/c++/quickapp_qt/project/src/main.cpp
+++ b/xmake/templates/c++/qt.quickapp/project/src/main.cpp
diff --git a/xmake/templates/c++/quickapp_qt/project/src/main.qml b/xmake/templates/c++/qt.quickapp/project/src/main.qml
index 188049dae..188049dae 100644
--- a/xmake/templates/c++/quickapp_qt/project/src/main.qml
+++ b/xmake/templates/c++/qt.quickapp/project/src/main.qml
diff --git a/xmake/templates/c++/quickapp_qt/project/src/qml.qrc b/xmake/templates/c++/qt.quickapp/project/src/qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/xmake/templates/c++/quickapp_qt/project/src/qml.qrc
+++ b/xmake/templates/c++/qt.quickapp/project/src/qml.qrc
diff --git a/xmake/templates/c++/quickapp_qt/project/xmake.lua b/xmake/templates/c++/qt.quickapp/project/xmake.lua
index ed756850c..ed756850c 100644
--- a/xmake/templates/c++/quickapp_qt/project/xmake.lua
+++ b/xmake/templates/c++/qt.quickapp/project/xmake.lua
diff --git a/xmake/templates/c++/quickapp_qt/template.lua b/xmake/templates/c++/qt.quickapp/template.lua
index 1efa5b9aa..56e3adf6f 100644
--- a/xmake/templates/c++/quickapp_qt/template.lua
+++ b/xmake/templates/c++/qt.quickapp/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("quickapp_qt")
+set_name("qt.quickapp")
 
 -- set description
 set_description("The Quick Application (Qt)")
diff --git a/xmake/templates/c++/quickapp_qt_static/project/src/main.cpp b/xmake/templates/c++/qt.quickapp_static/project/src/main.cpp
index 6333b85c4..6333b85c4 100644
--- a/xmake/templates/c++/quickapp_qt_static/project/src/main.cpp
+++ b/xmake/templates/c++/qt.quickapp_static/project/src/main.cpp
diff --git a/xmake/templates/c++/quickapp_qt_static/project/src/main.qml b/xmake/templates/c++/qt.quickapp_static/project/src/main.qml
index 45ee20a2f..45ee20a2f 100644
--- a/xmake/templates/c++/quickapp_qt_static/project/src/main.qml
+++ b/xmake/templates/c++/qt.quickapp_static/project/src/main.qml
diff --git a/xmake/templates/c++/quickapp_qt_static/project/src/qml.qrc b/xmake/templates/c++/qt.quickapp_static/project/src/qml.qrc
index 5f6483ac3..5f6483ac3 100644
--- a/xmake/templates/c++/quickapp_qt_static/project/src/qml.qrc
+++ b/xmake/templates/c++/qt.quickapp_static/project/src/qml.qrc
diff --git a/xmake/templates/c++/quickapp_qt_static/project/xmake.lua b/xmake/templates/c++/qt.quickapp_static/project/xmake.lua
index f341f724f..f341f724f 100644
--- a/xmake/templates/c++/quickapp_qt_static/project/xmake.lua
+++ b/xmake/templates/c++/qt.quickapp_static/project/xmake.lua
diff --git a/xmake/templates/c++/quickapp_qt_static/template.lua b/xmake/templates/c++/qt.quickapp_static/template.lua
index 314503740..ab3239f58 100644
--- a/xmake/templates/c++/quickapp_qt_static/template.lua
+++ b/xmake/templates/c++/qt.quickapp_static/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("quickapp_qt_static")
+set_name("qt.quickapp_static")
 
 -- set description
 set_description("The Quick Application (Qt/Static)")
diff --git a/xmake/templates/c++/shared_library_qt/project/src/demo.cpp b/xmake/templates/c++/qt.shared/project/src/demo.cpp
index bd791c271..bd791c271 100644
--- a/xmake/templates/c++/shared_library_qt/project/src/demo.cpp
+++ b/xmake/templates/c++/qt.shared/project/src/demo.cpp
diff --git a/xmake/templates/c++/shared_library_qt/project/src/demo.h b/xmake/templates/c++/qt.shared/project/src/demo.h
index d88dc29ee..d88dc29ee 100644
--- a/xmake/templates/c++/shared_library_qt/project/src/demo.h
+++ b/xmake/templates/c++/qt.shared/project/src/demo.h
diff --git a/xmake/templates/c++/shared_library_qt/project/src/demo_global.h b/xmake/templates/c++/qt.shared/project/src/demo_global.h
index 25abfb05c..25abfb05c 100644
--- a/xmake/templates/c++/shared_library_qt/project/src/demo_global.h
+++ b/xmake/templates/c++/qt.shared/project/src/demo_global.h
diff --git a/xmake/templates/c++/shared_library_qt/project/xmake.lua b/xmake/templates/c++/qt.shared/project/xmake.lua
index 0f6894fe9..0f6894fe9 100644
--- a/xmake/templates/c++/shared_library_qt/project/xmake.lua
+++ b/xmake/templates/c++/qt.shared/project/xmake.lua
diff --git a/xmake/templates/c++/shared_library_qt/template.lua b/xmake/templates/c++/qt.shared/template.lua
index d65460fa1..d98fae5c1 100644
--- a/xmake/templates/c++/shared_library_qt/template.lua
+++ b/xmake/templates/c++/qt.shared/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("shared_qt")
+set_name("qt.shared")
 
 -- set description
 set_description("The Share Library (Qt)")
diff --git a/xmake/templates/c++/static_library_qt/project/src/demo.cpp b/xmake/templates/c++/qt.static/project/src/demo.cpp
index a702ad253..a702ad253 100644
--- a/xmake/templates/c++/static_library_qt/project/src/demo.cpp
+++ b/xmake/templates/c++/qt.static/project/src/demo.cpp
diff --git a/xmake/templates/c++/static_library_qt/project/src/demo.h b/xmake/templates/c++/qt.static/project/src/demo.h
index 51eb9be55..51eb9be55 100644
--- a/xmake/templates/c++/static_library_qt/project/src/demo.h
+++ b/xmake/templates/c++/qt.static/project/src/demo.h
diff --git a/xmake/templates/c++/static_library_qt/project/xmake.lua b/xmake/templates/c++/qt.static/project/xmake.lua
index e69a47e61..e69a47e61 100644
--- a/xmake/templates/c++/static_library_qt/project/xmake.lua
+++ b/xmake/templates/c++/qt.static/project/xmake.lua
diff --git a/xmake/templates/c++/static_library_qt/template.lua b/xmake/templates/c++/qt.static/template.lua
index 14b5db59c..60db73bcc 100644
--- a/xmake/templates/c++/static_library_qt/template.lua
+++ b/xmake/templates/c++/qt.static/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("static_qt")
+set_name("qt.static")
 
 -- set description
 set_description("The Static Library (Qt)")
diff --git a/xmake/templates/c++/widgetapp_qt/project/src/main.cpp b/xmake/templates/c++/qt.widgetapp/project/src/main.cpp
index b48f94ec8..b48f94ec8 100644
--- a/xmake/templates/c++/widgetapp_qt/project/src/main.cpp
+++ b/xmake/templates/c++/qt.widgetapp/project/src/main.cpp
diff --git a/xmake/templates/c++/widgetapp_qt/project/src/mainwindow.cpp b/xmake/templates/c++/qt.widgetapp/project/src/mainwindow.cpp
index 49d64fce7..49d64fce7 100644
--- a/xmake/templates/c++/widgetapp_qt/project/src/mainwindow.cpp
+++ b/xmake/templates/c++/qt.widgetapp/project/src/mainwindow.cpp
diff --git a/xmake/templates/c++/widgetapp_qt/project/src/mainwindow.h b/xmake/templates/c++/qt.widgetapp/project/src/mainwindow.h
index 8e06f4918..8e06f4918 100644
--- a/xmake/templates/c++/widgetapp_qt/project/src/mainwindow.h
+++ b/xmake/templates/c++/qt.widgetapp/project/src/mainwindow.h
diff --git a/xmake/templates/c++/widgetapp_qt/project/src/mainwindow.ui b/xmake/templates/c++/qt.widgetapp/project/src/mainwindow.ui
index 1c59b695e..1c59b695e 100644
--- a/xmake/templates/c++/widgetapp_qt/project/src/mainwindow.ui
+++ b/xmake/templates/c++/qt.widgetapp/project/src/mainwindow.ui
diff --git a/xmake/templates/c++/widgetapp_qt/project/xmake.lua b/xmake/templates/c++/qt.widgetapp/project/xmake.lua
index 8b7bd5ec8..8b7bd5ec8 100644
--- a/xmake/templates/c++/widgetapp_qt/project/xmake.lua
+++ b/xmake/templates/c++/qt.widgetapp/project/xmake.lua
diff --git a/xmake/templates/c++/widgetapp_qt/template.lua b/xmake/templates/c++/qt.widgetapp/template.lua
index 668b32bce..94aeacb67 100644
--- a/xmake/templates/c++/widgetapp_qt/template.lua
+++ b/xmake/templates/c++/qt.widgetapp/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("widgetapp_qt")
+set_name("qt.widgetapp")
 
 -- set description
 set_description("The Widget Application (Qt)")
diff --git a/xmake/templates/c++/widgetapp_qt_static/project/src/main.cpp b/xmake/templates/c++/qt.widgetapp_static/project/src/main.cpp
index b48f94ec8..b48f94ec8 100644
--- a/xmake/templates/c++/widgetapp_qt_static/project/src/main.cpp
+++ b/xmake/templates/c++/qt.widgetapp_static/project/src/main.cpp
diff --git a/xmake/templates/c++/widgetapp_qt_static/project/src/mainwindow.cpp b/xmake/templates/c++/qt.widgetapp_static/project/src/mainwindow.cpp
index 49d64fce7..49d64fce7 100644
--- a/xmake/templates/c++/widgetapp_qt_static/project/src/mainwindow.cpp
+++ b/xmake/templates/c++/qt.widgetapp_static/project/src/mainwindow.cpp
diff --git a/xmake/templates/c++/widgetapp_qt_static/project/src/mainwindow.h b/xmake/templates/c++/qt.widgetapp_static/project/src/mainwindow.h
index 8e06f4918..8e06f4918 100644
--- a/xmake/templates/c++/widgetapp_qt_static/project/src/mainwindow.h
+++ b/xmake/templates/c++/qt.widgetapp_static/project/src/mainwindow.h
diff --git a/xmake/templates/c++/widgetapp_qt_static/project/src/mainwindow.ui b/xmake/templates/c++/qt.widgetapp_static/project/src/mainwindow.ui
index 1c59b695e..1c59b695e 100644
--- a/xmake/templates/c++/widgetapp_qt_static/project/src/mainwindow.ui
+++ b/xmake/templates/c++/qt.widgetapp_static/project/src/mainwindow.ui
diff --git a/xmake/templates/c++/widgetapp_qt_static/project/xmake.lua b/xmake/templates/c++/qt.widgetapp_static/project/xmake.lua
index 3c8e46c85..3c8e46c85 100644
--- a/xmake/templates/c++/widgetapp_qt_static/project/xmake.lua
+++ b/xmake/templates/c++/qt.widgetapp_static/project/xmake.lua
diff --git a/xmake/templates/c++/widgetapp_qt_static/template.lua b/xmake/templates/c++/qt.widgetapp_static/template.lua
index 7a1cfed24..8b3848e4d 100644
--- a/xmake/templates/c++/widgetapp_qt_static/template.lua
+++ b/xmake/templates/c++/qt.widgetapp_static/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("widgetapp_qt_static")
+set_name("qt.widgetapp_static")
 
 -- set description
 set_description("The Widget Application (Qt/Static)")
diff --git a/xmake/templates/c++/shared_library/project/src/interface.cpp b/xmake/templates/c++/shared/project/src/interface.cpp
index 598d07560..598d07560 100644
--- a/xmake/templates/c++/shared_library/project/src/interface.cpp
+++ b/xmake/templates/c++/shared/project/src/interface.cpp
diff --git a/xmake/templates/c++/shared_library/project/src/interface.h b/xmake/templates/c++/shared/project/src/interface.h
index ef24ba3ce..ef24ba3ce 100644
--- a/xmake/templates/c++/shared_library/project/src/interface.h
+++ b/xmake/templates/c++/shared/project/src/interface.h
diff --git a/xmake/templates/c++/shared_library/project/src/test.cpp b/xmake/templates/c++/shared/project/src/test.cpp
index 72e03272b..72e03272b 100644
--- a/xmake/templates/c++/shared_library/project/src/test.cpp
+++ b/xmake/templates/c++/shared/project/src/test.cpp
diff --git a/xmake/templates/c++/shared_library/project/xmake.lua b/xmake/templates/c++/shared/project/xmake.lua
index 59fe4dbe6..59fe4dbe6 100644
--- a/xmake/templates/c++/shared_library/project/xmake.lua
+++ b/xmake/templates/c++/shared/project/xmake.lua
diff --git a/xmake/templates/c++/shared_library/template.lua b/xmake/templates/c++/shared/template.lua
index 666542844..666542844 100644
--- a/xmake/templates/c++/shared_library/template.lua
+++ b/xmake/templates/c++/shared/template.lua
diff --git a/xmake/templates/c++/console_tbox/project/src/main.cpp b/xmake/templates/c++/tbox.console/project/src/main.cpp
index ad676ef58..ad676ef58 100644
--- a/xmake/templates/c++/console_tbox/project/src/main.cpp
+++ b/xmake/templates/c++/tbox.console/project/src/main.cpp
diff --git a/xmake/templates/c++/console_tbox/project/src/xmake.lua b/xmake/templates/c++/tbox.console/project/src/xmake.lua
index 73adf9675..73adf9675 100644
--- a/xmake/templates/c++/console_tbox/project/src/xmake.lua
+++ b/xmake/templates/c++/tbox.console/project/src/xmake.lua
diff --git a/xmake/templates/c++/console_tbox/project/xmake.lua b/xmake/templates/c++/tbox.console/project/xmake.lua
index 83a45434f..83a45434f 100644
--- a/xmake/templates/c++/console_tbox/project/xmake.lua
+++ b/xmake/templates/c++/tbox.console/project/xmake.lua
diff --git a/xmake/templates/c/console_tbox/template.lua b/xmake/templates/c++/tbox.console/template.lua
index e205071e6..f1edee39b 100644
--- a/xmake/templates/c/console_tbox/template.lua
+++ b/xmake/templates/c++/tbox.console/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("console_tbox")
+set_name("tbox.console")
 
 -- set description
 set_description("The Console Program (tbox)")
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_demo/main.cpp b/xmake/templates/c++/tbox.shared/project/src/_demo/main.cpp
index 818ff6919..818ff6919 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_demo/main.cpp
+++ b/xmake/templates/c++/tbox.shared/project/src/_demo/main.cpp
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c++/tbox.shared/project/src/_demo/xmake.lua
index c6f24eed7..c6f24eed7 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c++/tbox.shared/project/src/_demo/xmake.lua
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.cpp b/xmake/templates/c++/tbox.shared/project/src/_library/interface.cpp
index a0ccb007b..a0ccb007b 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.cpp
+++ b/xmake/templates/c++/tbox.shared/project/src/_library/interface.cpp
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.h b/xmake/templates/c++/tbox.shared/project/src/_library/interface.h
index 944af8121..944af8121 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c++/tbox.shared/project/src/_library/interface.h
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c++/tbox.shared/project/src/_library/xmake.lua
index 4f564356b..4f564356b 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c++/tbox.shared/project/src/_library/xmake.lua
diff --git a/xmake/templates/c++/shared_library_tbox/project/xmake.lua b/xmake/templates/c++/tbox.shared/project/xmake.lua
index 1ebaa6e34..1ebaa6e34 100644
--- a/xmake/templates/c++/shared_library_tbox/project/xmake.lua
+++ b/xmake/templates/c++/tbox.shared/project/xmake.lua
diff --git a/xmake/templates/c++/shared_library_tbox/template.lua b/xmake/templates/c++/tbox.shared/template.lua
index c092427ed..31bd81e93 100644
--- a/xmake/templates/c++/shared_library_tbox/template.lua
+++ b/xmake/templates/c++/tbox.shared/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("shared_tbox")
+set_name("tbox.shared")
 
 -- set description
 set_description("The Shared Library (tbox)")
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_demo/main.cpp b/xmake/templates/c++/tbox.static/project/src/_demo/main.cpp
index 818ff6919..818ff6919 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_demo/main.cpp
+++ b/xmake/templates/c++/tbox.static/project/src/_demo/main.cpp
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c++/tbox.static/project/src/_demo/xmake.lua
index c6f24eed7..c6f24eed7 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c++/tbox.static/project/src/_demo/xmake.lua
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_library/interface.cpp b/xmake/templates/c++/tbox.static/project/src/_library/interface.cpp
index a0ccb007b..a0ccb007b 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_library/interface.cpp
+++ b/xmake/templates/c++/tbox.static/project/src/_library/interface.cpp
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_library/interface.h b/xmake/templates/c++/tbox.static/project/src/_library/interface.h
index f4f4a07e1..f4f4a07e1 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c++/tbox.static/project/src/_library/interface.h
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c++/tbox.static/project/src/_library/xmake.lua
index 71a5e698f..71a5e698f 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c++/tbox.static/project/src/_library/xmake.lua
diff --git a/xmake/templates/c++/static_library_tbox/project/xmake.lua b/xmake/templates/c++/tbox.static/project/xmake.lua
index 1ebaa6e34..1ebaa6e34 100644
--- a/xmake/templates/c++/static_library_tbox/project/xmake.lua
+++ b/xmake/templates/c++/tbox.static/project/xmake.lua
diff --git a/xmake/templates/c++/static_library_tbox/template.lua b/xmake/templates/c++/tbox.static/template.lua
index 07c3141a2..a9acb2caa 100644
--- a/xmake/templates/c++/static_library_tbox/template.lua
+++ b/xmake/templates/c++/tbox.static/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("static_tbox")
+set_name("tbox.static")
 
 -- set description
 set_description("The Static Library (tbox)")
diff --git a/xmake/templates/c/shared_library/project/src/interface.c b/xmake/templates/c/shared/project/src/interface.c
index 598d07560..598d07560 100644
--- a/xmake/templates/c/shared_library/project/src/interface.c
+++ b/xmake/templates/c/shared/project/src/interface.c
diff --git a/xmake/templates/c/shared_library/project/src/interface.h b/xmake/templates/c/shared/project/src/interface.h
index 7a3eb570a..7a3eb570a 100644
--- a/xmake/templates/c/shared_library/project/src/interface.h
+++ b/xmake/templates/c/shared/project/src/interface.h
diff --git a/xmake/templates/c/shared_library/project/src/test.c b/xmake/templates/c/shared/project/src/test.c
index 9505a2f75..9505a2f75 100644
--- a/xmake/templates/c/shared_library/project/src/test.c
+++ b/xmake/templates/c/shared/project/src/test.c
diff --git a/xmake/templates/c/shared_library/project/xmake.lua b/xmake/templates/c/shared/project/xmake.lua
index 4a52ee6d0..4a52ee6d0 100644
--- a/xmake/templates/c/shared_library/project/xmake.lua
+++ b/xmake/templates/c/shared/project/xmake.lua
diff --git a/xmake/templates/c/shared_library/template.lua b/xmake/templates/c/shared/template.lua
index 666542844..666542844 100644
--- a/xmake/templates/c/shared_library/template.lua
+++ b/xmake/templates/c/shared/template.lua
diff --git a/xmake/templates/c/static_library/project/src/interface.c b/xmake/templates/c/static/project/src/interface.c
index 598d07560..598d07560 100644
--- a/xmake/templates/c/static_library/project/src/interface.c
+++ b/xmake/templates/c/static/project/src/interface.c
diff --git a/xmake/templates/c/static_library/project/src/interface.h b/xmake/templates/c/static/project/src/interface.h
index 10ec0f856..10ec0f856 100644
--- a/xmake/templates/c/static_library/project/src/interface.h
+++ b/xmake/templates/c/static/project/src/interface.h
diff --git a/xmake/templates/c/static_library/project/src/test.c b/xmake/templates/c/static/project/src/test.c
index 9505a2f75..9505a2f75 100644
--- a/xmake/templates/c/static_library/project/src/test.c
+++ b/xmake/templates/c/static/project/src/test.c
diff --git a/xmake/templates/c/static_library/project/xmake.lua b/xmake/templates/c/static/project/xmake.lua
index 04d422083..04d422083 100644
--- a/xmake/templates/c/static_library/project/xmake.lua
+++ b/xmake/templates/c/static/project/xmake.lua
diff --git a/xmake/templates/c/static_library/template.lua b/xmake/templates/c/static/template.lua
index f05045e07..f05045e07 100644
--- a/xmake/templates/c/static_library/template.lua
+++ b/xmake/templates/c/static/template.lua
diff --git a/xmake/templates/c/console_tbox/project/src/main.c b/xmake/templates/c/tbox.console/project/src/main.c
index ad676ef58..ad676ef58 100644
--- a/xmake/templates/c/console_tbox/project/src/main.c
+++ b/xmake/templates/c/tbox.console/project/src/main.c
diff --git a/xmake/templates/c/console_tbox/project/src/xmake.lua b/xmake/templates/c/tbox.console/project/src/xmake.lua
index 3f528a7ec..3f528a7ec 100644
--- a/xmake/templates/c/console_tbox/project/src/xmake.lua
+++ b/xmake/templates/c/tbox.console/project/src/xmake.lua
diff --git a/xmake/templates/c/console_tbox/project/xmake.lua b/xmake/templates/c/tbox.console/project/xmake.lua
index 83a45434f..83a45434f 100644
--- a/xmake/templates/c/console_tbox/project/xmake.lua
+++ b/xmake/templates/c/tbox.console/project/xmake.lua
diff --git a/xmake/templates/c++/console_tbox/template.lua b/xmake/templates/c/tbox.console/template.lua
index e205071e6..f1edee39b 100644
--- a/xmake/templates/c++/console_tbox/template.lua
+++ b/xmake/templates/c/tbox.console/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("console_tbox")
+set_name("tbox.console")
 
 -- set description
 set_description("The Console Program (tbox)")
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_demo/main.c b/xmake/templates/c/tbox.shared/project/src/_demo/main.c
index 818ff6919..818ff6919 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_demo/main.c
+++ b/xmake/templates/c/tbox.shared/project/src/_demo/main.c
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c/tbox.shared/project/src/_demo/xmake.lua
index c62ddcec5..c62ddcec5 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c/tbox.shared/project/src/_demo/xmake.lua
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_library/interface.c b/xmake/templates/c/tbox.shared/project/src/_library/interface.c
index a0ccb007b..a0ccb007b 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_library/interface.c
+++ b/xmake/templates/c/tbox.shared/project/src/_library/interface.c
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_library/interface.h b/xmake/templates/c/tbox.shared/project/src/_library/interface.h
index 944af8121..944af8121 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c/tbox.shared/project/src/_library/interface.h
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c/tbox.shared/project/src/_library/xmake.lua
index cb36ba3b8..cb36ba3b8 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c/tbox.shared/project/src/_library/xmake.lua
diff --git a/xmake/templates/c/shared_library_tbox/project/xmake.lua b/xmake/templates/c/tbox.shared/project/xmake.lua
index 1ebaa6e34..1ebaa6e34 100644
--- a/xmake/templates/c/shared_library_tbox/project/xmake.lua
+++ b/xmake/templates/c/tbox.shared/project/xmake.lua
diff --git a/xmake/templates/c/shared_library_tbox/template.lua b/xmake/templates/c/tbox.shared/template.lua
index aa48cc2fa..c64f17262 100644
--- a/xmake/templates/c/shared_library_tbox/template.lua
+++ b/xmake/templates/c/tbox.shared/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("shared_tbox")
+set_name("tbox.shared")
 
 -- set description
 set_description("The Shared Library (tbox)")
diff --git a/xmake/templates/c/static_library_tbox/project/src/_demo/main.c b/xmake/templates/c/tbox.static/project/src/_demo/main.c
index 818ff6919..818ff6919 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_demo/main.c
+++ b/xmake/templates/c/tbox.static/project/src/_demo/main.c
diff --git a/xmake/templates/c/static_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c/tbox.static/project/src/_demo/xmake.lua
index c62ddcec5..c62ddcec5 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c/tbox.static/project/src/_demo/xmake.lua
diff --git a/xmake/templates/c/static_library_tbox/project/src/_library/interface.c b/xmake/templates/c/tbox.static/project/src/_library/interface.c
index a0ccb007b..a0ccb007b 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_library/interface.c
+++ b/xmake/templates/c/tbox.static/project/src/_library/interface.c
diff --git a/xmake/templates/c/static_library_tbox/project/src/_library/interface.h b/xmake/templates/c/tbox.static/project/src/_library/interface.h
index f4f4a07e1..f4f4a07e1 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_library/interface.h
+++ b/xmake/templates/c/tbox.static/project/src/_library/interface.h
diff --git a/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c/tbox.static/project/src/_library/xmake.lua
index 45967cabc..45967cabc 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c/tbox.static/project/src/_library/xmake.lua
diff --git a/xmake/templates/c/static_library_tbox/project/xmake.lua b/xmake/templates/c/tbox.static/project/xmake.lua
index 1ebaa6e34..1ebaa6e34 100644
--- a/xmake/templates/c/static_library_tbox/project/xmake.lua
+++ b/xmake/templates/c/tbox.static/project/xmake.lua
diff --git a/xmake/templates/c/static_library_tbox/template.lua b/xmake/templates/c/tbox.static/template.lua
index 99f223e1b..9ddc683f7 100644
--- a/xmake/templates/c/static_library_tbox/template.lua
+++ b/xmake/templates/c/tbox.static/template.lua
@@ -1,5 +1,5 @@
 -- set name
-set_name("static_tbox")
+set_name("tbox.static")
 
 -- set description
 set_description("The Static Library (tbox)")
diff --git a/xmake/templates/cuda/shared_library/project/inc/lib.cuh b/xmake/templates/cuda/shared/project/inc/lib.cuh
index 5565e3eb5..5565e3eb5 100644
--- a/xmake/templates/cuda/shared_library/project/inc/lib.cuh
+++ b/xmake/templates/cuda/shared/project/inc/lib.cuh
diff --git a/xmake/templates/cuda/shared_library/project/src/lib.cu b/xmake/templates/cuda/shared/project/src/lib.cu
index d2cff9ac2..d2cff9ac2 100644
--- a/xmake/templates/cuda/shared_library/project/src/lib.cu
+++ b/xmake/templates/cuda/shared/project/src/lib.cu
diff --git a/xmake/templates/cuda/shared_library/project/xmake.lua b/xmake/templates/cuda/shared/project/xmake.lua
index ceef4438d..ceef4438d 100644
--- a/xmake/templates/cuda/shared_library/project/xmake.lua
+++ b/xmake/templates/cuda/shared/project/xmake.lua
diff --git a/xmake/templates/cuda/shared_library/template.lua b/xmake/templates/cuda/shared/template.lua
index 6df920968..6df920968 100644
--- a/xmake/templates/cuda/shared_library/template.lua
+++ b/xmake/templates/cuda/shared/template.lua
diff --git a/xmake/templates/cuda/static_library/project/inc/lib.cuh b/xmake/templates/cuda/static/project/inc/lib.cuh
index 35255e31e..35255e31e 100644
--- a/xmake/templates/cuda/static_library/project/inc/lib.cuh
+++ b/xmake/templates/cuda/static/project/inc/lib.cuh
diff --git a/xmake/templates/cuda/static_library/project/src/lib.cu b/xmake/templates/cuda/static/project/src/lib.cu
index a5f054354..a5f054354 100644
--- a/xmake/templates/cuda/static_library/project/src/lib.cu
+++ b/xmake/templates/cuda/static/project/src/lib.cu
diff --git a/xmake/templates/cuda/static_library/project/xmake.lua b/xmake/templates/cuda/static/project/xmake.lua
index 3896fb238..3896fb238 100644
--- a/xmake/templates/cuda/static_library/project/xmake.lua
+++ b/xmake/templates/cuda/static/project/xmake.lua
diff --git a/xmake/templates/cuda/static_library/template.lua b/xmake/templates/cuda/static/template.lua
index ff9c56179..ff9c56179 100644
--- a/xmake/templates/cuda/static_library/template.lua
+++ b/xmake/templates/cuda/static/template.lua
diff --git a/xmake/templates/dlang/shared_library/project/src/interfaces.d b/xmake/templates/dlang/shared/project/src/interfaces.d
index 3386c9124..3386c9124 100644
--- a/xmake/templates/dlang/shared_library/project/src/interfaces.d
+++ b/xmake/templates/dlang/shared/project/src/interfaces.d
diff --git a/xmake/templates/dlang/shared_library/project/src/main.d b/xmake/templates/dlang/shared/project/src/main.d
index 3137de217..3137de217 100644
--- a/xmake/templates/dlang/shared_library/project/src/main.d
+++ b/xmake/templates/dlang/shared/project/src/main.d
diff --git a/xmake/templates/dlang/shared_library/project/xmake.lua b/xmake/templates/dlang/shared/project/xmake.lua
index 962994618..962994618 100644
--- a/xmake/templates/dlang/shared_library/project/xmake.lua
+++ b/xmake/templates/dlang/shared/project/xmake.lua
diff --git a/xmake/templates/dlang/shared_library/template.lua b/xmake/templates/dlang/shared/template.lua
index 666542844..666542844 100644
--- a/xmake/templates/dlang/shared_library/template.lua
+++ b/xmake/templates/dlang/shared/template.lua
diff --git a/xmake/templates/dlang/static_library/project/src/interfaces.d b/xmake/templates/dlang/static/project/src/interfaces.d
index 3386c9124..3386c9124 100644
--- a/xmake/templates/dlang/static_library/project/src/interfaces.d
+++ b/xmake/templates/dlang/static/project/src/interfaces.d
diff --git a/xmake/templates/dlang/static_library/project/src/main.d b/xmake/templates/dlang/static/project/src/main.d
index 3137de217..3137de217 100644
--- a/xmake/templates/dlang/static_library/project/src/main.d
+++ b/xmake/templates/dlang/static/project/src/main.d
diff --git a/xmake/templates/dlang/static_library/project/xmake.lua b/xmake/templates/dlang/static/project/xmake.lua
index 8cc9d7d9d..8cc9d7d9d 100644
--- a/xmake/templates/dlang/static_library/project/xmake.lua
+++ b/xmake/templates/dlang/static/project/xmake.lua
diff --git a/xmake/templates/dlang/static_library/template.lua b/xmake/templates/dlang/static/template.lua
index f05045e07..f05045e07 100644
--- a/xmake/templates/dlang/static_library/template.lua
+++ b/xmake/templates/dlang/static/template.lua
diff --git a/xmake/templates/go/static_library/project/src/main.go b/xmake/templates/go/static/project/src/main.go
index f2b477453..f2b477453 100644
--- a/xmake/templates/go/static_library/project/src/main.go
+++ b/xmake/templates/go/static/project/src/main.go
diff --git a/xmake/templates/go/static_library/project/src/test.go b/xmake/templates/go/static/project/src/test.go
index cf10523f9..cf10523f9 100644
--- a/xmake/templates/go/static_library/project/src/test.go
+++ b/xmake/templates/go/static/project/src/test.go
diff --git a/xmake/templates/go/static_library/project/src/test/add.go b/xmake/templates/go/static/project/src/test/add.go
index 98ffef600..98ffef600 100644
--- a/xmake/templates/go/static_library/project/src/test/add.go
+++ b/xmake/templates/go/static/project/src/test/add.go
diff --git a/xmake/templates/go/static_library/project/src/test/sub.go b/xmake/templates/go/static/project/src/test/sub.go
index a24a9abb7..a24a9abb7 100644
--- a/xmake/templates/go/static_library/project/src/test/sub.go
+++ b/xmake/templates/go/static/project/src/test/sub.go
diff --git a/xmake/templates/go/static_library/project/xmake.lua b/xmake/templates/go/static/project/xmake.lua
index ddf3b14c5..ddf3b14c5 100644
--- a/xmake/templates/go/static_library/project/xmake.lua
+++ b/xmake/templates/go/static/project/xmake.lua
diff --git a/xmake/templates/go/static_library/template.lua b/xmake/templates/go/static/template.lua
index f05045e07..f05045e07 100644
--- a/xmake/templates/go/static_library/template.lua
+++ b/xmake/templates/go/static/template.lua
diff --git a/xmake/templates/rust/static_library/project/src/interfaces.rs b/xmake/templates/rust/static/project/src/interfaces.rs
index 277008ba4..277008ba4 100644
--- a/xmake/templates/rust/static_library/project/src/interfaces.rs
+++ b/xmake/templates/rust/static/project/src/interfaces.rs
diff --git a/xmake/templates/rust/static_library/project/src/main.rs b/xmake/templates/rust/static/project/src/main.rs
index 0cd4449d1..0cd4449d1 100644
--- a/xmake/templates/rust/static_library/project/src/main.rs
+++ b/xmake/templates/rust/static/project/src/main.rs
diff --git a/xmake/templates/rust/static_library/project/xmake.lua b/xmake/templates/rust/static/project/xmake.lua
index c3a5b497a..c3a5b497a 100644
--- a/xmake/templates/rust/static_library/project/xmake.lua
+++ b/xmake/templates/rust/static/project/xmake.lua
diff --git a/xmake/templates/rust/static_library/template.lua b/xmake/templates/rust/static/template.lua
index f05045e07..f05045e07 100644
--- a/xmake/templates/rust/static_library/template.lua
+++ b/xmake/templates/rust/static/template.lua