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

120 lines
2.8 KiB
CMake
Raw Normal View History

Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch. Changes have been kept to a minimum, but a serious chunk of work was needed to move from 8266isms to IDFisms. Some things got refactored into components/lua/common, in particular the LFS location awareness. As part of this work I also evicted our partition table manipulation code, as with the current IDF it kept breaking checksums and rendering things unbootable, which is the opposite of helpful (which was the original intent behind it). The uart module got relocated from base_nodemcu to the modules component properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-21 17:39:54 +02:00
if(CONFIG_LUA_VERSION_51)
set(srcs
"lua-5.1/lapi.c"
"lua-5.1/lauxlib.c"
"lua-5.1/lbaselib.c"
"lua-5.1/lcode.c"
"lua-5.1/ldblib.c"
"lua-5.1/ldebug.c"
"lua-5.1/ldo.c"
"lua-5.1/ldump.c"
"lua-5.1/lflash.c"
"lua-5.1/lfunc.c"
"lua-5.1/lgc.c"
Switch to IDF-provided VFS and standard `io` module. The IDF-provided VFS resolves several issues: - The IDF components having a different view of the (virtual) file system compared to the Lua environment. - RTOS task/thread safety. Our legacy VFS was only ever safe to use from the LVM thread, which limited its usability. Upgrading it would have effectively required a reimplementation of the IDF VFS, which would have been a bigger task with larger on-going maintenance issues. - We're no longer needing to maintain our own SPIFFS component. - We're no longer needing to maintain our own FATFS component. - The legacy of the 8266's lack of standard C interface to the file system is no longer holding us back, meaning that we can use the standard Lua `io` module rather than the cobbled-together swiss army knife also known as the file module. Of course, the downside is that we'll either have to declare a backwards breakage in regard to the file module, or provide a Lua shim for the old functions, where applicable. Also included is some necessary integer type fixups in unrelated code, which apparently had depended on some non-standard types in either the SPIFFS or FATFS headers. A memory leak issue in the sdmmc module was also found and fixed while said module got switched over to the Espressif VFS. Module documentation has been updated to match the new reality (and I discovered in some places it wasn't even matching the old reality).
2021-10-20 12:24:09 +02:00
"lua-5.1/liolib.c"
Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch. Changes have been kept to a minimum, but a serious chunk of work was needed to move from 8266isms to IDFisms. Some things got refactored into components/lua/common, in particular the LFS location awareness. As part of this work I also evicted our partition table manipulation code, as with the current IDF it kept breaking checksums and rendering things unbootable, which is the opposite of helpful (which was the original intent behind it). The uart module got relocated from base_nodemcu to the modules component properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-21 17:39:54 +02:00
"lua-5.1/llex.c"
"lua-5.1/lmathlib.c"
"lua-5.1/lmem.c"
"lua-5.1/lnodemcu.c"
"lua-5.1/loadlib.c"
"lua-5.1/lobject.c"
"lua-5.1/lopcodes.c"
"lua-5.1/lparser.c"
"lua-5.1/lstate.c"
"lua-5.1/lstring.c"
"lua-5.1/lstrlib.c"
"lua-5.1/ltable.c"
"lua-5.1/ltablib.c"
"lua-5.1/ltm.c"
"lua-5.1/lua.c"
"lua-5.1/lundump.c"
"lua-5.1/lvm.c"
"lua-5.1/lzio.c"
)
set(luadir "lua-5.1")
elseif(CONFIG_LUA_VERSION_53)
set(srcs
"lua-5.3/lapi.c"
"lua-5.3/lauxlib.c"
"lua-5.3/lbaselib.c"
"lua-5.3/lbitlib.c"
"lua-5.3/lcode.c"
"lua-5.3/lcorolib.c"
"lua-5.3/lctype.c"
"lua-5.3/ldblib.c"
"lua-5.3/ldebug.c"
"lua-5.3/ldo.c"
"lua-5.3/ldump.c"
"lua-5.3/lfunc.c"
"lua-5.3/lgc.c"
Switch to IDF-provided VFS and standard `io` module. The IDF-provided VFS resolves several issues: - The IDF components having a different view of the (virtual) file system compared to the Lua environment. - RTOS task/thread safety. Our legacy VFS was only ever safe to use from the LVM thread, which limited its usability. Upgrading it would have effectively required a reimplementation of the IDF VFS, which would have been a bigger task with larger on-going maintenance issues. - We're no longer needing to maintain our own SPIFFS component. - We're no longer needing to maintain our own FATFS component. - The legacy of the 8266's lack of standard C interface to the file system is no longer holding us back, meaning that we can use the standard Lua `io` module rather than the cobbled-together swiss army knife also known as the file module. Of course, the downside is that we'll either have to declare a backwards breakage in regard to the file module, or provide a Lua shim for the old functions, where applicable. Also included is some necessary integer type fixups in unrelated code, which apparently had depended on some non-standard types in either the SPIFFS or FATFS headers. A memory leak issue in the sdmmc module was also found and fixed while said module got switched over to the Espressif VFS. Module documentation has been updated to match the new reality (and I discovered in some places it wasn't even matching the old reality).
2021-10-20 12:24:09 +02:00
"lua-5.3/liolib.c"
Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch. Changes have been kept to a minimum, but a serious chunk of work was needed to move from 8266isms to IDFisms. Some things got refactored into components/lua/common, in particular the LFS location awareness. As part of this work I also evicted our partition table manipulation code, as with the current IDF it kept breaking checksums and rendering things unbootable, which is the opposite of helpful (which was the original intent behind it). The uart module got relocated from base_nodemcu to the modules component properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-21 17:39:54 +02:00
"lua-5.3/llex.c"
"lua-5.3/lmathlib.c"
"lua-5.3/lmem.c"
"lua-5.3/lnodemcu.c"
"lua-5.3/loadlib.c"
"lua-5.3/lobject.c"
"lua-5.3/lopcodes.c"
"lua-5.3/lparser.c"
"lua-5.3/lstate.c"
"lua-5.3/lstring.c"
"lua-5.3/lstrlib.c"
"lua-5.3/ltable.c"
"lua-5.3/ltablib.c"
"lua-5.3/ltm.c"
"lua-5.3/lua.c"
"lua-5.3/lundump.c"
"lua-5.3/lutf8lib.c"
"lua-5.3/lvm.c"
"lua-5.3/lzio.c"
)
set(luadir "lua-5.3")
endif()
set(common_srcs
"common/lextra.c"
"common/lfs.c"
"common/linput.c"
"common/linit.c"
"common/lnodeaux.c"
"common/lpanic.c"
)
idf4: overhaul to new build system, part 1 of 3 Yet to come: - part 2: dealing with deprecated and removed APIs - part 3: making it actually work again
2021-07-15 08:25:25 +02:00
idf_component_register(
Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch. Changes have been kept to a minimum, but a serious chunk of work was needed to move from 8266isms to IDFisms. Some things got refactored into components/lua/common, in particular the LFS location awareness. As part of this work I also evicted our partition table manipulation code, as with the current IDF it kept breaking checksums and rendering things unbootable, which is the opposite of helpful (which was the original intent behind it). The uart module got relocated from base_nodemcu to the modules component properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-21 17:39:54 +02:00
SRCS ${srcs} ${common_srcs}
INCLUDE_DIRS ${luadir} "common"
Discard old console driver. The IDF provides all we need these days, and the old driver was just needlessly conflicting with the IDF settings and setup. This also simplifies our uart input path as we no longer need to duplicate the raw byte handling for when "run_input" is false.
2021-08-23 15:00:54 +02:00
REQUIRES "platform" "nvs_flash" "uzlib"
idf4: overhaul to new build system, part 1 of 3 Yet to come: - part 2: dealing with deprecated and removed APIs - part 3: making it actually work again
2021-07-15 08:25:25 +02:00
PRIV_REQUIRES "base_nodemcu" "embedded_lfs"
Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch. Changes have been kept to a minimum, but a serious chunk of work was needed to move from 8266isms to IDFisms. Some things got refactored into components/lua/common, in particular the LFS location awareness. As part of this work I also evicted our partition table manipulation code, as with the current IDF it kept breaking checksums and rendering things unbootable, which is the opposite of helpful (which was the original intent behind it). The uart module got relocated from base_nodemcu to the modules component properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-21 17:39:54 +02:00
LDFRAGMENTS "link_lua.lf"
)
#
# Cross compiler targets
#
# Not sure why we can't directly depend on ${SDKCONFIG_HEADER} in our
# externalproject_add(), but them's the brakes...
set(luac_build_dir "${BUILD_DIR}/luac_cross")
add_custom_command(
OUTPUT sdkconfig.h
COMMAND mkdir -p "${luac_build_dir}" && cp ${SDKCONFIG_HEADER} ${luac_build_dir}/sdkconfig.h
DEPENDS ${SDKCONFIG_HEADER}
VERBATIM
)
add_custom_target(sdkconfig_h DEPENDS sdkconfig.h)
externalproject_add(luac_cross_build
PREFIX ${luac_build_dir}
SOURCE_DIR ${COMPONENT_DIR}/${luadir}/host
CONFIGURE_COMMAND ""
BUILD_COMMAND make -f ${COMPONENT_DIR}/${luadir}/host/idf.mk LUAC_BUILD_DIR=${luac_build_dir} LUA_PATH=${COMPONENT_DIR}/${luadir} PYTHON=${PYTHON}
INSTALL_COMMAND ""
BUILD_ALWAYS 1
DEPENDS sdkconfig_h
idf4: overhaul to new build system, part 1 of 3 Yet to come: - part 2: dealing with deprecated and removed APIs - part 3: making it actually work again
2021-07-15 08:25:25 +02:00
)
Port Terry's Lua 5.1 + 5.3 work from the esp8266 branch. Changes have been kept to a minimum, but a serious chunk of work was needed to move from 8266isms to IDFisms. Some things got refactored into components/lua/common, in particular the LFS location awareness. As part of this work I also evicted our partition table manipulation code, as with the current IDF it kept breaking checksums and rendering things unbootable, which is the opposite of helpful (which was the original intent behind it). The uart module got relocated from base_nodemcu to the modules component properly, after I worked out how to force its inclusion using Kconfig alone.
2021-08-21 17:39:54 +02:00
set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
"${BUILD_DIR}/luac_cross/luac.cross;${BUILD_DIR}/luac_cross/${luadir}" )