Feature/bootstrap

CMakeLists.txt

@@ -22,9 +22,10 @@
 cmake_minimum_required(VERSION 3.3)
 
 # include additional cmake
-include(utils/cmake/JSONParser.cmake)
-include(utils/cmake/util.cmake)
-include(utils/cmake/colours.cmake)
+set( CORE_PATH "libraries/codal" )
+include(${CORE_PATH}/utils/cmake/JSONParser.cmake)
+include(${CORE_PATH}/utils/cmake/util.cmake)
+include(${CORE_PATH}/utils/cmake/colours.cmake)
 
 if (NOT "${BUILD_TOOL}" STRGREATER "")
     set(BUILD_TOOL "CODAL")
@@ -95,7 +96,7 @@ endif()
 ####################
 
 SET(TOOLCHAIN ${device.toolchain})
-SET(TOOLCHAIN_FOLDER "./utils/cmake/toolchains/${device.toolchain}")
+SET(TOOLCHAIN_FOLDER "${CMAKE_CURRENT_LIST_DIR}/${CORE_PATH}/utils/cmake/toolchains/${device.toolchain}")
 
 # include toolchain file
 set(CMAKE_TOOLCHAIN_FILE "${TOOLCHAIN_FOLDER}/toolchain.cmake" CACHE PATH "toolchain file")
@@ -106,7 +107,7 @@ enable_language(ASM)
 
 # include compiler flags overrides
 include(${TOOLCHAIN_FOLDER}/compiler-flags.cmake)
-set(PLATFORM_INCLUDES_PATH "${PROJECT_SOURCE_DIR}/utils/cmake/toolchains/${device.toolchain}")
+set(PLATFORM_INCLUDES_PATH "${PROJECT_SOURCE_DIR}/${CORE_PATH}/utils/cmake/toolchains/${device.toolchain}")
 
 file(MAKE_DIRECTORY "${PROJECT_SOURCE_DIR}/build")
 
@@ -132,7 +133,7 @@ foreach(var ${device})
     string(REGEX MATCH "[^device\.cmake_definitions\.]([A-Z,a-z,0-9,_,]+)" CODAL_CMAKE_DEFINITION "${var}")
 
     set(${CODAL_CMAKE_DEFINITION} ${${var}})
-endforeach()
+ endforeach()
 
 #define any additional symbols specified by the target.
 if("${device.definitions}" STRGREATER "")
@@ -182,18 +183,18 @@ if("${CODAL_DEFINITIONS}" STRGREATER "")
     file(WRITE "${EXTRA_INCLUDES_NEW_PATH}" ${CODAL_DEFINITIONS})
     configure_file(${EXTRA_INCLUDES_NEW_PATH} ${EXTRA_INCLUDES_PATH} COPYONLY)
 
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include \"${EXTRA_INCLUDES_PATH}\"")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include \"${EXTRA_INCLUDES_PATH}\"")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -include ${EXTRA_INCLUDES_PATH}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include ${EXTRA_INCLUDES_PATH}")
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I\"${PLATFORM_INCLUDES_PATH}\"")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I\"${PLATFORM_INCLUDES_PATH}\"")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I${PLATFORM_INCLUDES_PATH}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${PLATFORM_INCLUDES_PATH}")
 
 # a define for cmake if statements to detect if within the CODAL build environment
 set(CODAL_BUILD_SYSTEM TRUE)
 
 # a define specificying common utils used in codal
-set(CODAL_UTILS_LOCATION "${PROJECT_SOURCE_DIR}/utils/cmake/util.cmake")
+set(CODAL_UTILS_LOCATION "${PROJECT_SOURCE_DIR}/${CORE_PATH}/utils/cmake/util.cmake")
 
 # this variable is used in the linking step of the final binary.
 set(LIB_FOLDERS "")
@@ -204,7 +205,7 @@ include_directories(${PROJECT_SOURCE_DIR}/${LIB_DEST})
 
 #add_subdirectory("${PROJECT_SOURCE_DIR}/${LIB_DEST}/${dep}")
 
-# "import" and add any specified libraries to the build list
+# "import" and add any libraries from target.json to the build list
 if("${device.libraries}" STRGREATER "")
     message("Installing dependencies...")
     set(DEVICE_LIBS ${device.libraries})
@@ -220,16 +221,41 @@ if("${device.libraries}" STRGREATER "")
             MESSAGE (STATUS "Override branch: ${BRANCH}")
         endif()
 
-        INSTALL_DEPENDENCY(${LIB_DEST} ${device.libraries_${i}.name} ${URL} ${BRANCH} ${device.libraries_${i}.type})
-        list(APPEND CODAL_DEPS "${device.libraries_${i}.name}")
+        if( NOT "${device.libraries_${i}.name}" STREQUAL "codal" )
+            INSTALL_DEPENDENCY(${LIB_DEST} ${device.libraries_${i}.name} ${URL} ${BRANCH} ${device.libraries_${i}.type})
+            list(APPEND CODAL_DEPS "${device.libraries_${i}.name}")
+        endif()
     endforeach()
