move task and plugin files

12 files changed, 2 insertions, 33 deletions

diff --git a/xmake/core/tasks/config.lua b/xmake/actions/config/xmake.lua
index bb4e71ec9..bb4e71ec9 100755
--- a/xmake/core/tasks/config.lua
+++ b/xmake/actions/config/xmake.lua
diff --git a/xmake/core/tasks/create.lua b/xmake/actions/create/xmake.lua
index 9df66ae7d..9df66ae7d 100755
--- a/xmake/core/tasks/create.lua
+++ b/xmake/actions/create/xmake.lua
diff --git a/xmake/core/tasks/global.lua b/xmake/actions/global/xmake.lua
index 5d1abced7..5d1abced7 100755
--- a/xmake/core/tasks/global.lua
+++ b/xmake/actions/global/xmake.lua
diff --git a/xmake/core/tasks/install.lua b/xmake/actions/install/xmake.lua
index db11df04a..db11df04a 100755
--- a/xmake/core/tasks/install.lua
+++ b/xmake/actions/install/xmake.lua
diff --git a/xmake/core/tasks/lua.lua b/xmake/actions/lua/xmake.lua
index 0a7b4b6fa..0a7b4b6fa 100755
--- a/xmake/core/tasks/lua.lua
+++ b/xmake/actions/lua/xmake.lua
diff --git a/xmake/core/tasks/package.lua b/xmake/actions/package/xmake.lua
index 17dd79b9c..17dd79b9c 100755
--- a/xmake/core/tasks/package.lua
+++ b/xmake/actions/package/xmake.lua
diff --git a/xmake/core/tasks/run.lua b/xmake/actions/run/xmake.lua
index 6353c8511..6353c8511 100755
--- a/xmake/core/tasks/run.lua
+++ b/xmake/actions/run/xmake.lua
diff --git a/xmake/core/tasks/uninstall.lua b/xmake/actions/uninstall/xmake.lua
index 992cf3a91..992cf3a91 100755
--- a/xmake/core/tasks/uninstall.lua
+++ b/xmake/actions/uninstall/xmake.lua
diff --git a/xmake/core/base/task.lua b/xmake/core/base/task.lua
index 9c7d01abd..2c13ded6f 100644
--- a/xmake/core/base/task.lua
+++ b/xmake/core/base/task.lua
@@ -38,7 +38,7 @@ function task._directories()
 
     return  {   path.join(global.directory(), "plugins")
             ,   path.join(xmake._PROGRAM_DIR, "plugins")
-            ,   path.join(xmake._CORE_DIR, "tasks")
+            ,   path.join(xmake._PROGRAM_DIR, "actions")
             }
 end
 
@@ -146,7 +146,7 @@ function task.tasks()
     for _, dir in ipairs(dirs) do
 
         -- get files
-        local files = os.match(path.join(dir, "*.lua"))
+        local files = os.match(path.join(dir, "**/xmake.lua"))
         if files then
             for _, filepath in ipairs(files) do
 
diff --git a/xmake/core/tasks/build.lua b/xmake/core/tasks/build.lua
deleted file mode 100755
index 82d2a2352..000000000
--- a/xmake/core/tasks/build.lua
+++ /dev/null
@@ -1,31 +0,0 @@
--- define task
-task("build")
-
-    -- set category
-    set_task_category("main")
-
-    -- set menu
-    set_task_menu({
-                    -- usage
-                    usage = "xmake [task] [options] [target]"
-
-                    -- description
-                ,   description = "Build the project if no given tasks."
-
-                    -- options
-                ,   options = 
-                    {
-                        {'b', "build",      "k",  nil,          "Build project. This is default building mode and optional."    }
-                    ,   {'u', "update",     "k",  nil,          "Only relink and update the binary files."                      }
-                    ,   {'r', "rebuild",    "k",  nil,          "Rebuild the project."                                          }
-
-                    ,   {}
-                    ,   {'j', "jobs",       "kv", nil,          "Specifies the number of jobs to build simultaneously"          }
-                   
-                    ,   {}
-                    ,   {nil, "target",     "v",  "all",        "Build the given target."                                       } 
-                    }
-                })
-
-
-
diff --git a/xmake/plugins/doxygen.lua b/xmake/plugins/doxygen/xmake.lua
index e66072732..e66072732 100755
--- a/xmake/plugins/doxygen.lua
+++ b/xmake/plugins/doxygen/xmake.lua
diff --git a/xmake/plugins/macro.lua b/xmake/plugins/macro/xmake.lua
index 53d2dd82e..53d2dd82e 100755
--- a/xmake/plugins/macro.lua
+++ b/xmake/plugins/macro/xmake.lua