diff options
| author | ruki <[email protected]> | 2024-09-25 14:19:12 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-09-25 14:19:12 +0800 |
| commit | dc097d15931e7d16e295f01b1b4e136a3bbf11f1 (patch) | |
| tree | 95d9bf5d048df8c261b0917ff43e3bb4f3c9842b | |
| parent | 583f8e6944130e157ec85b8a975a76733b3eb775 (diff) | |
| parent | c2294cfacd63067dbe3ec1f9cd43f4d85808219c (diff) | |
Merge pull request #5656 from xmake-io/cli
rename demo to cli
| -rw-r--r-- | core/src/cli/xmake.c (renamed from core/src/demo/xmake.c) | 0 | ||||
| -rw-r--r-- | core/src/cli/xmake.ico (renamed from core/src/demo/xmake.ico) | bin | 119943 -> 119943 bytes | |||
| -rw-r--r-- | core/src/cli/xmake.lua (renamed from core/src/demo/xmake.lua) | 2 | ||||
| -rw-r--r-- | core/src/cli/xmake.rc (renamed from core/src/demo/xmake.rc) | 0 | ||||
| -rwxr-xr-x | core/src/cli/xmake.sh (renamed from core/src/demo/xmake.sh) | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rwxr-xr-x | core/xmake.sh | 2 | ||||
| -rw-r--r-- | core/xpack.lua | 4 | ||||
| -rw-r--r-- | scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch | 2 |
9 files changed, 7 insertions, 7 deletions
diff --git a/core/src/demo/xmake.c b/core/src/cli/xmake.c index 82ed54e25..82ed54e25 100644 --- a/core/src/demo/xmake.c +++ b/core/src/cli/xmake.c diff --git a/core/src/demo/xmake.ico b/core/src/cli/xmake.ico Binary files differindex 52c8ef389..52c8ef389 100644 --- a/core/src/demo/xmake.ico +++ b/core/src/cli/xmake.ico diff --git a/core/src/demo/xmake.lua b/core/src/cli/xmake.lua index f519dd88a..e093191a6 100644 --- a/core/src/demo/xmake.lua +++ b/core/src/cli/xmake.lua @@ -1,4 +1,4 @@ -target("demo") +target("cli") -- disable this target if only build libaries if has_config("onlylib") then diff --git a/core/src/demo/xmake.rc b/core/src/cli/xmake.rc index 2167c8f25..2167c8f25 100644 --- a/core/src/demo/xmake.rc +++ b/core/src/cli/xmake.rc diff --git a/core/src/demo/xmake.sh b/core/src/cli/xmake.sh index 05b1047ca..531a6e86a 100755 --- a/core/src/demo/xmake.sh +++ b/core/src/cli/xmake.sh @@ -1,6 +1,6 @@ #!/bin/sh -target "demo" +target "cli" add_deps "xmake" set_kind "binary" set_basename "xmake" diff --git a/core/xmake.lua b/core/xmake.lua index eebec946d..7984a40fd 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -131,7 +131,7 @@ if is_plat("windows") then end -- add projects -includes("src/sv", "src/lz4", "src/tbox", "src/xmake", "src/demo") +includes("src/sv", "src/lz4", "src/tbox", "src/xmake", "src/cli") if has_config("lua_cjson") then includes("src/lua-cjson") end diff --git a/core/xmake.sh b/core/xmake.sh index b9320f329..4eeae317d 100755 --- a/core/xmake.sh +++ b/core/xmake.sh @@ -228,4 +228,4 @@ if ! has_config "external"; then includes "src/tbox" fi includes "src/xmake" -includes "src/demo" +includes "src/cli" diff --git a/core/xpack.lua b/core/xpack.lua index c9d51b852..0f704f49e 100644 --- a/core/xpack.lua +++ b/core/xpack.lua @@ -6,9 +6,9 @@ xpack("xmake") set_author("ruki <[email protected]>") set_licensefile("../LICENSE.md") set_formats("nsis", "wix", "zip") - add_targets("demo") + add_targets("cli") set_bindir(".") - set_iconfile("src/demo/xmake.ico") + set_iconfile("src/cli/xmake.ico") add_components("LongPath") diff --git a/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch b/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch index 3ce8ba97a..cab072fa5 100644 --- a/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch +++ b/scripts/rpmbuild/0001-use-static-libsv-and-tbox.patch @@ -24,4 +24,4 @@ index 2ae2e686b..6ea8c1b69 100755 + includes "src/tbox" fi includes "src/xmake" - includes "src/demo" + includes "src/cli" |
