Merge e959756f5aba689d7246a5ad306b4692f3aa394b into d51e7bcc1e63181cb00c547f303cf7015ee01b8d

.github/workflows/build.yml

@@ -24,7 +24,7 @@ jobs:
       run:
         shell: cmd
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: lukka/get-cmake@latest
@@ -35,7 +35,7 @@ jobs:
           cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build . --config Release
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: blips-windows-x86_64.zip
           path: |
@@ -45,7 +45,7 @@ jobs:
   build-macos:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: lukka/get-cmake@latest
@@ -56,7 +56,7 @@ jobs:
           cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build .
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: blips-apple-universal.zip
           path: |
@@ -66,7 +66,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: lukka/get-cmake@latest
@@ -77,12 +77,12 @@ jobs:
           cmake .. -DBLISP_BUILD_CLI=ON -DCMAKE_BUILD_TYPE=Release
           cmake --build .
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: blips-linux-x86_64.zip
           path: |
             build/tools/blisp/blisp
-          if-no-files-found: error
+          if-no-files-found: error 
 
   build-linux-alternative-arch:
     runs-on: ubuntu-latest
@@ -99,7 +99,7 @@ jobs:
           - arch: riscv64
             distro: ubuntu_latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
         with:
           submodules: 'recursive'
       - uses: uraimo/run-on-arch-action@v2
@@ -149,9 +149,9 @@ jobs:
             echo "Produced artifact at /artifacts/${artifact_name}"
 
       - name: Upload results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v3
         with:
           name: blisp-linux-${{ matrix.arch }}.zip
           path: |
             artifacts/blisp-*
-          if-no-files-found: error
+          if-no-files-found: error 

CMakeLists.txt

@@ -1,6 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
-# set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64" CACHE STRING "" FORCE)
 project(blisp C)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_C_STANDARD 11)
@@ -46,10 +45,11 @@ set_target_properties(libblisp_static PROPERTIES
         OUTPUT_NAME "blisp")
 
 if(BLISP_USE_SYSTEM_LIBRARIES)
-    find_package(Libserialport REQUIRED)
+    find_package(PkgConfig)
-    target_link_libraries(libblisp PUBLIC Libserialport::Libserialport)
+    pkg_search_module(LIBSERIALPORT REQUIRED libserialport)
-    target_link_libraries(libblisp_static PUBLIC Libserialport::Libserialport)
+    target_link_libraries(libblisp PUBLIC ${LIBSERIALPORT_LIBRARIES})
-    target_include_directories(libblisp_obj PUBLIC ${Libserialport_INCLUDE_DIRS})
+    target_link_libraries(libblisp_static PUBLIC ${LIBSERIALPORT_LIBRARIES})
+    target_include_directories(libblisp_obj PUBLIC ${LIBSERIALPORT_INCLUDE_DIRS})
 else()
 	if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
 	target_sources(libblisp_obj PRIVATE

cmake/FindLibserialport.cmake

@@ -1,79 +0,0 @@
-# SPDX-License-Identifier: MIT
-
-#[=======================================================================[.rst:
-FindLibserialport
--------
-
-Finds the sigrok serial port library (``libserialport``)
-
-Imported Targets
-^^^^^^^^^^^^^^^^
-
-This module defines the following imported targets, if found:
-
-``Libserialport::Libserialport``
-  The serialport library
-
-Result Variables
-^^^^^^^^^^^^^^^^
-
-This module will define the following variables:
-
-``Libserialport_FOUND``
-  True if the system has the serialport library.
-``Libserialport_VERSION``
-  The version of the serialport library which was found.
-``Libserialport_INCLUDE_DIRS``
-  Include directories needed to use ``libserialport``.
-``Libserialport_LIBRARIES``
-  Libraries needed to link to ``libserialport``.
-
-Cache Variables
-^^^^^^^^^^^^^^^
-
-The following cache variables may also be set:
-
-``Libserialport_INCLUDE_DIR``
-  The directory containing ``libserialport.h``.
-``Libserialport_LIBRARY``
-  The path to the ``libserialport`` library.
-
-#]=======================================================================]
-
-find_package(PkgConfig)
-pkg_check_modules(PC_Libserialport QUIET libserialport)
-
-find_path(Libserialport_INCLUDE_DIR
-    NAMES libserialport.h
-    PATHS "${PC_Libserialport_INCLUDE_DIRS}"
-)
-find_library(Libserialport_LIBRARY
-    NAMES serialport
-    HINTS "${PC_Libserialport_LIBRARY_DIRS}"
-)
-
-set(Foo_VERSION ${PC_Foo_VERSION})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Libserialport
-    FOUND_VAR Libserialport_FOUND
-    REQUIRED_VARS
-        Libserialport_LIBRARY
-        Libserialport_INCLUDE_DIR
-    VERSION_VAR Libserialport_VERSION
-)
-
-if(Libserialport_FOUND)
-    set(Libserialport_LIBRARIES ${Libserialport_LIBRARY})
-    set(Libserialport_INCLUDE_DIRS ${Libserialport_INCLUDE_DIR})
-    set(Libserialport_DEFINITIONS ${PC_Liberialport_CFLAGS_OTHER})
-endif()
-
-if(Libserialport_FOUND AND NOT TARGET Libserialport::Libserialport)
-    add_library(Libserialport::Libserialport UNKNOWN IMPORTED)
-    set_target_properties(Libserialport::Libserialport PROPERTIES
-        IMPORTED_LOCATION "${Libserialport_LIBRARY}"
-        INTERFACE_COMPILE_OPTIONS "${PC_Libserialport_CFLAGS_OTHER}"
-        INTERFACE_INCLUDE_DIRECTORIES "${Libserialport_INCLUDE_DIR}"
-    )
-endif()

include/blisp_struct.h

@@ -9,12 +9,6 @@
 #include <assert.h>
 #include <stdint.h>
 
-#if !defined(static_assert) && (defined(__GNUC__) || defined(__clang__)) \
-    && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \
-    && __STDC_VERSION__ <= 201710L
-#define static_assert _Static_assert
-#endif
-
 #pragma pack(push, 1)
 
 typedef struct {

tools/blisp/CMakeLists.txt

@@ -20,7 +20,7 @@ target_include_directories(blisp PRIVATE
         "${CMAKE_SOURCE_DIR}/include")
 
 target_link_libraries(blisp PRIVATE
-        argtable3::argtable3
+        argtable3
         libblisp_static file_parsers)
 
 target_compile_options(blisp PRIVATE -Wall -Wextra -Wpedantic)

tools/blisp/src/file_parsers/parse_file.h

@@ -2,7 +2,6 @@
 #define PARSE_FILE_H_
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h> /* ssize_t */
 #if defined(_MSC_VER)
 #include <BaseTsd.h>
 typedef SSIZE_T ssize_t;