From: Leonid Vasiliev <lvasiliev@tarantool.org> To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.tarantool.org Subject: [Tarantool-patches] [PATCH v2 1/3] Add the chdir option for make Date: Sun, 5 Apr 2020 17:50:07 +0300 [thread overview] Message-ID: <2b8e68115786e3363398cb1b5f4929a5962679a4.1586096636.git.lvasiliev@tarantool.org> (raw) In-Reply-To: <cover.1586096636.git.lvasiliev@tarantool.org> In-Reply-To: <cover.1586096636.git.lvasiliev@tarantool.org> --- src/luarocks/cmd/make.lua | 11 ++++++++++- src/luarocks/util.lua | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/luarocks/cmd/make.lua b/src/luarocks/cmd/make.lua index 4d81386..99b0fb4 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,13 @@ 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() @@ -78,7 +87,7 @@ function make.command(flags, rockspec_filename) if not rockspec_filename:match("rockspec$") then return nil, "Invalid argument: 'make' takes a rockspec as a parameter. "..util.see_help("make") end - + local rockspec, err, errcode = fetch.load_rockspec(rockspec_filename) if not rockspec then return nil, err 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 prev parent reply other threads:[~2020-04-05 14:50 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-05 14:50 [Tarantool-patches] [PATCH v2 0/3] Adapt luarocks for tarantoolctl Leonid Vasiliev 2020-04-05 14:50 ` Leonid Vasiliev [this message] 2020-04-05 18:40 ` [Tarantool-patches] [PATCH v2 1/3] Add the chdir option for make Vladislav Shpilevoy 2020-04-05 14:50 ` [Tarantool-patches] [PATCH v2 2/3] Add a black list for tarantoolctl rocks options Leonid Vasiliev 2020-04-05 14:50 ` [Tarantool-patches] [PATCH v2 3/3] Adapt luarocks help for tarantoolctl rocks Leonid Vasiliev
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=2b8e68115786e3363398cb1b5f4929a5962679a4.1586096636.git.lvasiliev@tarantool.org \ --to=lvasiliev@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --cc=v.shpilevoy@tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v2 1/3] 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