Merge pull request #5656 from xmake-io/cli

rename demo to cli
xmake-io · Sep 25, 2024 · dc097d1 · dc097d1
2 parents 583f8e6 + c2294cf
commit dc097d1
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/core/src/demo/xmake.c → core/src/cli/xmake.c b/core/src/demo/xmake.c → core/src/cli/xmake.c
diff --git a/core/src/demo/xmake.ico → core/src/cli/xmake.ico b/core/src/demo/xmake.ico → core/src/cli/xmake.ico
diff --git a/core/src/demo/xmake.lua → core/src/cli/xmake.lua b/core/src/demo/xmake.lua → 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 → core/src/cli/xmake.rc b/core/src/demo/xmake.rc → core/src/cli/xmake.rc
diff --git a/core/src/demo/xmake.sh → core/src/cli/xmake.sh b/core/src/demo/xmake.sh → 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
@@ -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
@@ -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
@@ -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
@@ -24,4 +24,4 @@ index 2ae2e686b..6ea8c1b69 100755
 +    includes "src/tbox"
  fi
  includes "src/xmake"
- includes "src/demo"
+ includes "src/cli"