From patchwork Sat Apr 5 15:21:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 337179 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 01713140077 for ; Sun, 6 Apr 2014 02:22:43 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 028B831D44; Sat, 5 Apr 2014 15:22:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rLuo834dgQWp; Sat, 5 Apr 2014 15:22:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4AC2431C2B; Sat, 5 Apr 2014 15:22:32 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 9F4B41BF97E for ; Sat, 5 Apr 2014 15:22:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 9BBE48BF27 for ; Sat, 5 Apr 2014 15:22:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id I9V1BUN0AIZ2 for ; Sat, 5 Apr 2014 15:22:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com [209.85.212.181]) by fraxinus.osuosl.org (Postfix) with ESMTPS id BE14C8BF93 for ; Sat, 5 Apr 2014 15:22:10 +0000 (UTC) Received: by mail-wi0-f181.google.com with SMTP id hm4so2777070wib.14 for ; Sat, 05 Apr 2014 08:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=/y9MZMz4ZUVT53rPWUYKRoMJBLuwZx3SecbWi+tRdmU=; b=wyRaXwwqsFE+V5uorFm1/22Yl3fVYgJGY3t18ZZ9lhe/Djxsp6biCuKzLpqvhfgrAi zsG5Yu2xnMDn8H2Zt6CAaxHs6Rt4SMOvyWMIo4aIfqvTHaTeHxvotbfnQ3ZkDkFe5E29 8yoV1Dp3lUZ8DtTabWCD3AnYobUjmG7Or2M2C19GfpikpgBj05Q2/Wg1XG/A2aHXuGhH cZUDwdM3f4QrPITQSWZcNKjabbIYUQT7PM0DuVTLKJ7r34W/vZSpKdeTX4DI3v42BnMY Ir6o2VynHkOiBEY+th1QlpPJVQoLZqrXZsYxO6wo+b9rZrb/QpMEk2mIwJr1eOYcaKnF sZsg== X-Received: by 10.180.93.226 with SMTP id cx2mr8447721wib.16.1396711329398; Sat, 05 Apr 2014 08:22:09 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id t10sm11403796wiw.19.2014.04.05.08.22.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 05 Apr 2014 08:22:08 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Sat, 5 Apr 2014 17:21:43 +0200 Message-Id: <4ecf9432eebb05e872dda344b09dd3c3a7d3bb34.1396711074.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 06/21] package/lua: rename config options X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net From: "Yann E. MORIN" Package's options should be named after the package. Lua is an interpreter, but the package is named 'lua'. So we want to name the config option with '_LUA_', not with '_LUA_INTERPRETER_' Besides, naming them with '_LUA_INTERPRETER_' might be confusing, since there is a package named 'luainterpreter'. Since the renamed options are part of a choice, we can't use the legacy options to select the new ones. So we instead instruct the user to go select the appropriate option in the choice. Signed-off-by: "Yann E. MORIN" Cc: Francois Perrad Reviewed-by: Samuel Martin --- Changes v5 -> v6: - add 'select LEGACY' to the old options --- Config.in.legacy | 24 ++++++++++++++++++++++++ package/lua/Config.in | 10 +++++----- package/lua/lua.mk | 4 ++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 17ead9b..ce44d0f 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -101,6 +101,30 @@ endif ############################################################################### comment "Legacy options removed in 2014.05" +config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE + bool "Lua command-line editing none has been renamed" + select BR2_LEGACY + help + The BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE option has been + renamed to BR2_PACKAGE_LUA_EDITING_NONE. You will have to select + it in the corresponding choice. + +config BR2_PACKAGE_LUA_INTERPRETER_READLINE + bool "Lua command-line editing using readline has been renamed" + select BR2_LEGACY + help + The BR2_PACKAGE_LUA_INTERPRETER_READLINE option has been + renamed to BR2_PACKAGE_LUA_READLINE. You will have to select + it in the corresponding choice. + +config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE + bool "Lua command-line editing using linenoise has been renamed" + select BR2_LEGACY + help + The BR2_PACKAGE_LUA_INTERPRETER_LINENOISE option has been + renamed to BR2_PACKAGE_LUA_LINENOISE. You will have to select + it in the corresponding choice. + config BR2_PACKAGE_DVB_APPS_UTILS bool "dvb-apps utilities now built by default" select BR2_LEGACY diff --git a/package/lua/Config.in b/package/lua/Config.in index 2f1b25b..0e31858 100644 --- a/package/lua/Config.in +++ b/package/lua/Config.in @@ -30,22 +30,22 @@ config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION default "5.2" if BR2_PACKAGE_LUA_5_2 choice - prompt "Lua Interpreter command-line editing" - default BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE + prompt "Lua command-line editing" + default BR2_PACKAGE_LUA_EDITING_NONE -config BR2_PACKAGE_LUA_INTERPRETER_EDITING_NONE +config BR2_PACKAGE_LUA_EDITING_NONE bool "none" help None. -config BR2_PACKAGE_LUA_INTERPRETER_READLINE +config BR2_PACKAGE_LUA_READLINE bool "readline support" select BR2_PACKAGE_READLINE select BR2_PACKAGE_NCURSES help Enables command-line editing in the Lua interpreter. -config BR2_PACKAGE_LUA_INTERPRETER_LINENOISE +config BR2_PACKAGE_LUA_LINENOISE bool "linenoise support" select BR2_PACKAGE_LINENOISE help diff --git a/package/lua/lua.mk b/package/lua/lua.mk index bf68e65..bc8799a 100644 --- a/package/lua/lua.mk +++ b/package/lua/lua.mk @@ -31,12 +31,12 @@ else LUA_MYLIBS += -ldl endif -ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_READLINE),y) +ifeq ($(BR2_PACKAGE_LUA_READLINE),y) LUA_DEPENDENCIES = readline ncurses LUA_MYLIBS += -lreadline -lhistory -lncurses LUA_CFLAGS += -DLUA_USE_READLINE else -ifeq ($(BR2_PACKAGE_LUA_INTERPRETER_LINENOISE),y) +ifeq ($(BR2_PACKAGE_LUA_LINENOISE),y) LUA_DEPENDENCIES = linenoise LUA_MYLIBS += -llinenoise LUA_CFLAGS += -DLUA_USE_LINENOISE