Moved to a codal.py based build, merging bootstrap directly into codal

CMakeLists.txt

@@ -133,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 "")
@@ -183,12 +183,12 @@ 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)
@@ -221,8 +221,10 @@ 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()
 
@@ -242,8 +244,10 @@ if("${codal.libraries}" STRGREATER "")
             MESSAGE (STATUS "Override branch: ${BRANCH}")
         endif()
 
-        INSTALL_DEPENDENCY(${LIB_DEST} ${codal.libraries_${i}.name} ${URL} ${BRANCH} ${codal.libraries_${i}.type})
-        list(APPEND CODAL_DEPS "${codal.libraries_${i}.name}")
+        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()
 

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
     }
-}
+}

build.py → codal.py

@@ -28,24 +28,23 @@
 from importlib import import_module
 from genericpath import exists
 
-BOOTSTRAP_TAG = "main"
+BOOTSTRAP_TAG = "feature/bootstrap-refactor"
 TARGET_LIST = [
     "https://raw.githubusercontent.com/lancaster-university/codal/master/utils/targets.json"
 ]
 BASE_ROOT = os.getcwd()
-BOOTSTRAP_ROOT = os.path.join( BASE_ROOT, 'libraries', 'codal-bootstrap' )
+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-bootstrap' ) ):
+if not exists( os.path.join( BASE_ROOT, 'libraries', 'codal' ) ):
   print( "Downloading codal-bootstrap..." )
-  if not exists( os.path.join( BOOTSTRAP_ROOT, '.git' ) ):
-    os.system( f'git clone --recurse-submodules --branch "{BOOTSTRAP_TAG}" "https://github.com/lancaster-university/codal-bootstrap.git" "{BOOTSTRAP_ROOT}"' )
+  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( BOOTSTRAP_ROOT )
-bootstrap = import_module( f'libraries.codal-bootstrap.bootstrap' )
-bootstrap.go_bootstrap( TARGET_LIST )
+sys.path.append( CODAL_ROOT )
+import_module( f'libraries.codal.codal' )