all: Update to point to files in new shared/ directory.
Signed-off-by: Damien George <damien@micropython.org>
diff --git a/ports/esp32/fatfs_port.c b/ports/esp32/fatfs_port.c
index 7fce654..b9ad30a 100644
--- a/ports/esp32/fatfs_port.c
+++ b/ports/esp32/fatfs_port.c
@@ -28,7 +28,7 @@
#include <sys/time.h>
#include "lib/oofatfs/ff.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
DWORD get_fattime(void) {
struct timeval tv;
diff --git a/ports/esp32/machine_rtc.c b/ports/esp32/machine_rtc.c
index 1b6a71b..52227c9 100644
--- a/ports/esp32/machine_rtc.c
+++ b/ports/esp32/machine_rtc.c
@@ -36,7 +36,7 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
#include "modmachine.h"
#include "machine_rtc.h"
diff --git a/ports/esp32/main.c b/ports/esp32/main.c
index b04831f..c1b8e8a 100644
--- a/ports/esp32/main.c
+++ b/ports/esp32/main.c
@@ -54,8 +54,8 @@
#include "py/repl.h"
#include "py/gc.h"
#include "py/mphal.h"
-#include "lib/mp-readline/readline.h"
-#include "lib/utils/pyexec.h"
+#include "shared/readline/readline.h"
+#include "shared/runtime/pyexec.h"
#include "uart.h"
#include "usb.h"
#include "modmachine.h"
diff --git a/ports/esp32/main/CMakeLists.txt b/ports/esp32/main/CMakeLists.txt
index ed72a8d..f2b3dd4 100644
--- a/ports/esp32/main/CMakeLists.txt
+++ b/ports/esp32/main/CMakeLists.txt
@@ -15,21 +15,24 @@
${PROJECT_DIR}/qstrdefsport.h
)
+set(MICROPY_SOURCE_SHARED
+ ${MICROPY_DIR}/shared/readline/readline.c
+ ${MICROPY_DIR}/shared/netutils/netutils.c
+ ${MICROPY_DIR}/shared/timeutils/timeutils.c
+ ${MICROPY_DIR}/shared/runtime/interrupt_char.c
+ ${MICROPY_DIR}/shared/runtime/stdout_helpers.c
+ ${MICROPY_DIR}/shared/runtime/sys_stdio_mphal.c
+ ${MICROPY_DIR}/shared/runtime/pyexec.c
+)
+
set(MICROPY_SOURCE_LIB
${MICROPY_DIR}/lib/littlefs/lfs1.c
${MICROPY_DIR}/lib/littlefs/lfs1_util.c
${MICROPY_DIR}/lib/littlefs/lfs2.c
${MICROPY_DIR}/lib/littlefs/lfs2_util.c
${MICROPY_DIR}/lib/mbedtls_errors/mp_mbedtls_errors.c
- ${MICROPY_DIR}/lib/mp-readline/readline.c
- ${MICROPY_DIR}/lib/netutils/netutils.c
${MICROPY_DIR}/lib/oofatfs/ff.c
${MICROPY_DIR}/lib/oofatfs/ffunicode.c
- ${MICROPY_DIR}/lib/timeutils/timeutils.c
- ${MICROPY_DIR}/lib/utils/interrupt_char.c
- ${MICROPY_DIR}/lib/utils/stdout_helpers.c
- ${MICROPY_DIR}/lib/utils/sys_stdio_mphal.c
- ${MICROPY_DIR}/lib/utils/pyexec.c
)
set(MICROPY_SOURCE_DRIVERS
@@ -80,6 +83,7 @@
${MICROPY_SOURCE_PY}
${MICROPY_SOURCE_EXTMOD}
${MICROPY_SOURCE_USERMOD}
+ ${MICROPY_SOURCE_SHARED}
${MICROPY_SOURCE_LIB}
${MICROPY_SOURCE_PORT}
)
@@ -142,6 +146,7 @@
SRCS
${MICROPY_SOURCE_PY}
${MICROPY_SOURCE_EXTMOD}
+ ${MICROPY_SOURCE_SHARED}
${MICROPY_SOURCE_LIB}
${MICROPY_SOURCE_DRIVERS}
${MICROPY_SOURCE_PORT}
diff --git a/ports/esp32/modesp32.c b/ports/esp32/modesp32.c
index 3ed5343..042c8b8 100644
--- a/ports/esp32/modesp32.c
+++ b/ports/esp32/modesp32.c
@@ -40,7 +40,7 @@
#include "py/obj.h"
#include "py/runtime.h"
#include "py/mphal.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
#include "modmachine.h"
#include "machine_rtc.h"
#include "modesp32.h"
diff --git a/ports/esp32/modmachine.c b/ports/esp32/modmachine.c
index c46f8ab..a4e0724 100644
--- a/ports/esp32/modmachine.c
+++ b/ports/esp32/modmachine.c
@@ -49,7 +49,7 @@
#include "py/obj.h"
#include "py/runtime.h"
-#include "lib/utils/pyexec.h"
+#include "shared/runtime/pyexec.h"
#include "extmod/machine_mem.h"
#include "extmod/machine_signal.h"
#include "extmod/machine_pulse.h"
diff --git a/ports/esp32/modnetwork.c b/ports/esp32/modnetwork.c
index e2bd20a..3977256 100644
--- a/ports/esp32/modnetwork.c
+++ b/ports/esp32/modnetwork.c
@@ -40,7 +40,7 @@
#include "py/runtime.h"
#include "py/mphal.h"
#include "py/mperrno.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
#include "esp_eth.h"
#include "esp_wifi.h"
#include "esp_log.h"
diff --git a/ports/esp32/modsocket.c b/ports/esp32/modsocket.c
index 67b1d7d..be950ac 100644
--- a/ports/esp32/modsocket.c
+++ b/ports/esp32/modsocket.c
@@ -45,7 +45,7 @@
#include "py/mphal.h"
#include "py/stream.h"
#include "py/mperrno.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
#include "mdns.h"
#include "modnetwork.h"
diff --git a/ports/esp32/modutime.c b/ports/esp32/modutime.c
index cf7178e..f864df6 100644
--- a/ports/esp32/modutime.c
+++ b/ports/esp32/modutime.c
@@ -31,7 +31,7 @@
#include <sys/time.h>
#include "py/runtime.h"
-#include "lib/timeutils/timeutils.h"
+#include "shared/timeutils/timeutils.h"
#include "extmod/utime_mphal.h"
STATIC mp_obj_t time_localtime(size_t n_args, const mp_obj_t *args) {
diff --git a/ports/esp32/mphalport.c b/ports/esp32/mphalport.c
index db2146d..de7fdfc 100644
--- a/ports/esp32/mphalport.c
+++ b/ports/esp32/mphalport.c
@@ -47,8 +47,8 @@
#include "py/mpstate.h"
#include "py/mphal.h"
#include "extmod/misc.h"
-#include "lib/timeutils/timeutils.h"
-#include "lib/utils/pyexec.h"
+#include "shared/timeutils/timeutils.h"
+#include "shared/runtime/pyexec.h"
#include "mphalport.h"
#include "usb.h"
diff --git a/ports/esp32/mphalport.h b/ports/esp32/mphalport.h
index 60cc308..2ba6f96 100644
--- a/ports/esp32/mphalport.h
+++ b/ports/esp32/mphalport.h
@@ -30,7 +30,7 @@
#define INCLUDED_MPHALPORT_H
#include "py/ringbuf.h"
-#include "lib/utils/interrupt_char.h"
+#include "shared/runtime/interrupt_char.h"
#include "freertos/FreeRTOS.h"
#include "freertos/task.h"
diff --git a/ports/esp32/network_ppp.c b/ports/esp32/network_ppp.c
index db2292c..d74283c 100644
--- a/ports/esp32/network_ppp.c
+++ b/ports/esp32/network_ppp.c
@@ -30,7 +30,7 @@
#include "py/mphal.h"
#include "py/objtype.h"
#include "py/stream.h"
-#include "lib/netutils/netutils.h"
+#include "shared/netutils/netutils.h"
#include "modmachine.h"
#include "netif/ppp/ppp.h"