src: Rework build to use cmake directly and pull in libraries.

The codal libraries are now automatically fetched via git, and the codal
version is fixed to production mode as per the version specified in
src/codal_app/codal.json.

Signed-off-by: Damien George <damien@micropython.org>

Author: dpgeorge

.gitignore

@@ -1,4 +1,4 @@
-lib/codal
+src/build
 src/MICROBIT.hex
 src/codal_port/build
 src/codal_port/libmicropython.a

README.md

@@ -11,14 +11,9 @@ After cloning this repository update the submodules:
 
     $ git submodule update --init
 
-Currently lib/micropython is the only submodule registered with git.  The codal
-sub-repository and its dependencies must be explicitly cloned using:
+Then build the MicroPython cross-compiler:
 
-    $ git clone https://github.com/lancaster-university/codal.git lib/codal
-    $ git clone --recurse-submodules https://github.com/lancaster-university/codal-core.git lib/codal/libraries/codal-core
-    $ git clone --recurse-submodules https://github.com/lancaster-university/codal-nrf52.git lib/codal/libraries/codal-nrf52
-    $ git clone --recurse-submodules https://github.com/microbit-foundation/codal-microbit-nrf5sdk.git lib/codal/libraries/codal-microbit-nrf5sdk
-    $ git clone --recurse-submodules https://github.com/lancaster-university/codal-microbit-v2.git lib/codal/libraries/codal-microbit-v2
+    $ make -C lib/micropython/mpy-cross
 
 Building and running
 --------------------
@@ -36,3 +31,4 @@ Once the firmware is on the device there will appear a REPL prompt on the serial
 port.  To test it you can run:
 
     >>> display.show(Image.HAPPY)
+    >>> audio.play(Sound.HAPPY)

src/Makefile

@@ -1,22 +1,36 @@
 CODAL_DIR = ../lib/codal
 RM = /bin/rm
+MKDIR = /bin/mkdir
 PYTHON3 ?= python3
 
-SRC_HEX = $(CODAL_DIR)/MICROBIT.hex
-SRC_MAP = $(CODAL_DIR)/build/MICROBIT.map
+BUILD = ./build
+CODAL_BUILD = $(CODAL_DIR)/build
+CODAL_LIBRARIES = $(CODAL_DIR)/libraries
+SRC_HEX = $(BUILD)/MICROBIT.hex
+SRC_MAP = $(CODAL_BUILD)/MICROBIT.map
 DEST_HEX = ./MICROBIT.hex
 
-.PHONY: all clean
+.PHONY: all codal_build libmicropython clean
 
-all:
+all: codal_build
+
+codal_build: libmicropython
+	make -C $(BUILD)
+	arm-none-eabi-size $(CODAL_BUILD)/MICROBIT
+	$(PYTHON3) addlayouttable.py $(SRC_HEX) $(SRC_MAP) -o $(DEST_HEX)
+
+libmicropython: $(CODAL_DIR)/libraries
 	$(MAKE) -C codal_port
-	git -C $(CODAL_DIR) checkout CMakeLists.txt build.py
+
+$(CODAL_LIBRARIES):
+	$(MKDIR) -p $(BUILD)
+	git -C $(CODAL_DIR) checkout CMakeLists.txt
 	cat codal.patch | git -C $(CODAL_DIR) apply -
-	(cd $(CODAL_DIR) && ./build.py)
-	arm-none-eabi-size $(CODAL_DIR)/build/MICROBIT
-	$(PYTHON3) addlayouttable.py $(SRC_HEX) $(SRC_MAP) -o $(DEST_HEX)
+	(cd $(BUILD) && cmake ../$(CODAL_DIR) -DCMAKE_BUILD_TYPE=RelWithDebInfo)
 
 clean:
 	$(MAKE) -C codal_port clean
-	$(RM) -r $(CODAL_DIR)/build/
+	$(RM) -rf $(BUILD)
+	$(RM) -rf $(CODAL_BUILD)
+	$(RM) -rf $(CODAL_LIBRARIES)
 	$(RM) MICROBIT.hex

src/codal.patch

@@ -23,20 +23,3 @@ index b89e1d0..b53224b 100644
 +    IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../../src/codal_port/libmicropython.a"
 +)
 +target_link_libraries("MICROBIT" micropython)
-diff --git a/build.py b/build.py
-index f21ee38..3b676ef 100755
---- a/build.py
-+++ b/build.py
-@@ -125,9 +125,9 @@ elif len(args) > 1:
- 
- if not options.test_platform:
- 
--    if not os.path.exists("../codal.json"):
--        print("No target specified in codal.json, does codal.json exist?")
--        exit(1)
-+    #if not os.path.exists("../codal.json"):
-+    #    print("No target specified in codal.json, does codal.json exist?")
-+    #    exit(1)
- 
-     if options.generate_docs:
-         generate_docs()

src/codal_app/codal.json

@@ -2,16 +2,16 @@
     "target": {
         "name": "codal-microbit-v2",
         "url": "https://github.com/lancaster-university/codal-microbit-v2",
-        "branch": "master",
+        "branch": "v0.2.21",
         "type": "git",
-        "test_ignore": true,
-        "dev": true
+        "test_ignore": true
     } ,
     "config":{
         "DEVICE_STACK_SIZE": 8192,
         "MICROBIT_BLE_ENABLED" : 0,
         "MICROBIT_BLE_PAIRING_MODE": 1,
         "MICROBIT_BLE_SECURITY_MODE": 2
     },
-    "application": "../../src/codal_app"
+    "application": "../../src/codal_app",
+    "output_folder": "../../src/build"
 }