diff options
| author | ruki <[email protected]> | 2023-11-17 21:53:04 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-11-17 21:53:04 +0800 |
| commit | 4ec6682dea22ec5a2e4b818700288e625f761d52 (patch) | |
| tree | 40e3e618ca22ae4e838319d458285698ce7528ee /core | |
| parent | 14f1ed5587ebe19a644f4832c059ff4ec830f6df (diff) | |
| parent | 151b4ba88313652627da6f6747ed11bca6edc86c (diff) | |
Merge pull request #4396 from xmake-io/xpack
improve installdir for xpack
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/demo/xmake.lua | 27 | ||||
| -rw-r--r-- | core/xpack.lua | 6 |
2 files changed, 18 insertions, 15 deletions
diff --git a/core/src/demo/xmake.lua b/core/src/demo/xmake.lua index a45c82693..f519dd88a 100644 --- a/core/src/demo/xmake.lua +++ b/core/src/demo/xmake.lua @@ -70,20 +70,21 @@ target("demo") before_installcmd(function (target, batchcmds, opt) -- we need to avoid some old files interfering with xmake's module import. + local package = opt.package 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") + batchcmds:rmdir(package:installdir("actions")) + batchcmds:rmdir(package:installdir("core")) + batchcmds:rmdir(package:installdir("includes")) + batchcmds:rmdir(package:installdir("languages")) + batchcmds:rmdir(package:installdir("modules")) + batchcmds:rmdir(package:installdir("platforms")) + batchcmds:rmdir(package:installdir("plugins")) + batchcmds:rmdir(package:installdir("repository")) + batchcmds:rmdir(package:installdir("rules")) + batchcmds:rmdir(package:installdir("templates")) + batchcmds:rmdir(package:installdir("scripts")) + batchcmds:rmdir(package:installdir("themes")) + batchcmds:rmdir(package:installdir("toolchains")) end end) diff --git a/core/xpack.lua b/core/xpack.lua index eb61f49e4..86c87fc83 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -1,7 +1,9 @@ xpack("xmake") - set_formats("nsis", "zip") - set_description("A cross-platform build utility based on Lua. https://xmake.io") + set_homepage("https://xmake.io") + set_description("A cross-platform build utility based on Lua.") + set_copyright("Copyright (C) 2015-present, TBOOX Open Source Group") set_licensefile("../LICENSE.md") + set_formats("nsis", "zip") add_targets("demo") set_bindir(".") set_iconfile("src/demo/xmake.ico") |