diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_all.yml similarity index 88% rename from .github/workflows/build_linux_amd64.yml rename to .github/workflows/build_all.yml index 0f5c12ba..09d2353d 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_all.yml @@ -96,6 +96,28 @@ jobs: name: sdrpp_debian_bullseye_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_ubuntu_bionic: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_bionic && docker build . --tag sdrpp_build + + - name: Run Container + run: docker run --name build sdrpp_build /root/do_build.sh + + - name: Recover Deb Archive + working-directory: ${{runner.workspace}} + run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./ + + - name: Save Deb Archive + uses: actions/upload-artifact@v2 + with: + name: sdrpp_ubuntu_bionic_amd64 + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_ubuntu_focal: runs-on: ubuntu-latest diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ced26f5..c43d6f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(sdrpp) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt index e4c6c5b6..bfc0daa2 100644 --- a/airspy_source/CMakeLists.txt +++ b/airspy_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(airspy_source) if (MSVC) @@ -19,7 +19,7 @@ set_target_properties(airspy_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") + target_link_directories(airspy_source PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_libraries(airspy_source PUBLIC airspy) else (MSVC) diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt index ead337b6..80a23d31 100644 --- a/airspyhf_source/CMakeLists.txt +++ b/airspyhf_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(airspyhf_source) if (MSVC) @@ -19,7 +19,7 @@ set_target_properties(airspyhf_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") + target_link_directories(airspyhf_source PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_libraries(airspyhf_source PUBLIC airspyhf) else (MSVC) diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt index eea24893..96b02770 100644 --- a/audio_sink/CMakeLists.txt +++ b/audio_sink/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(audio_sink) if (MSVC) @@ -19,22 +19,22 @@ set_target_properties(audio_sink PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files (x86)/RtAudio/lib") + target_link_directories(audio_sink PUBLIC "C:/Program Files (x86)/RtAudio/lib") # Misc headers - target_include_directories(sdrpp_core PUBLIC "C:/Program Files (x86)/RtAudio/include/rtaudio") + target_include_directories(audio_sink PUBLIC "C:/Program Files (x86)/RtAudio/include/rtaudio") - target_link_libraries(sdrpp_core PUBLIC rtaudio) + target_link_libraries(audio_sink PUBLIC rtaudio) else (MSVC) find_package(PkgConfig) pkg_check_modules(RTAUDIO REQUIRED rtaudio) - target_include_directories(sdrpp_core PUBLIC ${RTAUDIO_INCLUDE_DIRS}) + target_include_directories(audio_sink PUBLIC ${RTAUDIO_INCLUDE_DIRS}) - target_link_directories(sdrpp_core PUBLIC ${RTAUDIO_LIBRARY_DIRS}) + target_link_directories(audio_sink PUBLIC ${RTAUDIO_LIBRARY_DIRS}) - target_link_libraries(sdrpp_core PUBLIC ${RTAUDIO_LIBRARIES}) + target_link_libraries(audio_sink PUBLIC ${RTAUDIO_LIBRARIES}) endif () diff --git a/bladerf_source/CMakeLists.txt b/bladerf_source/CMakeLists.txt index 644d6938..b523e3ec 100644 --- a/bladerf_source/CMakeLists.txt +++ b/bladerf_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(bladerf_source) if (MSVC) @@ -19,7 +19,7 @@ set_target_properties(bladerf_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") + target_link_directories(bladerf_source PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_libraries(bladerf_source PUBLIC bladeRF) else (MSVC) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 185f883e..d217ad27 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(sdrpp_core) # Set compiler options diff --git a/demo_module/CMakeLists.txt b/demo_module/CMakeLists.txt index c03009f9..20cce9f2 100644 --- a/demo_module/CMakeLists.txt +++ b/demo_module/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(demo) if (MSVC) diff --git a/discord_integration/CMakeLists.txt b/discord_integration/CMakeLists.txt index e1d511d1..e7c2c64e 100644 --- a/discord_integration/CMakeLists.txt +++ b/discord_integration/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(discord_integration) if (MSVC) diff --git a/docker_builds/ubuntu_bionic/Dockerfile b/docker_builds/ubuntu_bionic/Dockerfile new file mode 100644 index 00000000..d4928b91 --- /dev/null +++ b/docker_builds/ubuntu_bionic/Dockerfile @@ -0,0 +1,4 @@ +FROM ubuntu:bionic +ENV DEBIAN_FRONTEND=noninteractive +COPY do_build.sh /root +RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh new file mode 100644 index 00000000..d39e0621 --- /dev/null +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -e +cd /root + + +apt update +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev + +git clone https://github.com/AlexandreRouma/SDRPlusPlus + +cd SDRPlusPlus +mkdir build +cd build +cmake .. +make -j2 + +cd .. +sh make_debian_package.sh ./build \ No newline at end of file diff --git a/falcon9_decoder/CMakeLists.txt b/falcon9_decoder/CMakeLists.txt index cbd2a1df..e81d2f6b 100644 --- a/falcon9_decoder/CMakeLists.txt +++ b/falcon9_decoder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(falcon9_decoder) if (MSVC) diff --git a/file_source/CMakeLists.txt b/file_source/CMakeLists.txt index 9c991d62..8c21a197 100644 --- a/file_source/CMakeLists.txt +++ b/file_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(file_source) if (MSVC) diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt index 11876a52..d4863417 100644 --- a/hackrf_source/CMakeLists.txt +++ b/hackrf_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(hackrf_source) if (MSVC) @@ -19,7 +19,7 @@ set_target_properties(hackrf_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") + target_link_directories(hackrf_source PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_libraries(hackrf_source PUBLIC hackrf) else (MSVC) diff --git a/meteor_demodulator/CMakeLists.txt b/meteor_demodulator/CMakeLists.txt index 797690ad..720e7c9b 100644 --- a/meteor_demodulator/CMakeLists.txt +++ b/meteor_demodulator/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(meteor_demodulator) if (MSVC) diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt index f398ac31..3c5a8964 100644 --- a/plutosdr_source/CMakeLists.txt +++ b/plutosdr_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(plutosdr_source) if (MSVC) @@ -19,8 +19,8 @@ set_target_properties(plutosdr_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/lib/") - target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/") + target_link_directories(plutosdr_source PUBLIC "C:/Program Files/PothosSDR/lib/") + target_include_directories(plutosdr_source PUBLIC "C:/Program Files/PothosSDR/include/") target_link_libraries(plutosdr_source PUBLIC libiio) target_link_libraries(plutosdr_source PUBLIC libad9361) diff --git a/radio/CMakeLists.txt b/radio/CMakeLists.txt index 2e88d612..350e253a 100644 --- a/radio/CMakeLists.txt +++ b/radio/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(radio) if (MSVC) diff --git a/recorder/CMakeLists.txt b/recorder/CMakeLists.txt index 83767028..2c5eb3aa 100644 --- a/recorder/CMakeLists.txt +++ b/recorder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(recorder) if (MSVC) diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt index 4df92ae2..939ceefa 100644 --- a/rtl_sdr_source/CMakeLists.txt +++ b/rtl_sdr_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(rtl_sdr_source) if (MSVC) @@ -19,7 +19,7 @@ set_target_properties(rtl_sdr_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/bin/") + target_link_directories(rtl_sdr_source PUBLIC "C:/Program Files/PothosSDR/bin/") target_link_libraries(rtl_sdr_source PUBLIC rtlsdr) else (MSVC) diff --git a/rtl_tcp_source/CMakeLists.txt b/rtl_tcp_source/CMakeLists.txt index 739f0b66..00e6d8d2 100644 --- a/rtl_tcp_source/CMakeLists.txt +++ b/rtl_tcp_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(rtl_tcp_source) if (MSVC) diff --git a/rx888_source/CMakeLists.txt b/rx888_source/CMakeLists.txt index 9ed580a0..a1bfec2d 100644 --- a/rx888_source/CMakeLists.txt +++ b/rx888_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(rx888_source) if (MSVC) diff --git a/sdrplay_source/CMakeLists.txt b/sdrplay_source/CMakeLists.txt index 986c077f..ba503a3f 100644 --- a/sdrplay_source/CMakeLists.txt +++ b/sdrplay_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(sdrplay_source) if (MSVC) @@ -19,7 +19,7 @@ set_target_properties(sdrplay_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/SDRplay/API/x64") + target_link_directories(sdrplay_source PUBLIC "C:/Program Files/SDRplay/API/x64") target_include_directories(sdrplay_source PUBLIC "C:/Program Files/SDRplay/API/inc") target_link_libraries(sdrplay_source PUBLIC sdrplay_api) diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt index 0aa30893..34eb8b29 100644 --- a/soapy_source/CMakeLists.txt +++ b/soapy_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(soapy_source) if (MSVC) @@ -17,12 +17,12 @@ set_target_properties(soapy_source PROPERTIES PREFIX "") if (MSVC) # Lib path - target_link_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/lib/") + target_link_directories(soapy_source PUBLIC "C:/Program Files/PothosSDR/lib/") # Misc headers - target_include_directories(sdrpp_core PUBLIC "C:/Program Files/PothosSDR/include/") + target_include_directories(soapy_source PUBLIC "C:/Program Files/PothosSDR/include/") - target_link_libraries(sdrpp_core PUBLIC SoapySDR) + target_link_libraries(soapy_source PUBLIC SoapySDR) else (MSVC) find_package(PkgConfig) diff --git a/spyserver_source/CMakeLists.txt b/spyserver_source/CMakeLists.txt index 4f4232a2..d1057a31 100644 --- a/spyserver_source/CMakeLists.txt +++ b/spyserver_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(spyserver_source) if (MSVC) diff --git a/weather_sat_decoder/CMakeLists.txt b/weather_sat_decoder/CMakeLists.txt index e41506a3..8445f548 100644 --- a/weather_sat_decoder/CMakeLists.txt +++ b/weather_sat_decoder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13) +cmake_minimum_required(VERSION 3.10) project(weather_sat_decoder) if (MSVC)