diff options
| author | ruki <[email protected]> | 2026-03-04 07:54:30 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-03-04 07:54:30 +0800 |
| commit | bf24224a1f27d9b957caef9fdffa64f139ca093f (patch) | |
| tree | bc67ba183ffff74b7882fd02d53c04b274280187 /core/src | |
| parent | e0e20ef6ddbd0fc62fbaa00d195ce95f22a86fdf (diff) | |
| parent | 074e35d2647a9271d37ecc30f41b4ca7332033ac (diff) | |
Merge pull request #7368 from xmake-io/templates
move templates to repository
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/cli/xmake.lua | 5 | ||||
| -rwxr-xr-x | core/src/cli/xmake.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/core/src/cli/xmake.lua b/core/src/cli/xmake.lua index 98e86b128..7cd50cb2c 100644 --- a/core/src/cli/xmake.lua +++ b/core/src/cli/xmake.lua @@ -58,7 +58,7 @@ target("cli") add_installfiles("$(projectdir)/../NOTICE.md") add_installfiles("$(projectdir)/../xmake/(**.lua)") add_installfiles("$(projectdir)/../xmake/(scripts/**)") - add_installfiles("$(projectdir)/../xmake/(templates/**)") + add_installfiles("$(projectdir)/../xmake/(repository/templates/**)") add_installfiles("$(projectdir)/../scripts/xrepo.bat") add_installfiles("$(projectdir)/../scripts/xrepo.ps1") set_prefixdir("/", {bindir = "/"}) @@ -68,7 +68,7 @@ target("cli") else add_installfiles("$(projectdir)/../(xmake/**.lua)", {prefixdir = "share"}) add_installfiles("$(projectdir)/../(xmake/scripts/**)", {prefixdir = "share"}) - add_installfiles("$(projectdir)/../(xmake/templates/**)", {prefixdir = "share"}) + add_installfiles("$(projectdir)/../(xmake/repository/templates/**)", {prefixdir = "share"}) add_installfiles("$(projectdir)/../scripts/xrepo.sh", {prefixdir = "bin", filename = "xrepo"}) end @@ -91,4 +91,3 @@ target("cli") batchcmds:rmdir(package:installdir("toolchains")) end end) - diff --git a/core/src/cli/xmake.sh b/core/src/cli/xmake.sh index 6ae33ef16..af4e8ba36 100755 --- a/core/src/cli/xmake.sh +++ b/core/src/cli/xmake.sh @@ -32,7 +32,7 @@ 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/templates/**)" "share" + add_installfiles "${projectdir}/(xmake/repository/templates/**)" "share" add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo" # fix os.exec() call incorrect program from /mingw64/bin. e.g. python, .. |