diff options
| author | ruki <[email protected]> | 2026-08-09 18:25:05 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-08-09 18:25:05 +0800 |
| commit | ced7f2ae519bc9eca92bcf4f177fe177ddd0e747 (patch) | |
| tree | af4d584b3c7badc1df56038cdb29099b4f3e99fd /core/src | |
| parent | 6ac4ea833193a4319a1eb6e5f588d1877fd48064 (diff) | |
| parent | 5f5daf64c504e1103a355f45bf925a5149b03e24 (diff) | |
Merge pull request #7699 from xmake-io/templates
move templates dir
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/cli/xmake.lua | 6 | ||||
| -rwxr-xr-x | core/src/cli/xmake.sh | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/core/src/cli/xmake.lua b/core/src/cli/xmake.lua index 7cd50cb2c..54b78806d 100644 --- a/core/src/cli/xmake.lua +++ b/core/src/cli/xmake.lua @@ -58,7 +58,8 @@ target("cli") add_installfiles("$(projectdir)/../NOTICE.md") add_installfiles("$(projectdir)/../xmake/(**.lua)") add_installfiles("$(projectdir)/../xmake/(scripts/**)") - add_installfiles("$(projectdir)/../xmake/(repository/templates/**)") + add_installfiles("$(projectdir)/../xmake/(templates/**)") + add_installfiles("$(projectdir)/../xmake/(repository/**)") add_installfiles("$(projectdir)/../scripts/xrepo.bat") add_installfiles("$(projectdir)/../scripts/xrepo.ps1") set_prefixdir("/", {bindir = "/"}) @@ -68,7 +69,8 @@ target("cli") else add_installfiles("$(projectdir)/../(xmake/**.lua)", {prefixdir = "share"}) add_installfiles("$(projectdir)/../(xmake/scripts/**)", {prefixdir = "share"}) - add_installfiles("$(projectdir)/../(xmake/repository/templates/**)", {prefixdir = "share"}) + add_installfiles("$(projectdir)/../(xmake/templates/**)", {prefixdir = "share"}) + add_installfiles("$(projectdir)/../(xmake/repository/**)", {prefixdir = "share"}) add_installfiles("$(projectdir)/../scripts/xrepo.sh", {prefixdir = "bin", filename = "xrepo"}) end diff --git a/core/src/cli/xmake.sh b/core/src/cli/xmake.sh index af4e8ba36..a7ef02601 100755 --- a/core/src/cli/xmake.sh +++ b/core/src/cli/xmake.sh @@ -32,7 +32,8 @@ target "cli" add_installfiles "${projectdir}/(xmake/scripts/virtualenvs/**)" "share" add_installfiles "${projectdir}/(xmake/scripts/conan/**)" "share" add_installfiles "${projectdir}/(xmake/scripts/module/**)" "share" - add_installfiles "${projectdir}/(xmake/repository/templates/**)" "share" + add_installfiles "${projectdir}/(xmake/templates/**)" "share" + add_installfiles "${projectdir}/(xmake/repository/**)" "share" add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo" # fix os.exec() call incorrect program from /mingw64/bin. e.g. python, .. |