Commit 136e0973 authored by Nathaniel Wesley Filardo's avatar Nathaniel Wesley Filardo
Browse files

Merge dev into release

While we intend our release strategy to be that we just fast-forward our
`release` branch to `dev`, things have come a little off the wheels.
This is a "git merge -s recursive -X theirs" of `dev` into `release`
instead.
parents 4f679277 c212b30a
stds = stds or ... -- set stds if this script is called by another config script
local empty = { } local empty = { }
local read_write = {read_only = false} local read_write = {read_only = false}
...@@ -423,6 +424,7 @@ stds.nodemcu_libs = { ...@@ -423,6 +424,7 @@ stds.nodemcu_libs = {
restore = empty, restore = empty,
setcpufreq = empty, setcpufreq = empty,
setpartitiontable = empty, setpartitiontable = empty,
setonerror = empty,
sleep = empty, sleep = empty,
stripdebug = empty, stripdebug = empty,
writercr = empty, writercr = empty,
...@@ -485,6 +487,22 @@ stds.nodemcu_libs = { ...@@ -485,6 +487,22 @@ stds.nodemcu_libs = {
new = empty new = empty
} }
}, },
pipe = {
fields = {
create = empty
}
},
pixbuf = {
fields = {
FADE_IN = empty,
FADE_OUT = empty,
SHIFT_CIRCULAR = empty,
SHIFT_LOGICAL = empty,
init = empty,
newBuffer = empty,
write = empty
}
},
pwm = { pwm = {
fields = { fields = {
close = empty, close = empty,
...@@ -607,7 +625,8 @@ stds.nodemcu_libs = { ...@@ -607,7 +625,8 @@ stds.nodemcu_libs = {
PROG = empty, PROG = empty,
STOP = empty, STOP = empty,
UP = empty, UP = empty,
sendcommand = empty sendcommand = empty,
listen = empty
} }
}, },
spi = { spi = {
...@@ -942,10 +961,8 @@ stds.nodemcu_libs = { ...@@ -942,10 +961,8 @@ stds.nodemcu_libs = {
}, },
pack = empty, pack = empty,
unpack = empty, unpack = empty,
size = empty, package = {fields = {seeall = read_write}}
package = {fields = {seeall = read_write}},
_ENV = empty
} }
} }
std = "lua51+nodemcu_libs" std = "lua51+lua53+nodemcu_libs"
\ No newline at end of file
...@@ -68,5 +68,8 @@ fi ...@@ -68,5 +68,8 @@ fi
echo "Static analysys of" echo "Static analysys of"
find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo
(find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 luacheck --config tools/luacheck_config.lua) || exit (find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 luacheck --config tools/luacheck_config.lua) || exit
echo "Static analysys of"
find tests -iname "*.lua" -print0 | xargs -0 echo
(find tests -iname "*.lua" -print0 | xargs -0 luacheck --config tools/luacheck_NTest_config.lua) || exit
...@@ -9,5 +9,8 @@ fi ...@@ -9,5 +9,8 @@ fi
echo "Static analysys of" echo "Static analysys of"
find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 echo
(find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 cache/luacheck.exe --config tools/luacheck_config.lua) || exit (find lua_modules lua_examples -iname "*.lua" -print0 | xargs -0 cache/luacheck.exe --config tools/luacheck_config.lua) || exit
echo "Static analysys of"
find tests -iname "*.lua" -print0 | xargs -0 echo
(find tests -iname "*.lua" -print0 | xargs -0 cache/luacheck.exe --config tools/luacheck_NTest_config.lua) || exit
...@@ -38,8 +38,12 @@ cat > $TEMPFILE << EndOfMessage ...@@ -38,8 +38,12 @@ cat > $TEMPFILE << EndOfMessage
#ifdef LUA_NUMBER_INTEGRAL #ifdef LUA_NUMBER_INTEGRAL
#define BUILDINFO_BUILD_TYPE "integer" #define BUILDINFO_BUILD_TYPE "integer"
#else #else
#ifdef LUA_NUMBER_64BITS
#define BUILDINFO_BUILD_TYPE "double"
#else
#define BUILDINFO_BUILD_TYPE "float" #define BUILDINFO_BUILD_TYPE "float"
#endif #endif
#endif
#define USER_PROLOG "$USER_PROLOG" #define USER_PROLOG "$USER_PROLOG"
#define BUILDINFO_BRANCH "$BRANCH" #define BUILDINFO_BRANCH "$BRANCH"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment