Merge pull request #40 from smartobjectoriented/39-align-micropython-build

39 align micropython build

Author: AnthoJack

so3/usr/CMakeLists.txt

@@ -6,6 +6,9 @@ cmake_minimum_required(VERSION 3.16)
 
 project(so3-usr LANGUAGES C ASM)
 
+option(MICROPYTHON "Support for micro-python apps" OFF)
+
+
 # Detect the correct compiler runtime library and add it
 # to 'LIBCXX_LIBRARIES'. back to gcc_s if available.
 

so3/usr/build.sh

@@ -95,15 +95,6 @@ else
 fi
 cd -
 
-if [ "$PLATFORM" == "virt64" ]; then
-  echo "Compiling microPython"
-  cd src/micropython/ports/soo
-  make
-  cp build/firmware.elf ../../../../build/src/uPython.elf
-  cd -
-fi
-
-
 mkdir -p build/deploy/
 
 # SO3 shell

so3/usr/src/micropython/CMakeLists.txt

@@ -0,0 +1,12 @@
+
+add_custom_command(OUTPUT firmware.elf
+        DEPENDS c
+        WORKING_DIRECTORY  ${PROJECT_SOURCE_DIR}/src/micropython
+        COMMAND /bin/sh ${PROJECT_SOURCE_DIR}/src/micropython/build.sh ${PROJECT_BINARY_DIR}/src/micropython
+)
+
+add_custom_target(uPython.elf ALL
+  DEPENDS firmware.elf
+  COMMAND mv ${PROJECT_BINARY_DIR}/src/micropython/firmware.elf ${PROJECT_BINARY_DIR}/src/micropython/uPython.elf
+)
+

so3/usr/src/micropython/build.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "Compiling microPython"
+
+cd ports/soo
+
+make BUILD=$1
+
+
+