diff options
| author | ruki <[email protected]> | 2023-11-17 11:03:51 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-17 11:03:51 +0800 |
| commit | cf3afe37b546efb93079fd6314c0769884ca0fb1 (patch) | |
| tree | 732f74fe2fd2922f3c95e8542de82cb6ee108f1c /core | |
| parent | b6bb372d19bd2f6ac931d3e0e096b4fa07024cfb (diff) | |
| parent | e0f074c79be1f712d09df9f7b4b32245ba95f1c9 (diff) | |
Merge pull request #4392 from xmake-io/emptydirs
improve os.rm to support remove emptydirs
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/demo/xmake.lua | 19 | ||||
| -rw-r--r-- | core/xpack.lua | 1 |
2 files changed, 20 insertions, 0 deletions
diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua index 02466b31f..a45c82693 100644 --- a/core/src/demo/xmake.lua +++ b/core/src/demo/xmake.lua @@ -68,3 +68,22 @@ target("demo") add_installfiles("$(projectdir)/../scripts/xrepo.sh", {prefixdir = "bin", filename = "xrepo"}) end + before_installcmd(function (target, batchcmds, opt) + -- we need to avoid some old files interfering with xmake's module import. + if target:is_plat("windows") then + batchcmds:rmdir("actions") + batchcmds:rmdir("core") + batchcmds:rmdir("includes") + batchcmds:rmdir("languages") + batchcmds:rmdir("modules") + batchcmds:rmdir("platforms") + batchcmds:rmdir("plugins") + batchcmds:rmdir("repository") + batchcmds:rmdir("rules") + batchcmds:rmdir("templates") + batchcmds:rmdir("scripts") + batchcmds:rmdir("themes") + batchcmds:rmdir("toolchains") + end + end) + diff --git a/core/xpack.lua b/core/xpack.lua index 5cbff58e8..280b1365a 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -5,6 +5,7 @@ xpack("xmake") add_targets("demo") set_bindir(".") set_iconfile("src/demo/xmake.ico") + set_nsis_displayname("Xmake build utility ($(arch))") on_load(function (package) local arch = package:arch() |