From c871e3f603c6022c16659cca61f8995f29b5275e Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 27 Oct 2021 22:41:07 +0800 Subject: add nimble stub --- .../package/manager/nimble/install_package.lua | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 xmake/modules/package/manager/nimble/install_package.lua (limited to 'xmake/modules/package/manager/nimble/install_package.lua') diff --git a/xmake/modules/package/manager/nimble/install_package.lua b/xmake/modules/package/manager/nimble/install_package.lua new file mode 100644 index 000000000..57addc15a --- /dev/null +++ b/xmake/modules/package/manager/nimble/install_package.lua @@ -0,0 +1,41 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- Copyright (C) 2015-present, TBOOX Open Source Group. +-- +-- @author ruki +-- @file install_package.lua +-- + +-- imports +import("core.base.option") +import("core.project.config") +import("lib.detect.find_tool") + +-- install package +-- +-- @param name the package name, e.g. nimble::zip +-- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , require_version = "x.x.x", buildhash = "xxxxxx"} +-- +-- @return true or false +-- +function main(name, opt) + + -- find nimble + local nimble = find_tool("nimble") + if not nimble then + raise("nimble not found!") + end + +end -- cgit v1.3.1 From cc80af774a9426d7775be165adb4aa00d8569ed6 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 27 Oct 2021 22:45:11 +0800 Subject: impl nimble/install_package --- tests/projects/nim/nimble_package/xmake.lua | 2 +- xmake/modules/package/manager/nimble/install_package.lua | 12 ++++++++++++ xmake/modules/private/action/require/impl/package.lua | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'xmake/modules/package/manager/nimble/install_package.lua') diff --git a/tests/projects/nim/nimble_package/xmake.lua b/tests/projects/nim/nimble_package/xmake.lua index af3e0f0f5..45e6f3132 100644 --- a/tests/projects/nim/nimble_package/xmake.lua +++ b/tests/projects/nim/nimble_package/xmake.lua @@ -1,6 +1,6 @@ add_rules("mode.debug", "mode.release") -add_requires("nimble::zip") +add_requires("nimble::zip >0.3") target("test") set_kind("binary") diff --git a/xmake/modules/package/manager/nimble/install_package.lua b/xmake/modules/package/manager/nimble/install_package.lua index 57addc15a..b5ba21438 100644 --- a/xmake/modules/package/manager/nimble/install_package.lua +++ b/xmake/modules/package/manager/nimble/install_package.lua @@ -38,4 +38,16 @@ function main(name, opt) raise("nimble not found!") end + -- install the given package + local argv = {"install", "-y"} + if option.get("verbose") then + table.insert(argv, "--verbose") + end + local require_str = name + if opt.require_version and opt.require_version ~= "latest" and opt.require_version ~= "master" then + name = name .. "@" + name = name .. opt.require_version + end + table.insert(argv, name) + os.vrunv(nimble.program, argv) end diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 5a43de562..77c20648b 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -339,7 +339,7 @@ function _select_package_version(package, requireinfo, locked_requireinfo) version = "latest" source = "version" end - if not version then + if not version and not package:is_thirdparty() then raise("package(%s): version(%s) not found!", package:name(), require_version) end return version, source -- cgit v1.3.1 From 20d47ee82092c9d92f18284cf6873bde6e65c2f3 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 27 Oct 2021 22:45:27 +0800 Subject: improve comments --- xmake/modules/package/manager/dub/install_package.lua | 2 +- xmake/modules/package/manager/nimble/install_package.lua | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'xmake/modules/package/manager/nimble/install_package.lua') diff --git a/xmake/modules/package/manager/dub/install_package.lua b/xmake/modules/package/manager/dub/install_package.lua index 84406af5f..d459bfd92 100644 --- a/xmake/modules/package/manager/dub/install_package.lua +++ b/xmake/modules/package/manager/dub/install_package.lua @@ -26,7 +26,7 @@ import("lib.detect.find_tool") -- install package -- -- @param name the package name, e.g. dub::log --- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , require_version = "x.x.x", buildhash = "xxxxxx"} +-- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , require_version = "x.x.x"} -- -- @return true or false -- diff --git a/xmake/modules/package/manager/nimble/install_package.lua b/xmake/modules/package/manager/nimble/install_package.lua index b5ba21438..326758e8c 100644 --- a/xmake/modules/package/manager/nimble/install_package.lua +++ b/xmake/modules/package/manager/nimble/install_package.lua @@ -25,8 +25,13 @@ import("lib.detect.find_tool") -- install package -- +-- e.g. +-- add_requires("nimble::zip") +-- add_requires("nimble::zip >0.3") +-- add_requires("nimble::zip 0.3.1") +-- -- @param name the package name, e.g. nimble::zip --- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , require_version = "x.x.x", buildhash = "xxxxxx"} +-- @param opt the options, e.g. { verbose = true, mode = "release", plat = , arch = , require_version = "x.x.x"} -- -- @return true or false -- -- cgit v1.3.1