MirrorSave
/
nodemcu-firmware
mirror of https://github.com/nodemcu/nodemcu-firmware.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Announce Lua config options with version. 

To make it possible to find the right build cross compiler to use with
any given firmware.
This commit is contained in:
Johny Mattsson 2021-08-30 17:55:45 +10:00
parent 4c21bd6b9a
commit 8f83693262
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/lua/lua-5.1/host/luac.c
View File

@ -147,7 +147,7 @@ static int doargs(int argc, char* argv[])
} }
if (version) if (version)
{ {
printf("%s %s\n",LUA_RELEASE,LUA_COPYRIGHT); printf("%s %s [%s]\n",LUA_RELEASE,LUA_COPYRIGHT,XLUA_OPT_STR);
if (version==argc-1) exit(EXIT_SUCCESS); if (version==argc-1) exit(EXIT_SUCCESS);
} }
return i; return i;

6
components/lua/lua-5.1/luaconf.h
View File

@ -875,4 +875,10 @@ union luai_Cast { double l_d; long l_l; };
#define LUA_DEBUG_HOOK lua_debugbreak #define LUA_DEBUG_HOOK lua_debugbreak
#if defined(CONFIG_LUA_NUMBER_INTEGRAL)
# define XLUA_OPT_STR "5.1-integral"
#else
# define XLUA_OPT_STR "5.1-doublefp"
#endif
#endif #endif

2
components/lua/lua-5.3/host/luac.c
View File

@ -161,7 +161,7 @@ static int doargs(int argc, char *argv[]) {
argv[--i] = Output; argv[--i] = Output;
} }
if (version) { if (version) {
printf("%s\n", LUA_COPYRIGHT); printf("%s [%s]\n", LUA_COPYRIGHT, XLUA_OPT_STR);
if (version == argc - 1) exit(EXIT_SUCCESS); if (version == argc - 1) exit(EXIT_SUCCESS);
} }
return i; return i;

4
components/lua/lua-5.3/lua.c
View File

@ -244,8 +244,8 @@ static int pmain (lua_State *L) {
print_version(L); print_version(L);
} }
#else #else
printf("\n%s build %s powered by %s on IDF %s\n", printf("\n%s build %s powered by %s [%s] on IDF %s\n",
NODE_VERSION, BUILD_DATE, LUA_RELEASE, IDF_VER); NODE_VERSION, BUILD_DATE, LUA_RELEASE, XLUA_OPT_STR, IDF_VER);
#endif #endif
/* /*
* And last of all, kick off application initialisation. Note that if * And last of all, kick off application initialisation. Note that if

12
components/lua/lua-5.3/luaconf.h
View File

@ -441,4 +441,16 @@
#define LUA_DEBUG_HOOK lua_debugbreak #define LUA_DEBUG_HOOK lua_debugbreak
#if defined(CONFIG_LUA_NUMBER_INT64)
# define XLUA_INT_OPT "int64"
#else
# define XLUA_INT_OPT "int32"
#endif
#if defined(CONFIG_LUA_NUMBER_DOUBLE)
# define XLUA_FLOAT_OPT "doublefp"
#else
# define XLUA_FLOAT_OPT "singlefp"
#endif
#define XLUA_OPT_STR "5.3-" XLUA_INT_OPT "-" XLUA_FLOAT_OPT
#endif #endif