From: Leonid Vasiliev <lvasiliev@tarantool.org>
To: v.shpilevoy@tarantool.org, yaroslav.dynnikov@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH V4] Add the chdir option for make
Date: Mon, 13 Apr 2020 16:09:55 +0300 [thread overview]
Message-ID: <8e8db7f255a855c585245c288414ceb097576e07.1586783231.git.lvasiliev@tarantool.org> (raw)
Flag --chdir for make command (with help) has been added.
It's add possibility to specify a source directory of the rock when make.
---
https://github.com/tarantool/tarantool/issues/4629
https://github.com/tarantool/luarocks/tree/lvasiliev/gh-4629-add-chdir-to-make
See corresponding patch for tarantoolctl
(https://github.com/tarantool/tarantool/tree/lvasiliev/gh-4629-forward-flags)
Motivation:
Imperfect integretion of the Luarocks to tarantoolctl
(enable some commands)
Was done:
whitelist of tarantoolctl don't used for luarocks flags
Option chdir has been moved from tarantoolctl to luarocks
@ChangeLog - see a comment in tarantool
src/luarocks/cmd/make.lua | 8 ++++++++
src/luarocks/util.lua | 1 +
2 files changed, 9 insertions(+)
diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua
index 4d81386..015b01d 100644
--- a/src/luarocks/cmd/make.lua
+++ b/src/luarocks/cmd/make.lua
@@ -59,6 +59,8 @@ only dependencies of the rockspec (see `luarocks help install`).
--sign To be used with --pack-binary-rock. Also produce
a signature file for the generated .rock file.
+--chdir=<path> Specify a source directory of the rock.
+
]]
--- Driver function for "make" command.
@@ -68,6 +70,12 @@ only dependencies of the rockspec (see `luarocks help install`).
function make.command(flags, rockspec_filename)
assert(type(rockspec_filename) == "string" or not rockspec_filename)
+ if flags["chdir"] then
+ local ok, err = fs.change_dir(flags["chdir"])
+ if not ok then
+ return nil, err
+ end
+ end
if not rockspec_filename then
local err
rockspec_filename, err = util.get_default_rockspec()
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index abf6d90..8ccda27 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -92,6 +92,7 @@ local supported_flags = {
["binary"] = true,
["branch"] = "<branch-name>",
["build-deps"] = true,
+ ["chdir"] = "<path>",
["debug"] = true,
["deps"] = true,
["deps-mode"] = "<mode>",
--
2.7.4
next reply other threads:[~2020-04-13 13:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-13 13:09 Leonid Vasiliev [this message]
2020-04-13 13:24 ` Yaroslav Dynnikov
2020-04-13 14:58 ` Vladislav Shpilevoy
2020-04-14 7:47 ` Kirill Yukhin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8e8db7f255a855c585245c288414ceb097576e07.1586783231.git.lvasiliev@tarantool.org \
--to=lvasiliev@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--cc=v.shpilevoy@tarantool.org \
--cc=yaroslav.dynnikov@tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH V4] Add the chdir option for make' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox