add demo addon

2 files changed, 59 insertions, 22 deletions

diff --git a/xmake/core/package/addon.lua b/xmake/core/package/addon.lua
index 7ced8a780..8523da8d0 100644
--- a/xmake/core/package/addon.lua
+++ b/xmake/core/package/addon.lua
@@ -233,6 +233,28 @@ function addon.payloadinfos(kind)
     return payloadinfos
 end
 
+-- get the payload root directory of the given addon source directory
+--
+-- an addon repository has its own files, e.g. tests, ci scripts and documents,
+-- so its payloads can be placed in the `src` subdirectory, and we only install them
+--
+-- e.g.
+--   esp32-devel/src/{plugins,rules,toolchains,templates}   -- with the `src` layout
+--   hello-world/{plugins}                                  -- without it, for the simple addons
+--
+-- @param sourcedir   the addon source directory
+-- @return            the payload root directory, it will be nil if no payload is found
+--
+function addon.payloadroot(sourcedir)
+    local srcdir = path.join(sourcedir, "src")
+    if #addon.payloads_of(srcdir) > 0 then
+        return srcdir
+    end
+    if #addon.payloads_of(sourcedir) > 0 then
+        return sourcedir
+    end
+end
+
 -- get the payload directories of the given addon directory, e.g. {"plugins", "rules"}
 function addon.payloads_of(addondir)
     local payloads = {}
@@ -250,16 +272,13 @@ end
 --
 function addon.installscript()
     return function (package)
-        local installed = false
-        for _, payloaddir in ipairs(addon.payloaddirs()) do
-            if os.isdir(payloaddir) then
-                os.cp(payloaddir, package:installdir())
-                installed = true
-            end
-        end
-        if not installed then
+        local payloadroot = addon.payloadroot(os.curdir())
+        if not payloadroot then
             os.raise("addon(%s): no payload directory found, e.g. plugins!", package:name())
         end
+        for _, payloaddir in ipairs(addon.payloads_of(payloadroot)) do
+            os.cp(path.join(payloadroot, payloaddir), package:installdir())
+        end
     end
 end
 
@@ -414,6 +433,19 @@ function addon.remove(name, opt)
                 name, table.concat(parents, ", "))
         end
     end
+    -- we need to remove the symlinks first, we cannot remove them recursively,
+    -- otherwise the linked files would be removed too
+    --
+    -- e.g. the user may link the install directory to the addon source directory when developing it
+    for _, versiondir in ipairs(os.dirs(path.join(installdir, "*"))) do
+        if os.islink(versiondir) then
+            os.rmfile(versiondir)
+        end
+    end
+    if os.islink(installdir) then
+        return os.rmfile(installdir)
+    end
+
     local ok, errors = os.rm(installdir)
     if not ok then
         return false, errors
diff --git a/xmake/core/sandbox/modules/import/core/package/addon.lua b/xmake/core/sandbox/modules/import/core/package/addon.lua
index 2885bd45f..9591559ed 100644
--- a/xmake/core/sandbox/modules/import/core/package/addon.lua
+++ b/xmake/core/sandbox/modules/import/core/package/addon.lua
@@ -25,20 +25,25 @@ local sandbox_core_package_addon = sandbox_core_package_addon or {}
 local addon = require("package/addon")
 
 -- inherit some builtin interfaces
-sandbox_core_package_addon.installdir   = addon.installdir
-sandbox_core_package_addon.dirname      = addon.dirname
-sandbox_core_package_addon.registryfile = addon.registryfile
-sandbox_core_package_addon.payloaddirs  = addon.payloaddirs
-sandbox_core_package_addon.payloads     = addon.payloads
-sandbox_core_package_addon.payloadinfos = addon.payloadinfos
-sandbox_core_package_addon.payloads_of  = addon.payloads_of
-sandbox_core_package_addon.addons       = addon.addons
-sandbox_core_package_addon.addondir     = addon.addondir
-sandbox_core_package_addon.register     = addon.register
-sandbox_core_package_addon.unregister   = addon.unregister
-sandbox_core_package_addon.remove       = addon.remove
-sandbox_core_package_addon.rescan       = addon.rescan
-sandbox_core_package_addon.clear        = addon.clear
+sandbox_core_package_addon.installdir        = addon.installdir
+sandbox_core_package_addon.dirname           = addon.dirname
+sandbox_core_package_addon.owner             = addon.owner
+sandbox_core_package_addon.is_reference      = addon.is_reference
+sandbox_core_package_addon.resolve_reference = addon.resolve_reference
+sandbox_core_package_addon.registryfile      = addon.registryfile
+sandbox_core_package_addon.payloaddirs       = addon.payloaddirs
+sandbox_core_package_addon.payloads          = addon.payloads
+sandbox_core_package_addon.payloaddir        = addon.payloaddir
+sandbox_core_package_addon.payloadinfos      = addon.payloadinfos
+sandbox_core_package_addon.payloads_of       = addon.payloads_of
+sandbox_core_package_addon.payloadroot       = addon.payloadroot
+sandbox_core_package_addon.addons            = addon.addons
+sandbox_core_package_addon.addondir          = addon.addondir
+sandbox_core_package_addon.register          = addon.register
+sandbox_core_package_addon.unregister        = addon.unregister
+sandbox_core_package_addon.remove            = addon.remove
+sandbox_core_package_addon.rescan            = addon.rescan
+sandbox_core_package_addon.clear             = addon.clear
 
 -- return module
 return sandbox_core_package_addon