add:继续迁移

bsp/emulator/CMakeLists.txt

@@ -20,7 +20,7 @@ include_directories(${TOPROOT}/lua/include
                     ${TOPROOT}/luat/include
                     )
 
-include_directories(${TOPROOT}/luat/packages/lfs
+include_directories(${TOPROOT}/components/lfs
                     ${TOPROOT}/components/cjson
                     ${TOPROOT}/components/qrcode
 )
@@ -28,7 +28,7 @@ include_directories(${TOPROOT}/luat/packages/lfs
 aux_source_directory(./port PORT_SRCS)
 aux_source_directory(./remotem REMOTEM_SRCS)
 aux_source_directory(${TOPROOT}/lua/src LUA_SRCS)
-aux_source_directory(${TOPROOT}/luat/packages/lua-cjson CJSON_SRCS)
+aux_source_directory(${TOPROOT}/components/lua-cjson CJSON_SRCS)
 aux_source_directory(${TOPROOT}/components/cjson CJSON2_SRCS)
 aux_source_directory(${TOPROOT}/components/qrcode QRCODE_SRCS)
 
@@ -65,23 +65,23 @@ add_library(luat ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/luat/vfs/luat_luadb_inline_sys.c
                  ${TOPROOT}/luat/vfs/luat_inline_libs.c
                  ${TOPROOT}/luat/vfs/luat_inline_sys.c
-                 ${TOPROOT}/luat/packages/lfs/lfs_sfd.c
-                 ${TOPROOT}/luat/packages/lfs/lfs_util.c
-                 ${TOPROOT}/luat/packages/lfs/lfs.c
-                 ${TOPROOT}/luat/packages/lfs/luat_lib_lfs2.c
+                 ${TOPROOT}/components/lfs/lfs_sfd.c
+                 ${TOPROOT}/components/lfs/lfs_util.c
+                 ${TOPROOT}/components/lfs/lfs.c
+                 ${TOPROOT}/components/lfs/luat_lib_lfs2.c
                  ${QRCODE_SRCS}
                #   ${LCD_SRCS}
             )
 
-include_directories(${TOPROOT}/luat/packages/fatfs)
-add_library(fatfs   ${TOPROOT}/luat/packages/fatfs/ff.c
-                    ${TOPROOT}/luat/packages/fatfs/ffsystem.c
-                    ${TOPROOT}/luat/packages/fatfs/ffunicode.c
-                    ${TOPROOT}/luat/packages/fatfs/diskio_impl.c
-                    ${TOPROOT}/luat/packages/fatfs/diskio_ramdisk.c
-                    ${TOPROOT}/luat/packages/fatfs/diskio_spitf.c
+include_directories(${TOPROOT}/components/fatfs)
+add_library(fatfs   ${TOPROOT}/components/fatfs/ff.c
+                    ${TOPROOT}/components/fatfs/ffsystem.c
+                    ${TOPROOT}/components/fatfs/ffunicode.c
+                    ${TOPROOT}/components/fatfs/diskio_impl.c
+                    ${TOPROOT}/components/fatfs/diskio_ramdisk.c
+                    ${TOPROOT}/components/fatfs/diskio_spitf.c
                     ${TOPROOT}/luat/vfs/luat_fs_fatfs.c
-                    ${TOPROOT}/luat/packages/fatfs/luat_lib_fatfs.c)
+                    ${TOPROOT}/components/fatfs/luat_lib_fatfs.c)
 
 #-----------------------
 # mbedtls

bsp/linux/CMakeLists.txt

@@ -52,10 +52,10 @@ include_directories(${TOPROOT}/components/freertos/portable/ThirdParty/GCC/Posix
 aux_source_directory(${TOPROOT}/components/freertos/portable/ThirdParty/GCC/Posix MM_SRCS)
 aux_source_directory(${TOPROOT}/components/freertos/portable/ThirdParty/GCC/Posix/utils MM2_SRCS)
 
-include_directories(${TOPROOT}/luat/packages/lfs)
+include_directories(${TOPROOT}/components/lfs)
 include_directories(${TOPROOT}/components/qrcode)
 include_directories(${TOPROOT}/components/lcd)
-include_directories(${TOPROOT}/luat/packages/u8g2)
+include_directories(${TOPROOT}/components/u8g2)
 include_directories(${TOPROOT}/components/tjpgd)
 
 aux_source_directory(./port PORT_SRCS)
@@ -63,7 +63,7 @@ aux_source_directory(${TOPROOT}/lua/src LUA_SRCS)
 #aux_source_directory(${TOPROOT}/luat/freertos FTOS_T_SRCS)
 aux_source_directory(${TOPROOT}/components/freertos RTOS_SRCS)
 aux_source_directory(${TOPROOT}/components/freertos/port RTOS_PORT_SRCS)
-aux_source_directory(${TOPROOT}/luat/packages/lua-cjson CJSON_SRCS)
+aux_source_directory(${TOPROOT}/components/lua-cjson CJSON_SRCS)
 
 aux_source_directory(${TOPROOT}/components/qrcode QRCODE_SRCS)
 aux_source_directory(${TOPROOT}/components/lcd LCD_SRCS)
@@ -100,10 +100,10 @@ add_library(luat ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/luat/vfs/luat_luadb_inline_sys.c
                  ${TOPROOT}/luat/vfs/luat_inline_sys.c
                  ${TOPROOT}/luat/vfs/luat_inline_libs.c
-                 ${TOPROOT}/luat/packages/lfs/lfs_sfd.c
-                 ${TOPROOT}/luat/packages/lfs/lfs_util.c
-                 ${TOPROOT}/luat/packages/lfs/lfs.c
-                 ${TOPROOT}/luat/packages/lfs/luat_lib_lfs2.c
+                 ${TOPROOT}/components/lfs/lfs_sfd.c
+                 ${TOPROOT}/components/lfs/lfs_util.c
+                 ${TOPROOT}/components/lfs/lfs.c
+                 ${TOPROOT}/components/lfs/luat_lib_lfs2.c
                  ${QRCODE_SRCS}
                  ${LCD_SRCS}
                  ${U8G2_SRCS}

bsp/sysp/CMakeLists.txt

@@ -21,18 +21,18 @@ include_directories(${TOPROOT}/lua/include
                     ${TOPROOT}/components/tjpgd
                     ${TOPROOT}/components/qrcode
                     ${TOPROOT}/components/lcd
-                    ${TOPROOT}/luat/packages/u8g2
+                    ${TOPROOT}/components/u8g2
                     ${TOPROOT}/components/ui/sdl2
                     )
 
 aux_source_directory(./port PORT_SRCS)
 aux_source_directory(${TOPROOT}/lua/src LUA_SRCS)
-aux_source_directory(${TOPROOT}/luat/packages/lua-cjson CJSON_SRCS)
+aux_source_directory(${TOPROOT}/components/lua-cjson CJSON_SRCS)
 
 aux_source_directory(${TOPROOT}/components/tjpgd TJPGD_SRCS)
 aux_source_directory(${TOPROOT}/components/qrcode QRCODE_SRCS)
 aux_source_directory(${TOPROOT}/components/lcd LCD_SRCS)
-aux_source_directory(${TOPROOT}/luat/packages/u8g2 U8G2_SRCS)
+aux_source_directory(${TOPROOT}/components/u8g2 U8G2_SRCS)
 
 aux_source_directory(${TOPROOT}/components/ui/sdl2 UI_SDL2_SRCS)
 

bsp/win32/CMakeLists.txt

@@ -21,13 +21,13 @@ include_directories(${TOPROOT}/lua/include
                     ./lv_drivers
                     )
 
-include_directories(${TOPROOT}/luat/packages/lfs)
+include_directories(${TOPROOT}/components/lfs)
 include_directories(${TOPROOT}/components/qrcode)
 # include_directories(${TOPROOT}/components/lcd)
 
 aux_source_directory(./port PORT_SRCS)
 aux_source_directory(${TOPROOT}/lua/src LUA_SRCS)
-aux_source_directory(${TOPROOT}/luat/packages/lua-cjson CJSON_SRCS)
+aux_source_directory(${TOPROOT}/components/lua-cjson CJSON_SRCS)
 
 aux_source_directory(${TOPROOT}/components/qrcode QRCODE_SRCS)
 # aux_source_directory(${TOPROOT}/components/lcd LCD_SRCS)
@@ -68,25 +68,25 @@ add_library(luat ${TOPROOT}/luat/modules/luat_main.c
                  ${TOPROOT}/luat/vfs/luat_luadb_inline.c
                  ${TOPROOT}/luat/vfs/luat_luadb_inline_sys.c
                  ${TOPROOT}/luat/vfs/luat_inline_sys.c
-                 ${TOPROOT}/luat/packages/lfs/lfs_sfd.c
-                 ${TOPROOT}/luat/packages/lfs/lfs_util.c
-                 ${TOPROOT}/luat/packages/lfs/lfs.c
-                 ${TOPROOT}/luat/packages/lfs/luat_lib_lfs2.c
+                 ${TOPROOT}/components/lfs/lfs_sfd.c
+                 ${TOPROOT}/components/lfs/lfs_util.c
+                 ${TOPROOT}/components/lfs/lfs.c
+                 ${TOPROOT}/components/lfs/luat_lib_lfs2.c
                  ${TOPROOT}/luat/vfs/luat_inline_libs.c
                  ./lv_drivers/win_drv.c
                  ${QRCODE_SRCS}
                #   ${LCD_SRCS}
             )
 
-include_directories(${TOPROOT}/luat/packages/fatfs)
-add_library(fatfs   ${TOPROOT}/luat/packages/fatfs/ff.c
-                    ${TOPROOT}/luat/packages/fatfs/ffsystem.c
-                    ${TOPROOT}/luat/packages/fatfs/ffunicode.c
-                    ${TOPROOT}/luat/packages/fatfs/diskio_impl.c
-                    ${TOPROOT}/luat/packages/fatfs/diskio_ramdisk.c
-                    ${TOPROOT}/luat/packages/fatfs/diskio_spitf.c
+include_directories(${TOPROOT}/components/fatfs)
+add_library(fatfs   ${TOPROOT}/components/fatfs/ff.c
+                    ${TOPROOT}/components/fatfs/ffsystem.c
+                    ${TOPROOT}/components/fatfs/ffunicode.c
+                    ${TOPROOT}/components/fatfs/diskio_impl.c
+                    ${TOPROOT}/components/fatfs/diskio_ramdisk.c
+                    ${TOPROOT}/components/fatfs/diskio_spitf.c
                     ${TOPROOT}/luat/vfs/luat_fs_fatfs.c
-                    ${TOPROOT}/luat/packages/fatfs/luat_lib_fatfs.c)
+                    ${TOPROOT}/components/fatfs/luat_lib_fatfs.c)
 
 #-----------------------
 # mbedtls