esp32: Convert to use FROZEN_MANIFEST to specify frozen code.

All symlinks are removed. boards/manifest.py is used as a default, and can optionally use boards/manifest_release.py for more scripts.
micropython · Oct 15, 2019 · ce1de1f · ce1de1f
1 parent 2e90ff7
commit ce1de1f
Show file tree

Hide file tree

Showing 16 changed files with 15 additions and 15 deletions.
diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
@@ -32,8 +32,7 @@ MICROPY_SSL_AXTLS = 0
 MICROPY_FATFS = 1
 MICROPY_PY_BTREE = 1
 
-#FROZEN_DIR = scripts
-FROZEN_MPY_DIR = modules
+FROZEN_MANIFEST ?= boards/manifest.py
 
 # include py core make definitions
 include $(TOP)/py/py.mk

diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
@@ -0,0 +1,6 @@
+freeze('modules')
+freeze('$(MPY)/tools', ('upip.py', 'upip_utarfile.py'))
+freeze('$(MPY)/ports/esp8266/modules', 'ntptime.py')
+freeze('$(MPY)/ports/esp8266/modules', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',))
+freeze('$(MPY)/drivers/dht', 'dht.py')
+freeze('$(MPY)/drivers/onewire')
diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py
@@ -0,0 +1,8 @@
+include('boards/manifest.py')
+
+LIB = '../../../micropython-lib'
+
+freeze(LIB + '/upysh', 'upysh.py')
+freeze(LIB + '/urequests', 'urequests.py')
+freeze(LIB + '/umqtt.simple', 'umqtt/simple.py')
+freeze(LIB + '/umqtt.robust', 'umqtt/robust.py')
diff --git a/ports/esp32/modules/dht.py b/ports/esp32/modules/dht.py
diff --git a/ports/esp32/modules/ds18x20.py b/ports/esp32/modules/ds18x20.py
diff --git a/ports/esp32/modules/ntptime.py b/ports/esp32/modules/ntptime.py
diff --git a/ports/esp32/modules/onewire.py b/ports/esp32/modules/onewire.py
diff --git a/ports/esp32/modules/umqtt/robust.py b/ports/esp32/modules/umqtt/robust.py
diff --git a/ports/esp32/modules/umqtt/simple.py b/ports/esp32/modules/umqtt/simple.py
diff --git a/ports/esp32/modules/upip.py b/ports/esp32/modules/upip.py
diff --git a/ports/esp32/modules/upip_utarfile.py b/ports/esp32/modules/upip_utarfile.py
diff --git a/ports/esp32/modules/upysh.py b/ports/esp32/modules/upysh.py
diff --git a/ports/esp32/modules/urequests.py b/ports/esp32/modules/urequests.py
diff --git a/ports/esp32/modules/webrepl.py b/ports/esp32/modules/webrepl.py
diff --git a/ports/esp32/modules/webrepl_setup.py b/ports/esp32/modules/webrepl_setup.py
diff --git a/ports/esp32/modules/websocket_helper.py b/ports/esp32/modules/websocket_helper.py