From 76456c224b0c198e22426e45044ecf4239246b80 Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 27 Feb 2020 14:12:30 +0100 Subject: [PATCH] Appveyor CI: updates of libraries build and main yaml file --- .appveyor.yml | 23 +++++++++++++---------- cmake/ci/build_airspyhf.sh | 3 ++- cmake/ci/build_cm256cc.sh | 1 + cmake/ci/build_codec2.sh | 1 + cmake/ci/build_dsdcc.sh | 1 + cmake/ci/build_limesuite.sh | 11 +++++++++++ cmake/ci/build_mbelib.sh | 1 + cmake/ci/build_perseus-sdr.sh | 4 +++- cmake/ci/build_rtlsdr.sh | 14 ++++++++++++++ cmake/ci/build_serialdv.sh | 1 + cmake/ci/build_xtrx-sdr.sh | 17 +++++++++++++---- 11 files changed, 61 insertions(+), 16 deletions(-) create mode 100644 cmake/ci/build_limesuite.sh create mode 100644 cmake/ci/build_rtlsdr.sh diff --git a/.appveyor.yml b/.appveyor.yml index 8de9a4877..c897eb45c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -15,14 +15,15 @@ environment: APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2017' # RelWithDebInfo configuration: Release - CMAKE_CUSTOM_OPTIONS: "-DENABLE_EXTERNAL_LIBRARIES=OFF" + # CMAKE_CUSTOM_OPTIONS: "-DENABLE_EXTERNAL_LIBRARIES=OFF" + CMAKE_CUSTOM_OPTIONS: "-DFORCE_SSE41=ON -DQT_MISSING=OFF -DDEBUG_OUTPUT=ON -DENABLE_MIRISDR=OFF -DENABLE_SERVER=OFF" CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" - - TARGET: ubuntu1804sse41 - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804 - CMAKE_CUSTOM_OPTIONS: "-DFORCE_SSE41=ON" - - TARGET: ubuntu1804server - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804 - CMAKE_CUSTOM_OPTIONS: "-DBUILD_GUI=OFF" + # - TARGET: ubuntu1804sse41 + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804 + # CMAKE_CUSTOM_OPTIONS: "-DFORCE_SSE41=ON" + # - TARGET: ubuntu1804server + # APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804 + # CMAKE_CUSTOM_OPTIONS: "-DBUILD_GUI=OFF" - TARGET: ubuntu1804external APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu1804 CMAKE_CUSTOM_OPTIONS: "-DENABLE_EXTERNAL_LIBRARIES=ON" @@ -40,7 +41,7 @@ for: #- C:\Tools\vcpkg\installed install: # the clone doesn't get submodules - - ps: git submodule update --init --recursive + - cmd: git submodule update --init --recursive before_build: - ps: cmake . -G $(CMAKE_GENERATOR) $(CMAKE_CUSTOM_OPTIONS) build: @@ -60,10 +61,10 @@ for: sudo apt-get -y install build-essential cmake git \ devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libqt5opengl5-dev \ qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \ - libusb-1.0-0-dev libboost-all-dev librtlsdr-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \ + libusb-1.0-0-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \ libxml2-dev bison flex ffmpeg libpostproc-dev libavcodec-dev libavformat-dev \ libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \ - librtlsdr-dev liblimesuite-dev libbladerf-dev libsoapysdr-dev libiio-dev \ + libbladerf-dev libsoapysdr-dev libiio-dev \ autoconf automake libtool - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_cm256cc.sh; fi - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES=ON" ]]; then bash cmake/ci/build_mbelib.sh; fi @@ -72,6 +73,8 @@ for: - sh: bash cmake/ci/build_perseus-sdr.sh - sh: bash cmake/ci/build_xtrx-sdr.sh - sh: bash cmake/ci/build_airspyhf.sh + - sh: bash cmake/ci/build_rtlsdr.sh + - sh: bash cmake/ci/build_limesuite.sh before_build: - sh: bash -c export - sh: bash -c pwd diff --git a/cmake/ci/build_airspyhf.sh b/cmake/ci/build_airspyhf.sh index 5cb85dc69..dc436e347 100644 --- a/cmake/ci/build_airspyhf.sh +++ b/cmake/ci/build_airspyhf.sh @@ -2,11 +2,12 @@ cd $HOME mkdir -p external && cd external -mkdir -p airspy && cd airspy +mkdir -p airspyhf && cd airspyhf git clone https://github.com/airspy/airspyhf.git cd airspyhf +git reset --hard "1.1.5" mkdir -p build && cd build cmake .. -DINSTALL_UDEV_RULES=ON sudo make install diff --git a/cmake/ci/build_cm256cc.sh b/cmake/ci/build_cm256cc.sh index ce28f3cec..d8d712b3d 100644 --- a/cmake/ci/build_cm256cc.sh +++ b/cmake/ci/build_cm256cc.sh @@ -7,6 +7,7 @@ mkdir -p f4exb && cd f4exb git clone https://github.com/f4exb/cm256cc.git cd cm256cc +git reset --hard f21e8bc1e9afdb0b28672743dcec111aec1d32d9 mkdir -p build && cd build cmake .. sudo make install diff --git a/cmake/ci/build_codec2.sh b/cmake/ci/build_codec2.sh index 79d7fc2d5..15ca607db 100644 --- a/cmake/ci/build_codec2.sh +++ b/cmake/ci/build_codec2.sh @@ -9,6 +9,7 @@ mkdir -p drowe67 && cd drowe67 git clone https://github.com/drowe67/codec2.git cd codec2 +git reset --hard "v0.9.2" mkdir -p build && cd build cmake .. sudo make install diff --git a/cmake/ci/build_dsdcc.sh b/cmake/ci/build_dsdcc.sh index d062ffe12..9d8ae805a 100644 --- a/cmake/ci/build_dsdcc.sh +++ b/cmake/ci/build_dsdcc.sh @@ -7,6 +7,7 @@ mkdir -p f4exb && cd f4exb git clone https://github.com/f4exb/dsdcc.git cd dsdcc +git reset --hard "v1.8.6" mkdir -p build && cd build cmake .. sudo make install diff --git a/cmake/ci/build_limesuite.sh b/cmake/ci/build_limesuite.sh new file mode 100644 index 000000000..03dfbd9b5 --- /dev/null +++ b/cmake/ci/build_limesuite.sh @@ -0,0 +1,11 @@ +cd $HOME +mkdir -p external && cd external +mkdir -p limesuite && cd limesuite + +wget https://github.com/myriadrf/LimeSuite/archive/v20.01.0.tar.gz +tar -xf v20.01.0.tar.gz +cd LimeSuite-20.01.0 +mkdir -p builddir && cd builddir +cmake .. +sudo make install +sudo ldconfig diff --git a/cmake/ci/build_mbelib.sh b/cmake/ci/build_mbelib.sh index 227e18459..ea66aa908 100644 --- a/cmake/ci/build_mbelib.sh +++ b/cmake/ci/build_mbelib.sh @@ -7,6 +7,7 @@ mkdir -p szechyjs && cd szechyjs git clone https://github.com/szechyjs/mbelib.git cd mbelib +git reset --hard 9a04ed5c78176a9965f3d43f7aa1b1f5330e771f mkdir -p build && cd build cmake .. sudo make install diff --git a/cmake/ci/build_perseus-sdr.sh b/cmake/ci/build_perseus-sdr.sh index 4ffb52561..7d72c8eaf 100644 --- a/cmake/ci/build_perseus-sdr.sh +++ b/cmake/ci/build_perseus-sdr.sh @@ -4,9 +4,11 @@ cd $HOME mkdir -p external && cd external mkdir -p microtelecom && cd microtelecom -git clone https://github.com/Microtelecom/libperseus-sdr.git +git clone https://github.com/f4exb/libperseus-sdr.git cd libperseus-sdr +git checkout fixes +git reset --hard afefa23e3140ac79d845acb68cf0beeb86d09028 ./bootstrap.sh ./configure make diff --git a/cmake/ci/build_rtlsdr.sh b/cmake/ci/build_rtlsdr.sh new file mode 100644 index 000000000..51a86f5d7 --- /dev/null +++ b/cmake/ci/build_rtlsdr.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +cd $HOME +mkdir -p external && cd external +mkdir -p rtlsdr && cd rtlsdr + +git clone https://github.com/osmocom/rtl-sdr.git + +cd rtl-sdr +git reset --hard be1d1206bfb6e6c41f7d91b20b77e20f929fa6a7 +mkdir -p build && cd build +cmake .. -DDETACH_KERNEL_DRIVER=ON -DINSTALL_UDEV_RULES=ON +sudo make install +sudo ldconfig diff --git a/cmake/ci/build_serialdv.sh b/cmake/ci/build_serialdv.sh index d1f09dc22..61b6a4304 100644 --- a/cmake/ci/build_serialdv.sh +++ b/cmake/ci/build_serialdv.sh @@ -7,6 +7,7 @@ mkdir -p f4exb && cd f4exb git clone https://github.com/f4exb/serialDV.git cd serialDV +git reset --hard "v1.1.4" mkdir -p build && cd build cmake .. sudo make install diff --git a/cmake/ci/build_xtrx-sdr.sh b/cmake/ci/build_xtrx-sdr.sh index 1443ce66b..04a7e7107 100644 --- a/cmake/ci/build_xtrx-sdr.sh +++ b/cmake/ci/build_xtrx-sdr.sh @@ -4,9 +4,18 @@ cd $HOME mkdir -p external && cd external mkdir -p xtrx-sdr && cd xtrx-sdr -git clone https://github.com/xtrx-sdr/images.git +git clone https://github.com/xtrx-sdr/images.git xtrx-images -cd images/binaries/Ubuntu_16.04_amd64 -sudo dpkg -i *.deb -sudo apt-get -y install -f +cd xtrx-images +git reset --hard 053ec82 +git submodule init +git submodule update +cd sources +mkdir -p build && cd build +cmake -DENABLE_SOAPY=NO .. +sudo make install sudo ldconfig +# cd images/binaries/Ubuntu_16.04_amd64 +# sudo dpkg -i *.deb +# sudo apt-get -y install -f +# sudo ldconfig