Commit c97aeb7e authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

package/lua: rename config options 



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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Francois Perrad <fperrad@gmail.com>
Reviewed-by: default avatarSamuel Martin <s.martin49@gmail.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 50dfaef6

Config.in.legacy

+24 −0
Original line number Diff line number Diff line
@@ -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

package/lua/Config.in

+5 −5
Original line number Diff line number Diff line
@@ -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

package/lua/lua.mk

+2 −2
Original line number Diff line number Diff line
@@ -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