+endif()
+
+# and also from codal.json
+if("${codal.libraries}" STRGREATER "")
+    message("Installing app dependencies...")
+    set(CODAL_LIBS ${codal.libraries})
+
+    foreach(i ${CODAL_LIBS})
+        SET(BRANCH "NONE")
+        SET(URL "${codal.libraries_${i}.url}")
+        if("${codal.libraries_${i}.branch}" STRGREATER "")
+            SET(BRANCH "${codal.libraries_${i}.branch}")
+        endif()
+        if("${codal.target.branches.${URL}}" STRGREATER "")
+            SET(BRANCH "${codal.target.branches.${URL}}")
+            MESSAGE (STATUS "Override branch: ${BRANCH}")
+        endif()
 
-    foreach(dep ${CODAL_DEPS})
-        message("${BoldGreen}Using library: ${dep}${ColourReset}")
-        add_subdirectory("${PROJECT_SOURCE_DIR}/${LIB_DEST}/${dep}")
+        if( NOT "${codal.libraries_${i}.name}" STREQUAL "codal" )
+            INSTALL_DEPENDENCY(${LIB_DEST} ${codal.libraries_${i}.name} ${URL} ${BRANCH} ${codal.libraries_${i}.type})
+            list(APPEND CODAL_DEPS "${codal.libraries_${i}.name}")
+        endif()
     endforeach()
 endif()
 
+foreach(dep ${CODAL_DEPS})
+    message("${BoldGreen}Using library: ${dep}${ColourReset}")
+    add_subdirectory("${PROJECT_SOURCE_DIR}/${LIB_DEST}/${dep}")
+endforeach()
+
 #finally, find sources and includes of the application, and create a target.
 RECURSIVE_FIND_DIR(INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/${CODAL_APP_SOURCE_DIR}" "*.h")
 # *.c?? only catches .cpp, not .c, so let's be precise
@@ -247,12 +273,12 @@ endif()
 if ("${BUILD_TOOL}" STRGREATER "")
     string(COMPARE EQUAL "${BUILD_TOOL}" "YOTTA" YOTTA_BUILD)
     if (${YOTTA_BUILD})
-        include("${PROJECT_SOURCE_DIR}/utils/cmake/buildtools/yotta.cmake")
+        include("${PROJECT_SOURCE_DIR}/${CORE_PATH}/utils/cmake/buildtools/yotta.cmake")
     endif ()
 
     string(COMPARE EQUAL "${BUILD_TOOL}" "CODAL" CODAL_BUILD)
     if (${CODAL_BUILD})
-        include("${PROJECT_SOURCE_DIR}/utils/cmake/buildtools/codal.cmake")
+        include("${PROJECT_SOURCE_DIR}/${CORE_PATH}/utils/cmake/buildtools/codal.cmake")
     endif()
 endif()
 

codal.json

@@ -7,12 +7,27 @@
         "test_ignore": true,
         "dev": true
     },
-    "config":{
+    "libraries": [
+        {
+            "name": "codal",
+            "url": "https://github.com/lancaster-university/codal",
+            "branch": "feature/bootstrap-refactor",
+            "type": "git"
+        },
+        {
+            "url": "https://github.com/JohnVidler/codal-field-testing.git",
+            "name": "codal-field-testing",
+            "branch": "Master",
+            "type": "git"
+        }
+    ],
+    "config": {
         "DEVICE_DMESG": 1,
         "DMESG_SERIAL_DEBUG": 1,
         "CODAL_DEBUG": 1,
-        "MICROBIT_BLE_ENABLED" : 0,
+        "DEVICE_BLE": 0,
+        "MICROBIT_BLE_ENABLED": 0,
         "MICROBIT_BLE_PAIRING_MODE": 0,
         "CONFIG_MICROBIT_ERASE_USER_DATA_ON_REFLASH": 1
     }
-}
+}

codal.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+# The MIT License (MIT)
+
+# Copyright (c) 2022 Lancaster University.
+
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+import os
+import sys
+
+from importlib import import_module
+from genericpath import exists
+
+BOOTSTRAP_TAG = "feature/bootstrap-refactor"
+TARGET_LIST = [
+    "https://raw.githubusercontent.com/lancaster-university/codal/master/utils/targets.json"
+]
+BASE_ROOT = os.getcwd()
+CODAL_ROOT = os.path.join( BASE_ROOT, 'libraries', 'codal' )
+
+# Minimum folder structure:
+if not exists( os.path.join( BASE_ROOT, 'libraries' ) ):
+  os.mkdir( os.path.join( BASE_ROOT, 'libraries' ) );
+
+# Grab the latest library
+if not exists( os.path.join( BASE_ROOT, 'libraries', 'codal' ) ):
+  print( "Downloading codal-bootstrap..." )
+  if not exists( os.path.join( CODAL_ROOT, '.git' ) ):
+    os.system( f'git clone --recurse-submodules --branch "{BOOTSTRAP_TAG}" "https://github.com/lancaster-university/codal.git" "{CODAL_ROOT}"' )
+
+# Jump into the current upstream code
+sys.path.append( CODAL_ROOT )
+import_module( f'libraries.codal.codal' )