updates handling of original files

Author: kdschlosser

builder/__init__.py

@@ -1,3 +1,4 @@
+import shutil
 import sys
 import os
 import subprocess
@@ -39,50 +40,71 @@ def iter_path(src_p, dst_p):
                 iter_path(src_file, dst_file)
                 os.rmdir(src_file)
             else:
-                read_file(src_file, dst_file)
+                shutil.copyfile(src_file, dst_file)
                 os.remove(src_file)
 
     iter_path(src_path, dst_path)
 
 
-def copy_updated_files(port):
+def copy_micropy_updates(port):
 
     src_path = f'micropy_updates/{port}'
-    originals_path = f'micropy_updates/originals/{port}'
+    org_path = f'micropy_updates/originals/{port}'
 
     if port in ('raspberry_pi', 'macOS'):
         port = 'unix'
 
     dst_path = f'lib/micropython/ports/{port}'
 
-    for file in os.listdir(src_path):
+    def iter_files(s_path, d_path, o_path):
+        for file in os.listdir(s_path):
+            src_file = os.path.join(s_path, file)
+            dst_file = os.path.join(d_path, file)
+            org_file = os.path.join(o_path, file)
 
-        src_file = os.path.join(dst_path, file)
-        dst_file = os.path.join(originals_path, file)
-
-        read_file(src_file, dst_file)
+            if os.path.isdir(src_file):
+                if not os.path.exists(org_file):
+                    os.makedirs(org_file)
 
-        src_file = os.path.join(src_path, file)
-        dst_file = os.path.join(dst_path, file)
+                iter_files(src_file, dst_file, org_file)
+            else:
+                shutil.copyfile(dst_file, org_file)
+                shutil.copyfile(src_file, dst_file)
 
-        read_file(src_file, dst_file)
+    iter_files(src_path, dst_path, org_path)
 
 
 def write_file(file, data):
     with open(file, 'wb') as f:
         f.write(data.encode('utf-8'))
 
 
-def read_file(file, save_file):
-    with open(file, 'rb') as f1:
-        data = f1.read()
+def read_file(port, file):
+    org_path = f'micropy_updates/originals/{port}'
+
+    filepath, filename = os.path.split(file)
+
+    if port in ('raspberry_pi', 'macOS'):
+        port = 'unix'
 
-    save_path = os.path.split(save_file)[0]
-    if not os.path.exists(save_path):
-        os.makedirs(save_path)
+    head, tail = os.path.split(filepath)
+    save_path = []
+    while tail != port:
+        save_path.insert(0, tail)
+        head, tail = os.path.split(head)
 
-    with open(save_file, 'wb') as f2:
-        f2.write(data)
+    if save_path:
+        org_path = os.path.join(org_path, *save_path)
+
+    if not os.path.exists(org_path):
+        os.makedirs(org_path)
+
+    org_file = os.path.join(org_path, filename)
+    if not os.path.exists(org_file):
+        shutil.copyfile(file, org_file)
+
+    with open(file, 'rb') as f:
+        data = f.read()
 
     return data.decode('utf-8')
 
@@ -142,13 +164,7 @@ def set_mp_version(port):
 
 
 def update_mphalport(target):
-    if target == 'esp8266':
-        mphalport_path = f'lib/micropython/ports/{target}/esp_mphal.h'
-    elif target == 'pic16bit':
-        mphalport_path = f'lib/micropython/ports/{target}/pic16bit_mphal.h'
-    elif target == 'teensy':
-        mphalport_path = f'lib/micropython/ports/{target}/teensy_hal.h'
-    elif target == 'macOS':
+    if target in ('macOS', 'raspberry_pi'):
         mphalport_path = f'lib/micropython/ports/unix/mphalport.h'
     elif target == 'windows':
         mphalport_path = f'lib/micropython/ports/{target}/windows_mphal.h'
@@ -158,18 +174,17 @@ def update_mphalport(target):
     if not os.path.exists(mphalport_path):
         raise RuntimeError(mphalport_path)
 
-    with open(mphalport_path, 'rb') as f:
-        data = f.read().decode('utf-8')
+    data = read_file(target, mphalport_path)
 
-    if '#ifndef _MPHALPORT_H_' not in data:
+    if '__MPHALPORT_H__' not in data:
         data = (
-            f'#ifndef _MPHALPORT_H_\n'
-            f'#define _MPHALPORT_H_\n'
+            f'#ifndef __MPHALPORT_H__\n'
+            f'#define __MPHALPORT_H__\n'
             f'{data}\n'
-            f'#endif /* _MPHALPORT_H_ */\n'
+            f'#endif /* __MPHALPORT_H__ */\n'
         )
