From f96bde67e5f76e8766aecf16a9ae68eda28c61c4 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 29 Nov 2023 23:23:12 +0800 Subject: fix xmake.sh --- core/src/demo/xmake.sh | 9 ++++++++- core/xpack.lua | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh index 2969eb13c..a6342ce4e 100755 --- a/core/src/demo/xmake.sh +++ b/core/src/demo/xmake.sh @@ -24,7 +24,14 @@ target "demo" # add install files add_installfiles "${projectdir}/(xmake/**.lua)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/*)" "share" + add_installfiles "${projectdir}/(xmake/scripts/cmake_importfiles/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/completions/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/xpack/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/xrepo/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/virtualenvs/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/pac/**)" "share" + add_installfiles "${projectdir}/(xmake/scripts/conan/**)" "share" add_installfiles "${projectdir}/(xmake/templates/**)" "share" add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo" diff --git a/core/xpack.lua b/core/xpack.lua index e789423c2..a56eaceb8 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -98,7 +98,7 @@ xpack("xmakesrc") local extraconf = {rootdir = rootdir} package:add("sourcefiles", path.join(rootdir, "core/**|src/pdcurses/**|src/luajit/**|src/tbox/tbox/src/demo/**"), extraconf) - package:add("sourcefiles", path.join(rootdir, "xmake/**"), extraconf) + package:add("sourcefiles", path.join(rootdir, "xmake/**|scripts/vsxmake/**"), extraconf) package:add("sourcefiles", path.join(rootdir, "*.md"), extraconf) package:add("sourcefiles", path.join(rootdir, "configure"), extraconf) package:add("sourcefiles", path.join(rootdir, "scripts/*.sh"), extraconf) -- cgit v1.3.1