diff --git a/.github/scripts/install_deps.sh b/.github/scripts/install_deps.sh index 43d36407..92ebfa58 100755 --- a/.github/scripts/install_deps.sh +++ b/.github/scripts/install_deps.sh @@ -1,6 +1,6 @@ #!/bin/sh -e -LIBIIO_VERSION=libiio-v0 +LIBIIO_VERSION=main PACKAGE_DIR=${1-build} echo $PACKAGE_DIR @@ -9,7 +9,7 @@ echo "## Installing dependencies" yum install -y bzip2 gzip rpm rpm-build git wget tar \ libxml2-devel libusbx-devel libusb-devel doxygen libaio-devel avahi-devel avahi-tools graphviz swig flex bison \ - python3 python3-devel python3-setuptools python3-pip + python3 python3-devel python3-setuptools python3-pip libzstd-devel python3 -m pip install cmake cmake --version @@ -27,9 +27,9 @@ cd ../.. #Install glog echo "## Building glog" -git clone --branch v0.4.0 --depth 1 https://github.com/google/glog -mkdir -p glog/build_0_4_0 -cd glog/build_0_4_0 +git clone --branch v0.7.1 --depth 1 https://github.com/google/glog +mkdir -p glog/build_0_7_1 +cd glog/build_0_7_1 cmake -DCMAKE_PREFIX_PATH=/usr .. make make install diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml index cf9a53e2..153ca428 100644 --- a/.github/workflows/build_wheels.yml +++ b/.github/workflows/build_wheels.yml @@ -2,6 +2,9 @@ name: Build on: [push, pull_request] +env: + FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true" + # TODO: add a simple test that tries to import the libm2k package after creating wheel; # NOTE: do i have a acces to a pip install during the cybuildwheel process? jobs: @@ -15,8 +18,8 @@ jobs: python_version: ['3.11'] steps: - - uses: actions/checkout@v4 - - uses: actions/setup-python@v4 + - uses: actions/checkout@v7 + - uses: actions/setup-python@v6 name: Install Python ${{ matrix.python_version }} with: python-version: ${{ matrix.python_version }} @@ -31,7 +34,7 @@ jobs: python -m pip install cibuildwheel twine cibuildwheel --output-dir ${{ github.workspace }}/wheelhouse ${{ github.workspace }}/build env: - CIBW_DEBUG_KEEP_CONTAINER=: TRUE + CIBW_DEBUG_KEEP_CONTAINER: "TRUE" CIBW_MANYLINUX_X86_64_IMAGE: manylinux_2_28 CIBW_MANYLINUX_AARCH64_IMAGE: manylinux_2_28 # Skip building PyPy wheels on all platforms @@ -41,9 +44,9 @@ jobs: CIBW_BUILD_VERBOSITY: 3 CIBW_BEFORE_ALL: > cd {project} && ./.github/scripts/install_deps.sh {package} - CIBW_BUILD: "cp37-* cp38-* cp39-* cp310-* cp311-* cp312-*" + CIBW_BUILD: "cp39-* cp310-* cp311-* cp312-* cp313-*" CIBW_ENVIRONMENT: COMPILE_BINDINGS="True" - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v7 with: name: manylinux_wheels path: ${{ github.workspace }}/wheelhouse @@ -54,12 +57,12 @@ jobs: needs: [build_wheels] if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags') steps: - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v7 + - uses: actions/setup-python@v6 name: Install Python 3.11 with: python-version: '3.11' - - uses: actions/download-artifact@v2 + - uses: actions/download-artifact@v7 with: name: manylinux_wheels - name: Upload to PyPI diff --git a/CMakeLists.txt b/CMakeLists.txt index 00f21859..7b7a1b74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,7 +18,7 @@ # along with this program. If not, see . # -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) if(NOT ${CMAKE_VERSION} VERSION_LESS "3.18.0") # https://cmake.org/cmake/help/v3.18/policy/CMP0068.html diff --git a/bindings/csharp/CMakeLists.txt b/bindings/csharp/CMakeLists.txt index 34dbec11..b8eef6d8 100644 --- a/bindings/csharp/CMakeLists.txt +++ b/bindings/csharp/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required(VERSION 3.10) set(CSHARP_WRAPPER_DLL ${PROJECT_NAME}-sharp-cxx-wrap) diff --git a/bindings/labview/CMakeLists.txt b/bindings/labview/CMakeLists.txt index a3bb57c2..dcc43c2a 100644 --- a/bindings/labview/CMakeLists.txt +++ b/bindings/labview/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set (CMAKE_CXX_STANDARD 11) #Find libiio and link it to the targets generated by this project diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 076ae039..b4e4c671 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required(VERSION 3.10) set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "") set(CMAKE_VERBOSE_MAKEFILE ON) diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein index 51eea687..3a34f996 100644 --- a/bindings/python/setup.py.cmakein +++ b/bindings/python/setup.py.cmakein @@ -43,7 +43,8 @@ if compile_bindings: '${IIO_INCLUDE_DIRS}'], define_macros=[('HAS_CONSTEXPR', '1'), ('_EXCEPTIONS', '1'), - ('_libm2k_EXPORTS', None)], + ('_libm2k_EXPORTS', None), + ('LIBIIO_V1', None)], extra_compile_args=[${EXTRA_COMPILE_FLAGS}], extra_link_args=[${EXTRA_LINK_FLAGS}], library_dirs=['${CMAKE_BINARY_DIR}', '${IIO_LIBRARY_DIR}'], diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index f84e6069..c870e026 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) project(doc) find_program(DOXYGEN_PATH doxygen) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e2ee8838..bfa2fd0d 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) add_subdirectory(analog) add_subdirectory(digital) diff --git a/examples/analog/CMakeLists.txt b/examples/analog/CMakeLists.txt index 26f31e4b..b803b072 100644 --- a/examples/analog/CMakeLists.txt +++ b/examples/analog/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set (CMAKE_CXX_STANDARD 11) project(analog LANGUAGES CXX) diff --git a/examples/digital/CMakeLists.txt b/examples/digital/CMakeLists.txt index 11ca4a21..f3282ccc 100644 --- a/examples/digital/CMakeLists.txt +++ b/examples/digital/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set (CMAKE_CXX_STANDARD 11) project(digital LANGUAGES CXX) diff --git a/examples/powersupply/CMakeLists.txt b/examples/powersupply/CMakeLists.txt index aa8fc8e6..d65abc07 100644 --- a/examples/powersupply/CMakeLists.txt +++ b/examples/powersupply/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set (CMAKE_CXX_STANDARD 11) project(powersupply LANGUAGES CXX) diff --git a/examples/voltmeter/CMakeLists.txt b/examples/voltmeter/CMakeLists.txt index bb422df3..cf7eb72d 100644 --- a/examples/voltmeter/CMakeLists.txt +++ b/examples/voltmeter/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set (CMAKE_CXX_STANDARD 11) project(voltmeter LANGUAGES CXX) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1064e4cb..46477894 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) option(OSX_PACKAGE "Create OSX package" OFF) set(BUILD_SHARED_LIBS ON CACHE BOOL "Build shared libraries") diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index eb8b551e..b9892dde 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) add_subdirectory(m2kcli) add_subdirectory(communication/examples) diff --git a/tools/communication/examples/CMakeLists.txt b/tools/communication/examples/CMakeLists.txt index a30df493..32fd4447 100644 --- a/tools/communication/examples/CMakeLists.txt +++ b/tools/communication/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) add_subdirectory(spi) add_subdirectory(i2c) diff --git a/tools/communication/examples/i2c/CMakeLists.txt b/tools/communication/examples/i2c/CMakeLists.txt index e7ae833a..6838dd1e 100644 --- a/tools/communication/examples/i2c/CMakeLists.txt +++ b/tools/communication/examples/i2c/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD 11) diff --git a/tools/communication/examples/spi/CMakeLists.txt b/tools/communication/examples/spi/CMakeLists.txt index c7cf05d3..f5da2c82 100644 --- a/tools/communication/examples/spi/CMakeLists.txt +++ b/tools/communication/examples/spi/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD 11) diff --git a/tools/communication/examples/uart/CMakeLists.txt b/tools/communication/examples/uart/CMakeLists.txt index 424fdc30..174e5124 100644 --- a/tools/communication/examples/uart/CMakeLists.txt +++ b/tools/communication/examples/uart/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD 11) diff --git a/tools/m2kcli/CMakeLists.txt b/tools/m2kcli/CMakeLists.txt index 32a5be21..cacca5e1 100644 --- a/tools/m2kcli/CMakeLists.txt +++ b/tools/m2kcli/CMakeLists.txt @@ -19,7 +19,7 @@ # * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # * */ -cmake_minimum_required(VERSION 3.1.3) +cmake_minimum_required(VERSION 3.10) set(CMAKE_CXX_STANDARD 11)