-        with open(mphalport_path, 'wb') as f:
-            f.write(data.encode('utf-8'))
+
+        write_file(mphalport_path, data)
 
 
 def generate_manifest(
@@ -236,7 +251,7 @@ def generate_manifest(
     for file in indevs:
         if not os.path.exists(file):
             tmp_file = (
-                f'{script_dir}/api_drivers/common_api_drivers/indev/{file}.py'
+                f'{script_dir}/api_drivers/common_api_drivers/indev/{file.lower()}.py'
             )
 
             if not os.path.exists(tmp_file):
@@ -255,11 +270,11 @@ def generate_manifest(
             file = tmp_file
 
         directory, file_name = os.path.split(file)
-        extension_file = file_name.rsplit('.')[0] + '_extension.py'
+        extension_file = file_name.rsplit('.', 1)[0] + '_extension.py'
         extension = os.path.join(directory, extension_file)
 
         if os.path.exists(extension):
-            print(extension_file)
+            print(extension)
             entry = f"freeze('{directory}', '{extension_file}')"
             manifest_files.append(entry)
 
@@ -273,7 +288,7 @@ def generate_manifest(
     for file in displays:
         if not os.path.exists(file):
             tmp_file = (
-                f'{script_dir}/api_drivers/common_api_drivers/display/{file}'
+                f'{script_dir}/api_drivers/common_api_drivers/display/{file.lower()}'
             )
 
             if not os.path.exists(tmp_file):
@@ -284,7 +299,7 @@ def generate_manifest(
                 if not file_name.endswith('.py'):
                     continue
 
-                print(file_name)
+                print(os.path.join(tmp_file, file_name))
 
                 entry = f"freeze('{tmp_file}', '{file_name}')"
                 manifest_files.append(entry)

builder/esp32.py

@@ -843,27 +843,18 @@ def find_esp32_ports(chip):
 SDKCONFIG_PATH = f'build/sdkconfig.board'
 
 MPTHREADPORT_PATH = 'lib/micropython/ports/esp32/mpthreadport.c'
-MPTHREADPORT_SAVE_PATH = 'micropy_updates/originals/esp32/mpthreadport.c'
-
 MPCONFIGPORT_PATH = 'lib/micropython/ports/esp32/mpconfigport.h'
-MPCONFIGPORT_SAVE_PATH = 'micropy_updates/originals/esp32/mpconfigport.h'
-
 PANICHANDLER_PATH = 'lib/micropython/ports/esp32/panichandler.c'
-PANICHANDLER_SAVE_PATH = 'micropy_updates/originals/esp32/panichandler.c'
-
 MPHALPORT_PATH = 'lib/micropython/ports/esp32/mphalport.c'
-MPHALPORT_SAVE_PATH = 'micropy_updates/originals/esp32/mphalport.c'
-
 MAIN_PATH = 'lib/micropython/ports/esp32/main.c'
-MAIN_SAVE_PATH = 'micropy_updates/originals/esp32/main.c'
 
 
 if not os.path.exists('micropy_updates/originals/esp32'):
     os.mkdir('micropy_updates/originals/esp32')
 
 
 def update_mpthreadport():
-    data = read_file(MPTHREADPORT_PATH, MPTHREADPORT_SAVE_PATH)
+    data = read_file('esp32', MPTHREADPORT_PATH)
 
     if '_CORE_ID' not in data:
         data = data.replace('MP_TASK_COREID', '_CORE_ID')
@@ -885,7 +876,7 @@ def update_mpthreadport():
 
 
 def update_panic_handler():
-    data = read_file(PANICHANDLER_PATH, PANICHANDLER_SAVE_PATH)
+    data = read_file('esp32', PANICHANDLER_PATH)
 
     if '"MPY version : "' in data:
         beg, end = data.split('"MPY version : "', 1)
@@ -903,11 +894,8 @@ def update_mpconfigboard():
         'lib/micropython/ports/esp32/boards/'
         f'{board}/mpconfigboard.cmake'
     )
-    mpconfigboard_cmake_save_path = (
-        'micropy_updates/originals/esp32/boards/'
-        f'{board}/mpconfigboard.cmake'
-    )
-    data = read_file(mpconfigboard_cmake_path, mpconfigboard_cmake_save_path)
+
+    data = read_file('esp32', mpconfigboard_cmake_path)
 
     sdkconfig = (
         'set(SDKCONFIG_DEFAULTS ${SDKCONFIG_DEFAULTS} '
@@ -921,7 +909,7 @@ def update_mpconfigboard():
 
 
 def update_mpconfigport():
-    data = read_file(MPCONFIGPORT_PATH, MPCONFIGPORT_SAVE_PATH)
+    data = read_file('esp32', MPCONFIGPORT_PATH)
 
     if 'MP_USB_OTG' in data:
         data = data.rsplit('\n\n#define MP_USB_OTG', 1)[0]
@@ -1003,7 +991,7 @@ def update_mpconfigport():
 
 
 def update_mphalport():
-    data = read_file(MPHALPORT_PATH, MPHALPORT_SAVE_PATH)
+    data = read_file('esp32', MPHALPORT_PATH)
     data = data.replace(
         '#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG',
         '#if MP_USB_SERIAL_JTAG'
@@ -1017,7 +1005,7 @@ def update_mphalport():
 
 
 def update_main():
-    data = read_file(MAIN_PATH, MAIN_SAVE_PATH)
+    data = read_file('esp32', MAIN_PATH)
     data = data.replace(
         '#if CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG',
         '#if MP_USB_SERIAL_JTAG'

builder/macOS.py

@@ -18,26 +18,6 @@
 
 unix.REAL_PORT = 'macOS'
 
-unix.INPUT_SAVE_PATH = (
-    unix.INPUT_SAVE_PATH.replace('/unix/', '/macOS/')
-)
-unix.MAIN_SAVE_PATH = (
-    unix.MAIN_SAVE_PATH.replace('/unix/', '/macOS/')
-)
-unix.UNIX_MPHAL_SAVE_PATH = (
-    unix.UNIX_MPHAL_SAVE_PATH.replace('/unix/', '/macOS/')
-)
-unix.MAKEFILE_SAVE_PATH = (
-    unix.MAKEFILE_SAVE_PATH.replace('/unix/', '/macOS/')
-)
-unix.MODMACHINE_SAVE_PATH = (
-    unix.MODMACHINE_SAVE_PATH.replace('/unix/', '/macOS/')
-)
-unix.MPCONFIGVARIANT_COMMON_SAVE_PATH = (
-    unix.MPCONFIGVARIANT_COMMON_SAVE_PATH.replace('/unix/', '/macOS/')
-)
-
-
 if not os.path.exists('micropy_updates/originals/macOS'):
     os.mkdir('micropy_updates/originals/macOS')
 
@@ -83,7 +63,8 @@ def compile(*args):  # NOQA
 
     src = f'lib/micropython/ports/unix/build-{unix.variant}/SDL/libSDL2-2.0.0.dylib'
     dst = f'build/libSDL2-2.0.0.dylib'
-    shutil.copyfile(src, dst)
+    if os.path.exists(src):
+        shutil.copyfile(src, dst)
 
 
 def mpy_cross():

builder/raspberry_pi.py

@@ -22,25 +22,6 @@
 
 unix.REAL_PORT = 'raspberry_pi'
 
-unix.INPUT_SAVE_PATH = (
-    unix.INPUT_SAVE_PATH.replace('/unix/', '/raspberry_pi/')
-)
-unix.MAIN_SAVE_PATH = (
-    unix.MAIN_SAVE_PATH.replace('/unix/', '/raspberry_pi/')
-)
-unix.UNIX_MPHAL_SAVE_PATH = (
-    unix.UNIX_MPHAL_SAVE_PATH.replace('/unix/', '/raspberry_pi/')
-)
-unix.MAKEFILE_SAVE_PATH = (
-    unix.MAKEFILE_SAVE_PATH.replace('/unix/', '/raspberry_pi/')
-)
-unix.MODMACHINE_SAVE_PATH = (
-    unix.MODMACHINE_SAVE_PATH.replace('/unix/', '/raspberry_pi/')
-)
-unix.MPCONFIGVARIANT_COMMON_SAVE_PATH = (
-    unix.MPCONFIGVARIANT_COMMON_SAVE_PATH.replace('/unix/', '/raspberry_pi/')
-)
-
 
 def parse_args(extra_args, lv_cflags, board):
     return _parse_args(extra_args, lv_cflags, board)
@@ -99,8 +80,7 @@ def has_neon():
             if not line.startswith('Features'):
                 continue
 
-            features = line.split(':')[-1].strip().split(' ')
-            res = 'neon' in features
+            res = ' neon ' in line
 
             if res:
                 break