summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-09-17 00:53:10 +0800
committerruki <[email protected]>2022-09-17 00:53:10 +0800
commita9cb7dfc74cd7f451ab06068377a089f0d27d9fb (patch)
treed521871b14e0257a4841f271500dd2501865624d
parentc63b03b54608c6ac9f1d2ae15072e08ac9f72c1d (diff)
rename autotools to autoconf
-rw-r--r--xmake/actions/build/main.lua2
-rw-r--r--xmake/actions/build/xmake.lua14
-rw-r--r--xmake/actions/config/xmake.lua6
-rw-r--r--xmake/modules/private/action/trybuild/autoconf.lua (renamed from xmake/modules/private/action/trybuild/autotools.lua)6
4 files changed, 7 insertions, 21 deletions
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua
index a970b9faf..9e05f6948 100644
--- a/xmake/actions/build/main.lua
+++ b/xmake/actions/build/main.lua
@@ -60,7 +60,7 @@ function _try_build()
raise("unknown build tool: %s", trybuild)
end
else
- for _, name in ipairs({"autotools", "cmake", "meson", "scons", "bazel", "msbuild", "xcodebuild", "make", "ninja", "ndkbuild"}) do
+ for _, name in ipairs({"autoconf", "cmake", "meson", "scons", "bazel", "msbuild", "xcodebuild", "make", "ninja", "ndkbuild"}) do
tool = import("private.action.trybuild." .. name, {anonymous = true})
configfile = tool.detect()
if configfile then
diff --git a/xmake/actions/build/xmake.lua b/xmake/actions/build/xmake.lua
index a1ed27952..8c039bdca 100644
--- a/xmake/actions/build/xmake.lua
+++ b/xmake/actions/build/xmake.lua
@@ -18,27 +18,13 @@
-- @file xmake.lua
--
--- define task
task("build")
-
- -- set category
set_category("main")
-
- -- on run
on_run("main")
-
- -- set menu
set_menu {
- -- usage
usage = "xmake [task] [options] [target]"
-
- -- description
, description = "Build targets if no given tasks."
-
- -- xmake b
, shortname = 'b'
-
- -- options
, options =
{
{'b', "build", "k", nil , "Build target. This is default building mode and optional." }
diff --git a/xmake/actions/config/xmake.lua b/xmake/actions/config/xmake.lua
index 6312e32af..3835ca20f 100644
--- a/xmake/actions/config/xmake.lua
+++ b/xmake/actions/config/xmake.lua
@@ -217,13 +217,13 @@ task("config")
{nil, "trybuild", "kv", nil , "Enable try-build mode and set the third-party buildsystem tool.",
"e.g.",
" - xmake f --trybuild=auto; xmake",
- " - xmake f --trybuild=autotools -p android --ndk=xxx; xmake",
+ " - xmake f --trybuild=autoconf -p android --ndk=xxx; xmake",
"",
"the third-party buildsystems:"
- , values = {"auto", "make", "autotools", "cmake", "scons", "meson", "bazel", "ninja", "msbuild", "xcodebuild", "ndkbuild"}},
+ , values = {"auto", "make", "autoconf", "cmake", "scons", "meson", "bazel", "ninja", "msbuild", "xcodebuild", "ndkbuild"}},
{nil, "tryconfigs", "kv", nil , "Set the extra configurations of the third-party buildsystem for the try-build mode.",
"e.g.",
- " - xmake f --trybuild=autotools --tryconfigs='--enable-shared=no'"},
+ " - xmake f --trybuild=autoconf --tryconfigs='--enable-shared=no'"},
{'o', "buildir", "kv", "build" , "Set build directory."},
{},
{nil, "target", "v" , nil , "Configure for the given target."
diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autoconf.lua
index 2a0f25ad1..381c57251 100644
--- a/xmake/modules/private/action/trybuild/autotools.lua
+++ b/xmake/modules/private/action/trybuild/autoconf.lua
@@ -15,7 +15,7 @@
-- Copyright (C) 2015-present, TBOOX Open Source Group.
--
-- @author ruki
--- @file autotools.lua
+-- @file autoconf.lua
--
-- imports
@@ -245,7 +245,7 @@ function _get_configs(artifacts_dir)
host = host .. "-" .. (get_config("target_os") or "linux")
table.insert(configs, "--host=" .. host)
else
- raise("autotools: unknown platform(%s)!", config.plat())
+ raise("autoconf: unknown platform(%s)!", config.plat())
end
end
return configs
@@ -256,7 +256,7 @@ function detect()
if not is_subhost("windows") then
return find_file("configure", os.curdir()) or
find_file("configure.ac", os.curdir()) or
- find_file("autogen.sh", os.curir())
+ find_file("autogen.sh", os.curdir())
end
end