From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp36.i.mail.ru (smtp36.i.mail.ru [94.100.177.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id 211374696C4 for ; Sun, 5 Apr 2020 17:50:13 +0300 (MSK) From: Leonid Vasiliev Date: Sun, 5 Apr 2020 17:50:07 +0300 Message-Id: <2b8e68115786e3363398cb1b5f4929a5962679a4.1586096636.git.lvasiliev@tarantool.org> In-Reply-To: References: In-Reply-To: References: Subject: [Tarantool-patches] [PATCH v2 1/3] Add the chdir option for make List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: v.shpilevoy@tarantool.org Cc: tarantool-patches@dev.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= 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"] = "", ["build-deps"] = true, + ["chdir"] = "", ["debug"] = true, ["deps"] = true, ["deps-mode"] = "", -- 2.7.4