diff options
| author | wtz <[email protected]> | 2023-07-19 12:35:52 +0800 |
|---|---|---|
| committer | wtz <[email protected]> | 2023-07-19 12:35:52 +0800 |
| commit | f75224a8435d0eb9cdda79f8bc571eeef25a8e33 (patch) | |
| tree | 278e00b17c8f5558df1c1a21f1204078ea62a58f /xmake/modules/package | |
| parent | ca83e9a78b7f2d45e833fa705c880867ad2381c6 (diff) | |
Fix grammar
Diffstat (limited to 'xmake/modules/package')
| -rw-r--r-- | xmake/modules/package/manager/apt/find_package.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/manager/nimble/find_package.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/manager/portage/find_package.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/manager/system/find_package.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/manager/zypper/find_package.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 12 | ||||
| -rw-r--r-- | xmake/modules/package/tools/gn.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 2 | ||||
| -rw-r--r-- | xmake/modules/package/tools/msbuild.lua | 2 |
9 files changed, 14 insertions, 14 deletions
diff --git a/xmake/modules/package/manager/apt/find_package.lua b/xmake/modules/package/manager/apt/find_package.lua index d71a34319..0e833e2ee 100644 --- a/xmake/modules/package/manager/apt/find_package.lua +++ b/xmake/modules/package/manager/apt/find_package.lua @@ -37,7 +37,7 @@ function _find_package(dpkg, name, opt) -- get includedirs local pos = line:find("include/", 1, true) if pos then - -- we need not add includedirs, gcc/clang will use /usr/ as default sysroot + -- we don't need to add includedirs, gcc/clang will use /usr/ as default sysroot result = result or {} end diff --git a/xmake/modules/package/manager/nimble/find_package.lua b/xmake/modules/package/manager/nimble/find_package.lua index c39d6ed34..38eddefa6 100644 --- a/xmake/modules/package/manager/nimble/find_package.lua +++ b/xmake/modules/package/manager/nimble/find_package.lua @@ -61,7 +61,7 @@ function main(name, opt) end end end - -- @note we need not return links and includedirs information, + -- @note we don't need return links and includedirs information, -- because it's nim source code package and nim will find them automatically return result end diff --git a/xmake/modules/package/manager/portage/find_package.lua b/xmake/modules/package/manager/portage/find_package.lua index 9b2c21340..f08b8e39f 100644 --- a/xmake/modules/package/manager/portage/find_package.lua +++ b/xmake/modules/package/manager/portage/find_package.lua @@ -90,7 +90,7 @@ function main(name, opt) includedirs = table.unique(includedirs) result = find_package_from_pkgconfig(pkgconfig_name, {configdirs = pkgconfig_dir, linkdirs = linkdirs}) if not result and has_includes then - -- header only and hidden /usr/include? we need only return empty {} + -- header only and hidden /usr/include? we only need to return empty {} result = {} end end diff --git a/xmake/modules/package/manager/system/find_package.lua b/xmake/modules/package/manager/system/find_package.lua index 1e0d58c77..55cf839c0 100644 --- a/xmake/modules/package/manager/system/find_package.lua +++ b/xmake/modules/package/manager/system/find_package.lua @@ -158,7 +158,7 @@ function _find_package_from_xcodedirs(name, links, opt) end end if result then - -- we need not add linkdirs again if we are building target on the current platform (with -isysroot) + -- we don't need to add linkdirs again if we are building target on the current platform (with -isysroot) if config.plat() ~= opt.plat or config.arch() ~= opt.arch then result.linkdirs = linkdirs result.includedirs = includedirs diff --git a/xmake/modules/package/manager/zypper/find_package.lua b/xmake/modules/package/manager/zypper/find_package.lua index 1840de5c2..ea5651004 100644 --- a/xmake/modules/package/manager/zypper/find_package.lua +++ b/xmake/modules/package/manager/zypper/find_package.lua @@ -42,7 +42,7 @@ function _find_package(rpm, name, opt) -- get includedirs local pos = line:find("include/", 1, true) if pos then - -- we need not add includedirs, gcc/clang will use /usr/ as default sysroot + -- we don't need to add includedirs, gcc/clang will use /usr/ as default sysroot result = result or {} end diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 13b0e03df..d30ecb52c 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -86,7 +86,7 @@ end -- get msvc function _get_msvc(package) local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - assert(msvc:check(), "vs not found!") -- we need check vs envs if it has been not checked yet + assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end @@ -506,7 +506,7 @@ function _get_configs_for_cross(package, configs, opt) envs.CMAKE_CXX_COMPILER = _translate_bin_path(cxx) end -- @note The link command line is set in Modules/CMake{C,CXX,Fortran}Information.cmake and defaults to using the compiler, not CMAKE_LINKER, - -- so we need set CMAKE_CXX_LINK_EXECUTABLE to use CMAKE_LINKER as linker. + -- so we need to set CMAKE_CXX_LINK_EXECUTABLE to use CMAKE_LINKER as linker. -- -- https://github.com/xmake-io/xmake-repo/pull/1039 -- https://stackoverflow.com/questions/1867745/cmake-use-a-custom-linker/25274328#25274328 @@ -522,7 +522,7 @@ function _get_configs_for_cross(package, configs, opt) envs.CMAKE_STATIC_LINKER_FLAGS = table.concat(table.wrap(package:build_getenv("arflags")), ' ') envs.CMAKE_EXE_LINKER_FLAGS = _get_ldflags(package, opt) envs.CMAKE_SHARED_LINKER_FLAGS = _get_shflags(package, opt) - -- we need not set it as cross compilation if we just pass toolchain + -- we don't need to set it as cross compilation if we just pass toolchain -- https://github.com/xmake-io/xmake/issues/2170 if not package:is_plat(os.subhost()) then local system_name = package:targetos() or "Linux" @@ -596,7 +596,7 @@ function _get_configs_for_host_toolchain(package, configs, opt) envs.CMAKE_STATIC_LINKER_FLAGS = table.concat(table.wrap(package:build_getenv("arflags")), ' ') envs.CMAKE_EXE_LINKER_FLAGS = _get_ldflags(package, opt) envs.CMAKE_SHARED_LINKER_FLAGS = _get_shflags(package, opt) - -- we need not set it as cross compilation if we just pass toolchain + -- we don't need to set it as cross compilation if we just pass toolchain -- https://github.com/xmake-io/xmake/issues/2170 if not package:is_plat(os.subhost()) then envs.CMAKE_SYSTEM_NAME = "Linux" @@ -719,7 +719,7 @@ end -- get build environments function buildenvs(package, opt) - -- we need bind msvc environments manually + -- we need to bind msvc environments manually -- @see https://github.com/xmake-io/xmake/issues/1057 opt = opt or {} local envs = {} @@ -727,7 +727,7 @@ function buildenvs(package, opt) envs = _get_msvc_runenvs(package) end - -- we need pass pkgconf for windows/mingw without msys2/cygwin + -- we need to pass pkgconf for windows/mingw without msys2/cygwin if package:is_plat("windows", "mingw") and is_subhost("windows") then local pkgconf = find_tool("pkgconf") if pkgconf then diff --git a/xmake/modules/package/tools/gn.lua b/xmake/modules/package/tools/gn.lua index 221ca92e9..8684482e4 100644 --- a/xmake/modules/package/tools/gn.lua +++ b/xmake/modules/package/tools/gn.lua @@ -76,7 +76,7 @@ end -- get msvc function _get_msvc(package) local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - assert(msvc:check(), "vs not found!") -- we need check vs envs if it has been not checked yet + assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 89fff1423..c4057ee32 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -310,7 +310,7 @@ end -- get msvc function _get_msvc(package) local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - assert(msvc:check(), "vs not found!") -- we need check vs envs if it has been not checked yet + assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end diff --git a/xmake/modules/package/tools/msbuild.lua b/xmake/modules/package/tools/msbuild.lua index 21fd2e693..5897c357f 100644 --- a/xmake/modules/package/tools/msbuild.lua +++ b/xmake/modules/package/tools/msbuild.lua @@ -32,7 +32,7 @@ end -- get msvc function _get_msvc(package) local msvc = toolchain.load("msvc", {plat = package:plat(), arch = package:arch()}) - assert(msvc:check(), "vs not found!") -- we need check vs envs if it has been not checked yet + assert(msvc:check(), "vs not found!") -- we need to check vs envs if it has been not checked yet return msvc end |
