From 1894e191d5b531f1fcb672fe7f464b04a0a5b964 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 05:13:32 +0200 Subject: [PATCH 01/24] Fixed CI for debian 10 and 11 3 --- docker_builds/debian_buster/do_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index 90d8107..9e508b7 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -3,7 +3,7 @@ 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 +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev git clone https://github.com/AlexandreRouma/SDRPlusPlus From 102eea134c038934421e28bf6ad4cc3683c2bb37 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 05:23:41 +0200 Subject: [PATCH 02/24] Fixed CI for debian 10 and 11 4 --- .github/workflows/build_linux_amd64.yml | 4 +++- docker_builds/debian_bullseye/Dockerfile | 2 +- docker_builds/debian_buster/Dockerfile | 2 +- docker_builds/debian_buster/do_build.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index b4719ec..42d5efa 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -7,7 +7,7 @@ env: BUILD_TYPE: Release jobs: - build_linux: + build_ubuntu: # The CMake configure and build commands are platform agnostic and should work equally # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. @@ -112,6 +112,7 @@ jobs: 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 @@ -133,6 +134,7 @@ jobs: 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 diff --git a/docker_builds/debian_bullseye/Dockerfile b/docker_builds/debian_bullseye/Dockerfile index a179a08..213c431 100644 --- a/docker_builds/debian_bullseye/Dockerfile +++ b/docker_builds/debian_bullseye/Dockerfile @@ -1,3 +1,3 @@ -FROM debian:buster +FROM debian:bullseye COPY do_build.sh /root RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/debian_buster/Dockerfile b/docker_builds/debian_buster/Dockerfile index 213c431..a179a08 100644 --- a/docker_builds/debian_buster/Dockerfile +++ b/docker_builds/debian_buster/Dockerfile @@ -1,3 +1,3 @@ -FROM debian:bullseye +FROM debian:buster COPY do_build.sh /root RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index 9e508b7..90d8107 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -3,7 +3,7 @@ set -e cd /root apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +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 From 6deae148705727e3e7895b4d9d44a0b73f2cd7f7 Mon Sep 17 00:00:00 2001 From: Joshua Kimsey Date: Sun, 25 Apr 2021 23:34:02 -0400 Subject: [PATCH 03/24] Standardised sorting of bands array for band plans * Standardised organisation of the bands array in the band allocation JSON files. They are now organised by the starting frequency. * Added 'Polar Orbiting Satellites' to the general JSON file, as that affects all general users. --- root/res/bandplans/general.json | 146 +++++++++--------- .../bandplans/germany-mobile-lte-bands.json | 64 ++++---- .../bandplans/germany-mobile-networks.json | 24 +-- root/res/bandplans/russia.json | 12 +- 4 files changed, 126 insertions(+), 120 deletions(-) diff --git a/root/res/bandplans/general.json b/root/res/bandplans/general.json index 600c8ee..99751ad 100644 --- a/root/res/bandplans/general.json +++ b/root/res/bandplans/general.json @@ -17,6 +17,12 @@ "start": 526500, "end": 1606500 }, + { + "name": "160m Ham Band", + "type": "amateur", + "start": 1800000, + "end": 2000000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", @@ -29,6 +35,12 @@ "start": 3200000, "end": 3400000 }, + { + "name": "80m Ham Band", + "type": "amateur", + "start": 3500000, + "end": 3950000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", @@ -47,12 +59,24 @@ "start": 5005000, "end": 5060000 }, + { + "name": "60m Ham Band", + "type": "amateur", + "start": 5351500, + "end": 5366500 + }, { "name": "Shortwave Broadcast", "type": "broadcast", "start": 5900000, "end": 6200000 }, + { + "name": "40m Ham Band", + "type": "amateur", + "start": 7000000, + "end": 7200000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", @@ -65,6 +89,12 @@ "start": 9400000, "end": 9900000 }, + { + "name": "30m Ham Band", + "type": "amateur", + "start": 10100000, + "end": 10150000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", @@ -77,6 +107,12 @@ "start": 13570000, "end": 13870000 }, + { + "name": "20m Ham Band", + "type": "amateur", + "start": 14000000, + "end": 14350000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", @@ -89,24 +125,60 @@ "start": 17480000, "end": 17900000 }, + { + "name": "17m Ham Band", + "type": "amateur", + "start": 18068000, + "end": 18168000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", "start": 18900000, "end": 19020000 }, + { + "name": "15m Ham Band", + "type": "amateur", + "start": 21000000, + "end": 21450000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", "start": 21450000, "end": 21850000 }, + { + "name": "12m Ham Band", + "type": "amateur", + "start": 24890000, + "end": 24990000 + }, { "name": "Shortwave Broadcast", "type": "broadcast", "start": 25670000, "end": 26100000 }, + { + "name": "CB", + "type": "amateur", + "start": 26960000, + "end": 27410000 + }, + { + "name": "10m Ham Band", + "type": "amateur", + "start": 28000000, + "end": 29750000 + }, + { + "name": "6m Ham Band", + "type": "amateur", + "start": 50000000, + "end": 54000000 + }, { "name": "FM Broadcast", "type": "broadcast", @@ -126,76 +198,10 @@ "end": 137000000 }, { - "name": "160m Ham Band", - "type": "amateur", - "start": 1800000, - "end": 2000000 - }, - { - "name": "80m Ham Band", - "type": "amateur", - "start": 3500000, - "end": 3950000 - }, - { - "name": "60m Ham Band", - "type": "amateur", - "start": 5351500, - "end": 5366500 - }, - { - "name": "40m Ham Band", - "type": "amateur", - "start": 7000000, - "end": 7200000 - }, - { - "name": "30m Ham Band", - "type": "amateur", - "start": 10100000, - "end": 10150000 - }, - { - "name": "20m Ham Band", - "type": "amateur", - "start": 14000000, - "end": 14350000 - }, - { - "name": "17m Ham Band", - "type": "amateur", - "start": 18068000, - "end": 18168000 - }, - { - "name": "15m Ham Band", - "type": "amateur", - "start": 21000000, - "end": 21450000 - }, - { - "name": "12m Ham Band", - "type": "amateur", - "start": 24890000, - "end": 24990000 - }, - { - "name": "CB", - "type": "amateur", - "start": 26960000, - "end": 27410000 - }, - { - "name": "10m Ham Band", - "type": "amateur", - "start": 28000000, - "end": 29750000 - }, - { - "name": "6m Ham Band", - "type": "amateur", - "start": 50000000, - "end": 54000000 + "name": "Polar Orbiting Satellites", + "type": "satellite", + "start": 137000000, + "end": 138000000 }, { "name": "2m Ham Band", diff --git a/root/res/bandplans/germany-mobile-lte-bands.json b/root/res/bandplans/germany-mobile-lte-bands.json index 42a6fda..0592aad 100644 --- a/root/res/bandplans/germany-mobile-lte-bands.json +++ b/root/res/bandplans/germany-mobile-lte-bands.json @@ -6,16 +6,22 @@ "author_url": "none", "bands": [ { - "name": "LTE band 1 (IMT) FDD uplink", + "name": "LTE band 28 (APT) FDD uplink", "type": "LTE.FDD.uplink", - "start": 1920000000, - "end": 1980000000 + "start": 703000000, + "end": 748000000 }, { - "name": "LTE band 1 (IMT) FDD downlink", - "type": "LTE.FDD.downlink", - "start": 2110000000, - "end": 2170000000 + "name": "LTE band 20 (Digital Dividend) FDD uplink", + "type": "LTE.FDD.uplink", + "start": 832000000, + "end": 862000000 + }, + { + "name": "LTE band 8 (Extended GSM) FDD uplink", + "type": "LTE.FDD.uplink", + "start": 880000000, + "end": 915000000 }, { "name": "LTE band 3 (DCS) FDD uplink", @@ -29,6 +35,18 @@ "start": 1805000000, "end": 1880000000 }, + { + "name": "LTE band 1 (IMT) FDD uplink", + "type": "LTE.FDD.uplink", + "start": 1920000000, + "end": 1980000000 + }, + { + "name": "LTE band 1 (IMT) FDD downlink", + "type": "LTE.FDD.downlink", + "start": 2110000000, + "end": 2170000000 + }, { "name": "LTE band 7 (IMT-E) FDD uplink", "type": "LTE.FDD.uplink", @@ -42,22 +60,10 @@ "end": 2690000000 }, { - "name": "LTE band 8 (Extended GSM) FDD uplink", - "type": "LTE.FDD.uplink", - "start": 880000000, - "end": 915000000 - }, - { - "name": "LTE band 8 (Extended GSM) FDD downlink", + "name": "LTE band 28 (APT) FDD downlink", "type": "LTE.FDD.downlink", - "start": 9250000000, - "end": 9600000000 - }, - { - "name": "LTE band 20 (Digital Dividend) FDD uplink", - "type": "LTE.FDD.uplink", - "start": 832000000, - "end": 862000000 + "start": 7580000000, + "end": 8030000000 }, { "name": "LTE band 20 (Digital Dividend) FDD downlink", @@ -66,16 +72,10 @@ "end": 8210000000 }, { - "name": "LTE band 28 (APT) FDD uplink", - "type": "LTE.FDD.uplink", - "start": 703000000, - "end": 748000000 - }, - { - "name": "LTE band 28 (APT) FDD downlink", + "name": "LTE band 8 (Extended GSM) FDD downlink", "type": "LTE.FDD.downlink", - "start": 7580000000, - "end": 8030000000 + "start": 9250000000, + "end": 9600000000 }, { "name": "LTE band 32 (L-Band (EU)) SDL downlink", @@ -84,4 +84,4 @@ "end": 14960000000 } ] -} +} \ No newline at end of file diff --git a/root/res/bandplans/germany-mobile-networks.json b/root/res/bandplans/germany-mobile-networks.json index c6e4acd..289c6a2 100644 --- a/root/res/bandplans/germany-mobile-networks.json +++ b/root/res/bandplans/germany-mobile-networks.json @@ -137,7 +137,7 @@ "start": 1452000000, "end": 1472000000 }, - { + { "name": "1472 Vodafone SDL downlink", "type": "mobile.mno.vodafone", "start": 1472000000, @@ -149,7 +149,7 @@ "start": 1710000000, "end": 1740000000 }, - { + { "name": "1740 Telefonica FDD uplink", "type": "mobile.mno.telefonica", "start": 1740000000, @@ -167,7 +167,7 @@ "start": 1805000000, "end": 1835000000 }, - { + { "name": "1835 Telefonica FDD downlink", "type": "mobile.mno.telefonica", "start": 1835000000, @@ -185,7 +185,7 @@ "start": 1880000000, "end": 1900000000 }, - { + { "name": "1900.1 Telefonica", "type": "mobile.mno.telefonica", "start": 1900100000, @@ -197,7 +197,7 @@ "start": 1920000000, "end": 1940000000 }, - { + { "name": "1940 Telefonica FDD uplink", "type": "mobile.mno.telefonica", "start": 1940000000, @@ -209,7 +209,7 @@ "start": 1960000000, "end": 1980000000 }, - { + { "name": "2010.5 Telefonica", "type": "mobile.mno.telefonica", "start": 2010500000, @@ -221,7 +221,7 @@ "start": 2110000000, "end": 2130000000 }, - { + { "name": "2130 Telefonica FDD downlink", "type": "mobile.mno.telefonica", "start": 2130000000, @@ -245,13 +245,13 @@ "start": 2520000000, "end": 2540000000 }, - { + { "name": "2540 Telefonica FDD uplink", "type": "mobile.mno.telefonica", "start": 2540000000, "end": 2570000000 }, - { + { "name": "2570 Telefonica TDD", "type": "mobile.mno.telefonica", "start": 2570000000, @@ -269,7 +269,7 @@ "start": 2605000000, "end": 2610000000 }, - { + { "name": "2610 Telefonica TDD", "type": "mobile.mno.telefonica", "start": 2610000000, @@ -287,7 +287,7 @@ "start": 2640000000, "end": 2660000000 }, - { + { "name": "2660 Telefonica FDD downlink", "type": "mobile.mno.telefonica", "start": 2660000000, @@ -318,4 +318,4 @@ "end": 3700000000 } ] -} +} \ No newline at end of file diff --git a/root/res/bandplans/russia.json b/root/res/bandplans/russia.json index 2c12726..3bb2bf5 100644 --- a/root/res/bandplans/russia.json +++ b/root/res/bandplans/russia.json @@ -347,18 +347,18 @@ "start": 24940000, "end": 24990000 }, - { - "name": "SW 11m", - "type": "broadcast", - "start": 25650000, - "end": 26100000 - }, { "name": "CB", "type": "amateur", "start": 25165000, "end": 30105000 }, + { + "name": "SW 11m", + "type": "broadcast", + "start": 25650000, + "end": 26100000 + }, { "name": "10m CW", "type": "amateur", From 481d5a6b1408fbcd3734918de2726af7e7aba05e Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 05:43:40 +0200 Subject: [PATCH 04/24] Added other ubuntu versions to CI --- .github/workflows/build_linux_amd64.yml | 135 +++++++++++++++--------- 1 file changed, 88 insertions(+), 47 deletions(-) diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index 42d5efa..09d2353 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -7,53 +7,6 @@ env: BUILD_TYPE: Release jobs: - build_ubuntu: - # The CMake configure and build commands are platform agnostic and should work equally - # well on Windows or Mac. You can convert this to a matrix build if you need - # cross-platform coverage. - # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v2 - - - name: Update repositories - run: sudo apt update - - - name: Install dependencies - run: sudo apt install libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev - - - name: Create Build Environment - # Some projects don't allow in-source building, so create a separate build directory - # We'll use this as our working directory for all subsequent commands - run: cmake -E make_directory ${{runner.workspace}}/build - - - name: Configure CMake - # Use a bash shell so we can use the same syntax for environment variable - # access regardless of the host operating system - shell: bash - working-directory: ${{runner.workspace}}/build - # Note the current convention is to use the -S and -B options here to specify source - # and build directories, but this is only available with CMake 3.13 and higher. - # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 - run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DOPT_BUILD_SDRPLAY_SOURCE=OFF - - - name: Build - working-directory: ${{runner.workspace}}/build - shell: bash - # Execute the build. You can specify a specific target with "--target " - run: cmake --build . --config $BUILD_TYPE -j2 - - - name: Create Deb Archive - working-directory: ${{runner.workspace}} - run: sh $GITHUB_WORKSPACE/make_debian_package.sh ${{runner.workspace}}/build - - - name: Save Deb Archive - uses: actions/upload-artifact@v2 - with: - name: sdrpp_ubuntu20.04_amd64 - path: ${{runner.workspace}}/sdrpp_debian_amd64.deb - build_windows: runs-on: windows-latest @@ -141,4 +94,92 @@ jobs: uses: actions/upload-artifact@v2 with: 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 + + steps: + - uses: actions/checkout@v2 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_focal && 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_focal_amd64 + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + + build_ubuntu_groovy: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_groovy && 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_groovy_amd64 + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + + build_ubuntu_hirsute: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_hirsute && 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_hirsute_amd64 path: ${{runner.workspace}}/sdrpp_debian_amd64.deb \ No newline at end of file From b9642f1e621351008d65ae4003c8e1cf93a9db08 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 05:44:55 +0200 Subject: [PATCH 05/24] Added other ubuntu versions to CI 2 --- docker_builds/ubuntu_bionic/Dockerfile | 3 +++ docker_builds/ubuntu_bionic/do_build.sh | 17 +++++++++++++++++ docker_builds/ubuntu_focal/Dockerfile | 3 +++ docker_builds/ubuntu_focal/do_build.sh | 17 +++++++++++++++++ docker_builds/ubuntu_groovy/Dockerfile | 3 +++ docker_builds/ubuntu_groovy/do_build.sh | 17 +++++++++++++++++ docker_builds/ubuntu_hirsute/Dockerfile | 3 +++ docker_builds/ubuntu_hirsute/do_build.sh | 17 +++++++++++++++++ 8 files changed, 80 insertions(+) create mode 100644 docker_builds/ubuntu_bionic/Dockerfile create mode 100644 docker_builds/ubuntu_bionic/do_build.sh create mode 100644 docker_builds/ubuntu_focal/Dockerfile create mode 100644 docker_builds/ubuntu_focal/do_build.sh create mode 100644 docker_builds/ubuntu_groovy/Dockerfile create mode 100644 docker_builds/ubuntu_groovy/do_build.sh create mode 100644 docker_builds/ubuntu_hirsute/Dockerfile create mode 100644 docker_builds/ubuntu_hirsute/do_build.sh diff --git a/docker_builds/ubuntu_bionic/Dockerfile b/docker_builds/ubuntu_bionic/Dockerfile new file mode 100644 index 0000000..611c7df --- /dev/null +++ b/docker_builds/ubuntu_bionic/Dockerfile @@ -0,0 +1,3 @@ +FROM ubuntu:bionic +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 0000000..90d8107 --- /dev/null +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -0,0 +1,17 @@ +#!/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/docker_builds/ubuntu_focal/Dockerfile b/docker_builds/ubuntu_focal/Dockerfile new file mode 100644 index 0000000..2fa14a9 --- /dev/null +++ b/docker_builds/ubuntu_focal/Dockerfile @@ -0,0 +1,3 @@ +FROM ubuntu:focal +COPY do_build.sh /root +RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh new file mode 100644 index 0000000..9e508b7 --- /dev/null +++ b/docker_builds/ubuntu_focal/do_build.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e +cd /root + +apt update +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-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/docker_builds/ubuntu_groovy/Dockerfile b/docker_builds/ubuntu_groovy/Dockerfile new file mode 100644 index 0000000..2ac9f3f --- /dev/null +++ b/docker_builds/ubuntu_groovy/Dockerfile @@ -0,0 +1,3 @@ +FROM ubuntu:groovy +COPY do_build.sh /root +RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_groovy/do_build.sh b/docker_builds/ubuntu_groovy/do_build.sh new file mode 100644 index 0000000..9e508b7 --- /dev/null +++ b/docker_builds/ubuntu_groovy/do_build.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e +cd /root + +apt update +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-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/docker_builds/ubuntu_hirsute/Dockerfile b/docker_builds/ubuntu_hirsute/Dockerfile new file mode 100644 index 0000000..71c6711 --- /dev/null +++ b/docker_builds/ubuntu_hirsute/Dockerfile @@ -0,0 +1,3 @@ +FROM ubuntu:hirsute +COPY do_build.sh /root +RUN chmod +x /root/do_build.sh \ No newline at end of file diff --git a/docker_builds/ubuntu_hirsute/do_build.sh b/docker_builds/ubuntu_hirsute/do_build.sh new file mode 100644 index 0000000..9e508b7 --- /dev/null +++ b/docker_builds/ubuntu_hirsute/do_build.sh @@ -0,0 +1,17 @@ +#!/bin/bash +set -e +cd /root + +apt update +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-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 From c8628824990aa7e5226b83ea24fe9c1f3a0d6a84 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 05:48:52 +0200 Subject: [PATCH 06/24] Added other ubuntu versions to CI 3 --- .github/workflows/build_linux_amd64.yml | 22 ---------------------- docker_builds/ubuntu_bionic/Dockerfile | 3 --- docker_builds/ubuntu_bionic/do_build.sh | 17 ----------------- 3 files changed, 42 deletions(-) delete mode 100644 docker_builds/ubuntu_bionic/Dockerfile delete mode 100644 docker_builds/ubuntu_bionic/do_build.sh diff --git a/.github/workflows/build_linux_amd64.yml b/.github/workflows/build_linux_amd64.yml index 09d2353..0f5c12b 100644 --- a/.github/workflows/build_linux_amd64.yml +++ b/.github/workflows/build_linux_amd64.yml @@ -96,28 +96,6 @@ 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/docker_builds/ubuntu_bionic/Dockerfile b/docker_builds/ubuntu_bionic/Dockerfile deleted file mode 100644 index 611c7df..0000000 --- a/docker_builds/ubuntu_bionic/Dockerfile +++ /dev/null @@ -1,3 +0,0 @@ -FROM ubuntu:bionic -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 deleted file mode 100644 index 90d8107..0000000 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/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 From 8c70d816a0e3d395d717e7b92f559c684f0ada70 Mon Sep 17 00:00:00 2001 From: Joshua Kimsey Date: Mon, 26 Apr 2021 03:03:38 -0400 Subject: [PATCH 07/24] Added JSON styling guides to the Contribution file * Added guides to the Contribution file for how to properly style and organise the JSON files for Band allocation identifiers and colour maps. --- contributing.md | 62 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/contributing.md b/contributing.md index 4ee4729..a45bfda 100644 --- a/contributing.md +++ b/contributing.md @@ -49,6 +49,68 @@ For example, lets take the module named `cool_source`: If the module meets the code quality requirements, it may be added to the official repository. A module that doesn't require any external dependencies that the core doesn't already use may be enabled for build by default. Otherwise, they must be disabled for build by default with a `OPT_BUILD_MODULE_NAME` variable set to `OFF`. +# JSON Formatting + +The ability to add new radio band allocation identifiers and color maps relies on JSON files. Proper formatting of these JSOn files is important for reference and readability. The folowing guides will show you how to properly format the JSON files for their respective uses. + +## Band Frequency Allocation + +Please follow this guide to properly format the JSON files for custom radio band allocation identifiers. + +```json +{ + "name": "Single Word: Name of the band plan ", + "country_name": "Name of country, if applicable (Use 'Worldwide' otherwise)", + "country_code": "Two letter country code, if applicable (Use '--' otherwise", + "author_name": "Name of the original/main creator of the JSON file", + "author_url": "URL the author wishes to be associated with the file (personal website, GitHub, Twitter, etc)", + "bands": [ + // Bands in this array must be sorted by their starting frequency + { + "name": "Name of the band", + "type": "Type of band (Amatuer, Broadcast, Marine, Military, or Satellite)", + "start": 148500, //In Hz, must be an integer + "end": 283500 //In Hz, must be an integer + }, + { + "name": "Name of the band", + "type": "Type of band (Amatuer, Broadcast, Marine, Military, or Satellite)", + "start": 526500, //In Hz, must be an integer + "end": 1606500 //In Hz, must be an integer + } + ] +} +``` + +## Color Maps + +Please follow this guide to properly format the JSON files for custom color maps. + +```json +{ + "name": "Name of the color map in a single word", + "author": "Name of the original/main creator of the color map", + "map": [ + // These are the color codes, in hexidecimal format, for the custom color scales for the waterfall. They must be entered as strings, not integers, with the hastag/pound-symbol proceeding the 6 digit number. + "#000020", + "#000030", + "#000050", + "#000091", + "#1E90FF", + "#FFFFFF", + "#FFFF00", + "#FE6D16", + "#FE6D16", + "#FF0000", + "#FF0000", + "#C60000", + "#9F0000", + "#750000", + "#4A0000" + ] +} +``` + # Best Practices * All additions and/or bug fixes to the core must not add additional dependencies. From 5feba74b9bc366c67d89a20147af4c1b0eaa79fa Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 14:21:35 +0200 Subject: [PATCH 08/24] Fixed stalling issue --- docker_builds/debian_bullseye/do_build.sh | 2 ++ docker_builds/debian_buster/do_build.sh | 2 ++ docker_builds/ubuntu_focal/do_build.sh | 2 ++ docker_builds/ubuntu_groovy/do_build.sh | 2 ++ docker_builds/ubuntu_hirsute/do_build.sh | 2 ++ 5 files changed, 10 insertions(+) diff --git a/docker_builds/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh index 9e508b7..6c7043f 100644 --- a/docker_builds/debian_bullseye/do_build.sh +++ b/docker_builds/debian_bullseye/do_build.sh @@ -2,6 +2,8 @@ set -e cd /root +export TZ=Europe/Brussels + apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index 90d8107..e816fae 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -2,6 +2,8 @@ set -e cd /root +export TZ=Europe/Brussels + 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 diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh index 9e508b7..6c7043f 100644 --- a/docker_builds/ubuntu_focal/do_build.sh +++ b/docker_builds/ubuntu_focal/do_build.sh @@ -2,6 +2,8 @@ set -e cd /root +export TZ=Europe/Brussels + apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev diff --git a/docker_builds/ubuntu_groovy/do_build.sh b/docker_builds/ubuntu_groovy/do_build.sh index 9e508b7..6c7043f 100644 --- a/docker_builds/ubuntu_groovy/do_build.sh +++ b/docker_builds/ubuntu_groovy/do_build.sh @@ -2,6 +2,8 @@ set -e cd /root +export TZ=Europe/Brussels + apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev diff --git a/docker_builds/ubuntu_hirsute/do_build.sh b/docker_builds/ubuntu_hirsute/do_build.sh index 9e508b7..6c7043f 100644 --- a/docker_builds/ubuntu_hirsute/do_build.sh +++ b/docker_builds/ubuntu_hirsute/do_build.sh @@ -2,6 +2,8 @@ set -e cd /root +export TZ=Europe/Brussels + apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev From 061cb91c48701e6af371ab5aaa95db002d079f07 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 14:38:14 +0200 Subject: [PATCH 09/24] Fixed CI Stall --- docker_builds/debian_bullseye/Dockerfile | 1 + docker_builds/debian_bullseye/do_build.sh | 1 - docker_builds/debian_buster/Dockerfile | 1 + docker_builds/debian_buster/do_build.sh | 1 - docker_builds/ubuntu_focal/Dockerfile | 1 + docker_builds/ubuntu_focal/do_build.sh | 1 - docker_builds/ubuntu_groovy/Dockerfile | 1 + docker_builds/ubuntu_groovy/do_build.sh | 1 - docker_builds/ubuntu_hirsute/Dockerfile | 1 + docker_builds/ubuntu_hirsute/do_build.sh | 1 - 10 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker_builds/debian_bullseye/Dockerfile b/docker_builds/debian_bullseye/Dockerfile index 213c431..7ed48b6 100644 --- a/docker_builds/debian_bullseye/Dockerfile +++ b/docker_builds/debian_bullseye/Dockerfile @@ -1,3 +1,4 @@ FROM debian:bullseye +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/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh index 6c7043f..4bbd19d 100644 --- a/docker_builds/debian_bullseye/do_build.sh +++ b/docker_builds/debian_bullseye/do_build.sh @@ -2,7 +2,6 @@ set -e cd /root -export TZ=Europe/Brussels apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev diff --git a/docker_builds/debian_buster/Dockerfile b/docker_builds/debian_buster/Dockerfile index a179a08..edaa3da 100644 --- a/docker_builds/debian_buster/Dockerfile +++ b/docker_builds/debian_buster/Dockerfile @@ -1,3 +1,4 @@ FROM debian:buster +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/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index e816fae..d39e062 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -2,7 +2,6 @@ set -e cd /root -export TZ=Europe/Brussels 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 diff --git a/docker_builds/ubuntu_focal/Dockerfile b/docker_builds/ubuntu_focal/Dockerfile index 2fa14a9..a382660 100644 --- a/docker_builds/ubuntu_focal/Dockerfile +++ b/docker_builds/ubuntu_focal/Dockerfile @@ -1,3 +1,4 @@ FROM ubuntu:focal +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_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh index 6c7043f..4bbd19d 100644 --- a/docker_builds/ubuntu_focal/do_build.sh +++ b/docker_builds/ubuntu_focal/do_build.sh @@ -2,7 +2,6 @@ set -e cd /root -export TZ=Europe/Brussels apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev diff --git a/docker_builds/ubuntu_groovy/Dockerfile b/docker_builds/ubuntu_groovy/Dockerfile index 2ac9f3f..48c5288 100644 --- a/docker_builds/ubuntu_groovy/Dockerfile +++ b/docker_builds/ubuntu_groovy/Dockerfile @@ -1,3 +1,4 @@ FROM ubuntu:groovy +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_groovy/do_build.sh b/docker_builds/ubuntu_groovy/do_build.sh index 6c7043f..4bbd19d 100644 --- a/docker_builds/ubuntu_groovy/do_build.sh +++ b/docker_builds/ubuntu_groovy/do_build.sh @@ -2,7 +2,6 @@ set -e cd /root -export TZ=Europe/Brussels apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev diff --git a/docker_builds/ubuntu_hirsute/Dockerfile b/docker_builds/ubuntu_hirsute/Dockerfile index 71c6711..40c340f 100644 --- a/docker_builds/ubuntu_hirsute/Dockerfile +++ b/docker_builds/ubuntu_hirsute/Dockerfile @@ -1,3 +1,4 @@ FROM ubuntu:hirsute +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_hirsute/do_build.sh b/docker_builds/ubuntu_hirsute/do_build.sh index 6c7043f..4bbd19d 100644 --- a/docker_builds/ubuntu_hirsute/do_build.sh +++ b/docker_builds/ubuntu_hirsute/do_build.sh @@ -2,7 +2,6 @@ set -e cd /root -export TZ=Europe/Brussels apt update apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev From 1ba3756be03220aa0d2fcfb1b1fdd38959d14442 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 15:12:52 +0200 Subject: [PATCH 10/24] Fixed cmake bug and added ubuntu bionic --- .../{build_linux_amd64.yml => build_all.yml} | 22 +++++++++++++++++++ CMakeLists.txt | 2 +- airspy_source/CMakeLists.txt | 4 ++-- airspyhf_source/CMakeLists.txt | 4 ++-- audio_sink/CMakeLists.txt | 14 ++++++------ bladerf_source/CMakeLists.txt | 4 ++-- core/CMakeLists.txt | 2 +- demo_module/CMakeLists.txt | 2 +- discord_integration/CMakeLists.txt | 2 +- docker_builds/ubuntu_bionic/Dockerfile | 4 ++++ docker_builds/ubuntu_bionic/do_build.sh | 18 +++++++++++++++ falcon9_decoder/CMakeLists.txt | 2 +- file_source/CMakeLists.txt | 2 +- hackrf_source/CMakeLists.txt | 4 ++-- meteor_demodulator/CMakeLists.txt | 2 +- plutosdr_source/CMakeLists.txt | 6 ++--- radio/CMakeLists.txt | 2 +- recorder/CMakeLists.txt | 2 +- rtl_sdr_source/CMakeLists.txt | 4 ++-- rtl_tcp_source/CMakeLists.txt | 2 +- rx888_source/CMakeLists.txt | 2 +- sdrplay_source/CMakeLists.txt | 4 ++-- soapy_source/CMakeLists.txt | 8 +++---- spyserver_source/CMakeLists.txt | 2 +- weather_sat_decoder/CMakeLists.txt | 2 +- 25 files changed, 83 insertions(+), 39 deletions(-) rename .github/workflows/{build_linux_amd64.yml => build_all.yml} (88%) create mode 100644 docker_builds/ubuntu_bionic/Dockerfile create mode 100644 docker_builds/ubuntu_bionic/do_build.sh 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 0f5c12b..09d2353 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 5ced26f..c43d6f2 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 e4c6c5b..bfc0daa 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 ead337b..80a23d3 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 eea2489..96b0277 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 644d693..b523e3e 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 185f883..d217ad2 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 c03009f..20cce9f 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 e1d511d..e7c2c64 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 0000000..d4928b9 --- /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 0000000..d39e062 --- /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 cbd2a1d..e81d2f6 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 9c991d6..8c21a19 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 11876a5..d486341 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 797690a..720e7c9 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 f398ac3..3c5a896 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 2e88d61..350e253 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 8376702..2c5eb3a 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 4df92ae..939ceef 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 739f0b6..00e6d8d 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 9ed580a..a1bfec2 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 986c077..ba503a3 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 0aa3089..34eb8b2 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 4f4232a..d1057a3 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 e41506a..8445f54 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) From 3d65e515adf57b8c0c794e15c974d998d190d4e7 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 15:17:24 +0200 Subject: [PATCH 11/24] Fixed bad cmake command --- core/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index d217ad2..d75a04f 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -12,15 +12,15 @@ else () endif () add_definitions(-DSDRPP_IS_CORE) -# Set the install prefix -add_compile_definitions(INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") - # Main code file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c") # Add code to dyn lib add_library(sdrpp_core SHARED ${SRC}) +# Set the install prefix +target_compile_definitions(sdrpp_core PUBLIC INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") + # Include core headers target_include_directories(sdrpp_core PUBLIC "src/") target_include_directories(sdrpp_core PUBLIC "src/imgui") From f96872546902cd3e48b74beff65f744b29ac439c Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 15:25:28 +0200 Subject: [PATCH 12/24] Fixed cmake 3.10 compatibility for ubuntu bionic based distros --- airspy_source/CMakeLists.txt | 1 - airspyhf_source/CMakeLists.txt | 1 - audio_sink/CMakeLists.txt | 2 -- core/CMakeLists.txt | 7 ------- hackrf_source/CMakeLists.txt | 1 - plutosdr_source/CMakeLists.txt | 2 -- rtl_sdr_source/CMakeLists.txt | 1 - soapy_source/CMakeLists.txt | 1 - 8 files changed, 16 deletions(-) diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt index bfc0daa..197fd64 100644 --- a/airspy_source/CMakeLists.txt +++ b/airspy_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBAIRSPY REQUIRED libairspy) target_include_directories(airspy_source PUBLIC ${LIBAIRSPY_INCLUDE_DIRS}) - target_link_directories(airspy_source PUBLIC ${LIBAIRSPY_LIBRARY_DIRS}) target_link_libraries(airspy_source PUBLIC ${LIBAIRSPY_LIBRARIES}) endif () diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt index 80a23d3..14b525d 100644 --- a/airspyhf_source/CMakeLists.txt +++ b/airspyhf_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBAIRSPYHF REQUIRED libairspyhf) target_include_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_INCLUDE_DIRS}) - target_link_directories(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARY_DIRS}) target_link_libraries(airspyhf_source PUBLIC ${LIBAIRSPYHF_LIBRARIES}) endif () diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt index 96b0277..4e67b19 100644 --- a/audio_sink/CMakeLists.txt +++ b/audio_sink/CMakeLists.txt @@ -32,8 +32,6 @@ else (MSVC) target_include_directories(audio_sink PUBLIC ${RTAUDIO_INCLUDE_DIRS}) - target_link_directories(audio_sink PUBLIC ${RTAUDIO_LIBRARY_DIRS}) - target_link_libraries(audio_sink PUBLIC ${RTAUDIO_LIBRARIES}) endif () diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index d75a04f..f0f16aa 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -64,13 +64,6 @@ else() ${VOLK_INCLUDE_DIRS} ) - target_link_directories(sdrpp_core PUBLIC - ${GLEW_LIBRARY_DIRS} - ${FFTW3_LIBRARY_DIRS} - ${GLFW3_LIBRARY_DIRS} - ${VOLK_LIBRARY_DIRS} - ) - target_link_libraries(sdrpp_core PUBLIC ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES} diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt index d486341..cd7ced2 100644 --- a/hackrf_source/CMakeLists.txt +++ b/hackrf_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBHACKRF REQUIRED libhackrf) target_include_directories(hackrf_source PUBLIC ${LIBHACKRF_INCLUDE_DIRS}) - target_link_directories(hackrf_source PUBLIC ${LIBHACKRF_LIBRARY_DIRS}) target_link_libraries(hackrf_source PUBLIC ${LIBHACKRF_LIBRARIES}) endif () diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt index 3c5a896..0ba6f68 100644 --- a/plutosdr_source/CMakeLists.txt +++ b/plutosdr_source/CMakeLists.txt @@ -31,11 +31,9 @@ else (MSVC) pkg_check_modules(LIBAD9361 REQUIRED libad9361) target_include_directories(plutosdr_source PUBLIC ${LIBIIO_INCLUDE_DIRS}) - target_link_directories(plutosdr_source PUBLIC ${LIBIIO_LIBRARY_DIRS}) target_link_libraries(plutosdr_source PUBLIC ${LIBIIO_LIBRARIES}) target_include_directories(plutosdr_source PUBLIC ${LIBAD9361_INCLUDE_DIRS}) - target_link_directories(plutosdr_source PUBLIC ${LIBAD9361_LIBRARY_DIRS}) target_link_libraries(plutosdr_source PUBLIC ${LIBAD9361_LIBRARIES}) endif () diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt index 939ceef..d6e40f7 100644 --- a/rtl_sdr_source/CMakeLists.txt +++ b/rtl_sdr_source/CMakeLists.txt @@ -28,7 +28,6 @@ else (MSVC) pkg_check_modules(LIBRTLSDR REQUIRED librtlsdr) target_include_directories(rtl_sdr_source PUBLIC ${LIBRTLSDR_INCLUDE_DIRS}) - target_link_directories(rtl_sdr_source PUBLIC ${LIBRTLSDR_LIBRARY_DIRS}) target_link_libraries(rtl_sdr_source PUBLIC ${LIBRTLSDR_LIBRARIES}) endif () diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt index 34eb8b2..2d25b0f 100644 --- a/soapy_source/CMakeLists.txt +++ b/soapy_source/CMakeLists.txt @@ -29,7 +29,6 @@ else (MSVC) pkg_check_modules(SOAPY REQUIRED SoapySDR) target_include_directories(soapy_source PUBLIC ${SOAPY_INCLUDE_DIRS}) - target_link_directories(soapy_source PUBLIC ${SOAPY_LIBRARY_DIRS}) target_link_libraries(soapy_source PUBLIC ${SOAPY_LIBRARIES}) endif () From 95f7171256f26488b9722fee5bee6899317c45b3 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 15:30:52 +0200 Subject: [PATCH 13/24] Fixed more bionic stuff --- docker_builds/ubuntu_bionic/do_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh index d39e062..0610cc9 100644 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -4,7 +4,7 @@ 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 +apt install -y dpkg-dev make gcc-8 g++-8 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 From 78c7ef0242ddda8e3f96322c5e55e697548ad40a Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 15:34:32 +0200 Subject: [PATCH 14/24] Fixed more bionic stuff 2 --- docker_builds/ubuntu_bionic/do_build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh index 0610cc9..c948c3f 100644 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -6,6 +6,9 @@ cd /root apt update apt install -y dpkg-dev make gcc-8 g++-8 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 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 + git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus From ed29f9dcc51994ff5af56e8b1eb2dde5bbe140b8 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 16:02:03 +0200 Subject: [PATCH 15/24] Added work around for old volk versions --- core/src/dsp/math.h | 4 ++++ docker_builds/ubuntu_bionic/do_build.sh | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/dsp/math.h b/core/src/dsp/math.h index 62241d1..e0eda3f 100644 --- a/core/src/dsp/math.h +++ b/core/src/dsp/math.h @@ -30,7 +30,11 @@ namespace dsp { } if constexpr (std::is_same_v || std::is_same_v) { +#ifdef USE_OLD_VOLK_ADD + volk_32f_x2_add_32f((float*)out.writeBuf, (float*)_a->readBuf, (float*)_b->readBuf, a_count * 2); +#else volk_32fc_x2_add_32fc((lv_32fc_t*)out.writeBuf, (lv_32fc_t*)_a->readBuf, (lv_32fc_t*)_b->readBuf, a_count); +#endif } else { volk_32f_x2_add_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count); diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh index c948c3f..94aec9a 100644 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -15,7 +15,7 @@ cd SDRPlusPlus mkdir build cd build cmake .. -make -j2 +make CXX_FLAGS=-DUSE_OLD_VOLK_ADD=1 -j2 cd .. sh make_debian_package.sh ./build \ No newline at end of file From 27697bb63843d39890af5c27ec54a939c258eda7 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 16:55:55 +0200 Subject: [PATCH 16/24] More bionic compatibility --- core/src/config.cpp | 5 +++++ docker_builds/ubuntu_bionic/do_build.sh | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/src/config.cpp b/core/src/config.cpp index 49d2405..b92531c 100644 --- a/core/src/config.cpp +++ b/core/src/config.cpp @@ -1,7 +1,12 @@ #include #include #include + +#ifdef USE_EXPERIMENTAL_FS +#include +#else #include +#endif ConfigManager::ConfigManager() { diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh index 94aec9a..2abfecb 100644 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -2,12 +2,15 @@ set -e cd /root - apt update -apt install -y dpkg-dev make gcc-8 g++-8 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 +apt install -y software-properties-common +add-apt-repository -y ppa:ubuntu-toolchain-r/test +apt update + +apt install -y dpkg-dev make gcc-10 g++-10 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 update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1000 --slave /usr/bin/g++ g++ /usr/bin/g++-10 git clone https://github.com/AlexandreRouma/SDRPlusPlus @@ -15,7 +18,7 @@ cd SDRPlusPlus mkdir build cd build cmake .. -make CXX_FLAGS=-DUSE_OLD_VOLK_ADD=1 -j2 +make CXX_FLAGS='-DUSE_OLD_VOLK_ADD=1 -DUSE_EXPERIMENTAL_FS=1' -j2 cd .. sh make_debian_package.sh ./build \ No newline at end of file From 128e52e33a1bd95b2891310e034c1f5544f0d2b0 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 17:03:52 +0200 Subject: [PATCH 17/24] Dropping support for old volk and ubuntu versions, please update..; --- .github/workflows/build_all.yml | 22 ---------------------- CMakeLists.txt | 2 +- airspy_source/CMakeLists.txt | 2 +- airspyhf_source/CMakeLists.txt | 2 +- audio_sink/CMakeLists.txt | 2 +- bladerf_source/CMakeLists.txt | 2 +- core/CMakeLists.txt | 2 +- core/src/config.cpp | 4 ---- core/src/dsp/math.h | 4 ---- demo_module/CMakeLists.txt | 2 +- discord_integration/CMakeLists.txt | 2 +- docker_builds/ubuntu_bionic/Dockerfile | 4 ---- docker_builds/ubuntu_bionic/do_build.sh | 24 ------------------------ falcon9_decoder/CMakeLists.txt | 2 +- file_source/CMakeLists.txt | 2 +- hackrf_source/CMakeLists.txt | 2 +- meteor_demodulator/CMakeLists.txt | 2 +- plutosdr_source/CMakeLists.txt | 2 +- radio/CMakeLists.txt | 2 +- recorder/CMakeLists.txt | 2 +- rtl_sdr_source/CMakeLists.txt | 2 +- rtl_tcp_source/CMakeLists.txt | 2 +- rx888_source/CMakeLists.txt | 2 +- sdrplay_source/CMakeLists.txt | 2 +- soapy_source/CMakeLists.txt | 2 +- spyserver_source/CMakeLists.txt | 2 +- weather_sat_decoder/CMakeLists.txt | 2 +- 27 files changed, 22 insertions(+), 80 deletions(-) delete mode 100644 docker_builds/ubuntu_bionic/Dockerfile delete mode 100644 docker_builds/ubuntu_bionic/do_build.sh diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 09d2353..0f5c12b 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -96,28 +96,6 @@ 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 c43d6f2..5ced26f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(sdrpp) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt index 197fd64..43c9131 100644 --- a/airspy_source/CMakeLists.txt +++ b/airspy_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(airspy_source) if (MSVC) diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt index 14b525d..a69b31b 100644 --- a/airspyhf_source/CMakeLists.txt +++ b/airspyhf_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(airspyhf_source) if (MSVC) diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt index 4e67b19..dad1a82 100644 --- a/audio_sink/CMakeLists.txt +++ b/audio_sink/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(audio_sink) if (MSVC) diff --git a/bladerf_source/CMakeLists.txt b/bladerf_source/CMakeLists.txt index b523e3e..b9cf1dd 100644 --- a/bladerf_source/CMakeLists.txt +++ b/bladerf_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(bladerf_source) if (MSVC) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index f0f16aa..5ac25ef 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(sdrpp_core) # Set compiler options diff --git a/core/src/config.cpp b/core/src/config.cpp index b92531c..301e9c7 100644 --- a/core/src/config.cpp +++ b/core/src/config.cpp @@ -2,11 +2,7 @@ #include #include -#ifdef USE_EXPERIMENTAL_FS -#include -#else #include -#endif ConfigManager::ConfigManager() { diff --git a/core/src/dsp/math.h b/core/src/dsp/math.h index e0eda3f..62241d1 100644 --- a/core/src/dsp/math.h +++ b/core/src/dsp/math.h @@ -30,11 +30,7 @@ namespace dsp { } if constexpr (std::is_same_v || std::is_same_v) { -#ifdef USE_OLD_VOLK_ADD - volk_32f_x2_add_32f((float*)out.writeBuf, (float*)_a->readBuf, (float*)_b->readBuf, a_count * 2); -#else volk_32fc_x2_add_32fc((lv_32fc_t*)out.writeBuf, (lv_32fc_t*)_a->readBuf, (lv_32fc_t*)_b->readBuf, a_count); -#endif } else { volk_32f_x2_add_32f(out.writeBuf, _a->readBuf, _b->readBuf, a_count); diff --git a/demo_module/CMakeLists.txt b/demo_module/CMakeLists.txt index 20cce9f..c03009f 100644 --- a/demo_module/CMakeLists.txt +++ b/demo_module/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(demo) if (MSVC) diff --git a/discord_integration/CMakeLists.txt b/discord_integration/CMakeLists.txt index e7c2c64..e1d511d 100644 --- a/discord_integration/CMakeLists.txt +++ b/discord_integration/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(discord_integration) if (MSVC) diff --git a/docker_builds/ubuntu_bionic/Dockerfile b/docker_builds/ubuntu_bionic/Dockerfile deleted file mode 100644 index d4928b9..0000000 --- a/docker_builds/ubuntu_bionic/Dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -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 deleted file mode 100644 index 2abfecb..0000000 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -set -e -cd /root - -apt update -apt install -y software-properties-common -add-apt-repository -y ppa:ubuntu-toolchain-r/test -apt update - -apt install -y dpkg-dev make gcc-10 g++-10 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 - -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1000 --slave /usr/bin/g++ g++ /usr/bin/g++-10 - -git clone https://github.com/AlexandreRouma/SDRPlusPlus - -cd SDRPlusPlus -mkdir build -cd build -cmake .. -make CXX_FLAGS='-DUSE_OLD_VOLK_ADD=1 -DUSE_EXPERIMENTAL_FS=1' -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 e81d2f6..cbd2a1d 100644 --- a/falcon9_decoder/CMakeLists.txt +++ b/falcon9_decoder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(falcon9_decoder) if (MSVC) diff --git a/file_source/CMakeLists.txt b/file_source/CMakeLists.txt index 8c21a19..9c991d6 100644 --- a/file_source/CMakeLists.txt +++ b/file_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(file_source) if (MSVC) diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt index cd7ced2..2943319 100644 --- a/hackrf_source/CMakeLists.txt +++ b/hackrf_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(hackrf_source) if (MSVC) diff --git a/meteor_demodulator/CMakeLists.txt b/meteor_demodulator/CMakeLists.txt index 720e7c9..797690a 100644 --- a/meteor_demodulator/CMakeLists.txt +++ b/meteor_demodulator/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(meteor_demodulator) if (MSVC) diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt index 0ba6f68..33ac123 100644 --- a/plutosdr_source/CMakeLists.txt +++ b/plutosdr_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(plutosdr_source) if (MSVC) diff --git a/radio/CMakeLists.txt b/radio/CMakeLists.txt index 350e253..2e88d61 100644 --- a/radio/CMakeLists.txt +++ b/radio/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(radio) if (MSVC) diff --git a/recorder/CMakeLists.txt b/recorder/CMakeLists.txt index 2c5eb3a..8376702 100644 --- a/recorder/CMakeLists.txt +++ b/recorder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(recorder) if (MSVC) diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt index d6e40f7..6d6ac6b 100644 --- a/rtl_sdr_source/CMakeLists.txt +++ b/rtl_sdr_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(rtl_sdr_source) if (MSVC) diff --git a/rtl_tcp_source/CMakeLists.txt b/rtl_tcp_source/CMakeLists.txt index 00e6d8d..739f0b6 100644 --- a/rtl_tcp_source/CMakeLists.txt +++ b/rtl_tcp_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(rtl_tcp_source) if (MSVC) diff --git a/rx888_source/CMakeLists.txt b/rx888_source/CMakeLists.txt index a1bfec2..9ed580a 100644 --- a/rx888_source/CMakeLists.txt +++ b/rx888_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(rx888_source) if (MSVC) diff --git a/sdrplay_source/CMakeLists.txt b/sdrplay_source/CMakeLists.txt index ba503a3..02b6586 100644 --- a/sdrplay_source/CMakeLists.txt +++ b/sdrplay_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(sdrplay_source) if (MSVC) diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt index 2d25b0f..fda0130 100644 --- a/soapy_source/CMakeLists.txt +++ b/soapy_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(soapy_source) if (MSVC) diff --git a/spyserver_source/CMakeLists.txt b/spyserver_source/CMakeLists.txt index d1057a3..4f4232a 100644 --- a/spyserver_source/CMakeLists.txt +++ b/spyserver_source/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(spyserver_source) if (MSVC) diff --git a/weather_sat_decoder/CMakeLists.txt b/weather_sat_decoder/CMakeLists.txt index 8445f54..e41506a 100644 --- a/weather_sat_decoder/CMakeLists.txt +++ b/weather_sat_decoder/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.13) project(weather_sat_decoder) if (MSVC) From 48ae57ad2def9df05e5c89ffad27d8c4bb658410 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 17:41:03 +0200 Subject: [PATCH 18/24] Added CI for debian sid --- .github/workflows/build_all.yml | 22 ++++++++++++++++++++++ docker_builds/debian_sid/Dockerfile | 4 ++++ docker_builds/debian_sid/do_build.sh | 18 ++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 docker_builds/debian_sid/Dockerfile create mode 100644 docker_builds/debian_sid/do_build.sh diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 0f5c12b..0aea919 100644 --- a/.github/workflows/build_all.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_debian_sid: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Create Docker Image + run: cd $GITHUB_WORKSPACE/docker_builds/debian_sid && 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_debian_sid_amd64 + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + build_ubuntu_focal: runs-on: ubuntu-latest diff --git a/docker_builds/debian_sid/Dockerfile b/docker_builds/debian_sid/Dockerfile new file mode 100644 index 0000000..6b1dd42 --- /dev/null +++ b/docker_builds/debian_sid/Dockerfile @@ -0,0 +1,4 @@ +FROM debian:sid +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/debian_sid/do_build.sh b/docker_builds/debian_sid/do_build.sh new file mode 100644 index 0000000..4bbd19d --- /dev/null +++ b/docker_builds/debian_sid/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 libvolk2-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 From 48399d341fe6898ed1355c6d985141118ae3d73b Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 19:27:05 +0200 Subject: [PATCH 19/24] Added automatic build for full archive --- .github/workflows/build_all.yml | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 0aea919..5ec953d 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -182,4 +182,30 @@ jobs: uses: actions/upload-artifact@v2 with: name: sdrpp_ubuntu_hirsute_amd64 - path: ${{runner.workspace}}/sdrpp_debian_amd64.deb \ No newline at end of file + path: ${{runner.workspace}}/sdrpp_debian_amd64.deb + + create_full_archive: + needs: ['build_windows', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_sid', 'build_ubuntu_focal', 'build_ubuntu_groovy', 'build_ubuntu_hirsute'] + runs-on: ubuntu-latest + + steps: + - name: Download All Builds + working-directory: ${{runner.workspace}} + uses: actions/download-artifact@v2 + + - name: Create Archive + working-directory: ${{runner.workspace}} + run: > + mkdir sdrpp_all + mv build_windows/sdrpp_windows_x64.zip sdrpp_all/ + mv build_debian_buster/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb + mv build_debian_bullseye/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb + mv build_debian_sid/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb + mv build_ubuntu_focal/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb + mv build_ubuntu_groovy/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_groovy_amd64.deb + mv build_ubuntu_hirsute/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_hirsute_amd64.deb + + - uses: actions/upload-artifact@v2 + with: + name: sdrpp_all + path: ${{runner.workspace}}/sdrpp_all/ \ No newline at end of file From 624817618c2cab79e88795a49a8ef57865e6eec0 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 19:28:19 +0200 Subject: [PATCH 20/24] Added automatic build for full archive 2 --- .github/workflows/build_all.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 5ec953d..0060926 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -190,7 +190,6 @@ jobs: steps: - name: Download All Builds - working-directory: ${{runner.workspace}} uses: actions/download-artifact@v2 - name: Create Archive From 48932a5230b2bbae1cf811d27b53806ee1cdd39a Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 19:43:55 +0200 Subject: [PATCH 21/24] Added automatic build for full archive 3 --- .github/workflows/build_all.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 0060926..0aec24c 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -195,13 +195,13 @@ jobs: - name: Create Archive working-directory: ${{runner.workspace}} run: > - mkdir sdrpp_all - mv build_windows/sdrpp_windows_x64.zip sdrpp_all/ - mv build_debian_buster/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb - mv build_debian_bullseye/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb - mv build_debian_sid/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb - mv build_ubuntu_focal/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb - mv build_ubuntu_groovy/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_groovy_amd64.deb + mkdir sdrpp_all && + mv build_windows/sdrpp_windows_x64.zip sdrpp_all/ && + mv build_debian_buster/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb && + mv build_debian_bullseye/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb && + mv build_debian_sid/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb && + mv build_ubuntu_focal/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb && + mv build_ubuntu_groovy/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_groovy_amd64.deb && mv build_ubuntu_hirsute/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_hirsute_amd64.deb - uses: actions/upload-artifact@v2 From 0300be1c4b81559f23957d7bbd441a7bcf0ee587 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 19:59:41 +0200 Subject: [PATCH 22/24] Fixed contributing.md --- .github/workflows/build_all.yml | 14 +++++++------- contributing.md | 16 +++++++++------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 0aec24c..90e29d1 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -196,13 +196,13 @@ jobs: working-directory: ${{runner.workspace}} run: > mkdir sdrpp_all && - mv build_windows/sdrpp_windows_x64.zip sdrpp_all/ && - mv build_debian_buster/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb && - mv build_debian_bullseye/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb && - mv build_debian_sid/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb && - mv build_ubuntu_focal/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb && - mv build_ubuntu_groovy/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_groovy_amd64.deb && - mv build_ubuntu_hirsute/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_hirsute_amd64.deb + mv sdrpp_windows_x64/sdrpp_windows_x64.zip sdrpp_all/ && + mv sdrpp_debian_buster_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_buster_amd64.deb && + mv sdrpp_debian_bullseye_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_bullseye_amd64.deb && + mv sdrpp_debian_sid_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb && + mv sdrpp_ubuntu_focal_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb && + mv sdrpp_ubuntu_groovy_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_groovy_amd64.deb && + mv sdrpp_ubuntu_hirsute_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_hirsute_amd64.deb - uses: actions/upload-artifact@v2 with: diff --git a/contributing.md b/contributing.md index a45bfda..27c1f07 100644 --- a/contributing.md +++ b/contributing.md @@ -53,28 +53,30 @@ If the module meets the code quality requirements, it may be added to the offici The ability to add new radio band allocation identifiers and color maps relies on JSON files. Proper formatting of these JSOn files is important for reference and readability. The folowing guides will show you how to properly format the JSON files for their respective uses. +**IMPORTANT: JSON File cannot contain comments, there are only in this example for clarity** + ## Band Frequency Allocation Please follow this guide to properly format the JSON files for custom radio band allocation identifiers. ```json { - "name": "Single Word: Name of the band plan ", - "country_name": "Name of country, if applicable (Use 'Worldwide' otherwise)", - "country_code": "Two letter country code, if applicable (Use '--' otherwise", + "name": "Short name (has to fit in the menu)", + "country_name": "Name of country or area, if applicable (Use '--' otherwise)", + "country_code": "Two letter country code, if applicable (Use '--' otherwise)", "author_name": "Name of the original/main creator of the JSON file", "author_url": "URL the author wishes to be associated with the file (personal website, GitHub, Twitter, etc)", "bands": [ // Bands in this array must be sorted by their starting frequency { "name": "Name of the band", - "type": "Type of band (Amatuer, Broadcast, Marine, Military, or Satellite)", + "type": "Type name ('amateur', 'broadcast', 'marine', 'military', or any type decalre in config.json)", "start": 148500, //In Hz, must be an integer "end": 283500 //In Hz, must be an integer }, { "name": "Name of the band", - "type": "Type of band (Amatuer, Broadcast, Marine, Military, or Satellite)", + "type": "Type name ('amateur', 'broadcast', 'marine', 'military', or any type decalre in config.json)", "start": 526500, //In Hz, must be an integer "end": 1606500 //In Hz, must be an integer } @@ -88,10 +90,10 @@ Please follow this guide to properly format the JSON files for custom color maps ```json { - "name": "Name of the color map in a single word", + "name": "Short name (has to fit in the menu)", "author": "Name of the original/main creator of the color map", "map": [ - // These are the color codes, in hexidecimal format, for the custom color scales for the waterfall. They must be entered as strings, not integers, with the hastag/pound-symbol proceeding the 6 digit number. + // These are the color codes, in hexidecimal (#RRGGBB) format, for the custom color scales for the waterfall. They must be entered as strings, not integers, with the hastag/pound-symbol proceeding the 6 digit number. "#000020", "#000030", "#000050", From 54165c64ec78567d46a4cd920461a5e8699a0001 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 20:17:57 +0200 Subject: [PATCH 23/24] Fixed CI again... --- .github/workflows/build_all.yml | 3 +-- readme.md | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 90e29d1..8f86136 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -193,7 +193,6 @@ jobs: uses: actions/download-artifact@v2 - name: Create Archive - working-directory: ${{runner.workspace}} run: > mkdir sdrpp_all && mv sdrpp_windows_x64/sdrpp_windows_x64.zip sdrpp_all/ && @@ -207,4 +206,4 @@ jobs: - uses: actions/upload-artifact@v2 with: name: sdrpp_all - path: ${{runner.workspace}}/sdrpp_all/ \ No newline at end of file + path: sdrpp_all/ \ No newline at end of file diff --git a/readme.md b/readme.md index 6959fc2..10819ad 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@ ![Screenshot](https://i.imgur.com/EFOqwQQ.png) SDR++ is a cross-platform and open source SDR software with the aim of being bloat free and simple to use. -![Linux Build](https://github.com/AlexandreRouma/SDRPlusPlus/workflows/Linux%20Build/badge.svg) +![Build](https://github.com/AlexandreRouma/SDRPlusPlus/workflows/Build%20Binaries/badge.svg) * [Patreon](https://patreon.com/ryzerth) * [Discord Server](https://discord.gg/aFgWjyD) From b9a41c83bfe4d88f40ea37f5d6df63b178b8ec53 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 23:34:24 +0200 Subject: [PATCH 24/24] Added sdrplay source to CI --- docker_builds/debian_bullseye/do_build.sh | 13 ++++++++++--- docker_builds/debian_buster/do_build.sh | 13 ++++++++++--- docker_builds/debian_sid/do_build.sh | 13 ++++++++++--- docker_builds/ubuntu_focal/do_build.sh | 13 ++++++++++--- docker_builds/ubuntu_groovy/do_build.sh | 13 ++++++++++--- docker_builds/ubuntu_hirsute/do_build.sh | 13 ++++++++++--- 6 files changed, 60 insertions(+), 18 deletions(-) diff --git a/docker_builds/debian_bullseye/do_build.sh b/docker_builds/debian_bullseye/do_build.sh index 4bbd19d..8e19036 100644 --- a/docker_builds/debian_bullseye/do_build.sh +++ b/docker_builds/debian_bullseye/do_build.sh @@ -2,16 +2,23 @@ set -e cd /root - +# Install dependencies and tools apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev p7zip-full wget + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus mkdir build cd build -cmake .. +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON make -j2 cd .. diff --git a/docker_builds/debian_buster/do_build.sh b/docker_builds/debian_buster/do_build.sh index d39e062..2024aeb 100644 --- a/docker_builds/debian_buster/do_build.sh +++ b/docker_builds/debian_buster/do_build.sh @@ -2,16 +2,23 @@ set -e cd /root - +# Install dependencies and tools 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 +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 p7zip-full wget + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus mkdir build cd build -cmake .. +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON make -j2 cd .. diff --git a/docker_builds/debian_sid/do_build.sh b/docker_builds/debian_sid/do_build.sh index 4bbd19d..8e19036 100644 --- a/docker_builds/debian_sid/do_build.sh +++ b/docker_builds/debian_sid/do_build.sh @@ -2,16 +2,23 @@ set -e cd /root - +# Install dependencies and tools apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev p7zip-full wget + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus mkdir build cd build -cmake .. +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON make -j2 cd .. diff --git a/docker_builds/ubuntu_focal/do_build.sh b/docker_builds/ubuntu_focal/do_build.sh index 4bbd19d..8e19036 100644 --- a/docker_builds/ubuntu_focal/do_build.sh +++ b/docker_builds/ubuntu_focal/do_build.sh @@ -2,16 +2,23 @@ set -e cd /root - +# Install dependencies and tools apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev p7zip-full wget + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus mkdir build cd build -cmake .. +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON make -j2 cd .. diff --git a/docker_builds/ubuntu_groovy/do_build.sh b/docker_builds/ubuntu_groovy/do_build.sh index 4bbd19d..8e19036 100644 --- a/docker_builds/ubuntu_groovy/do_build.sh +++ b/docker_builds/ubuntu_groovy/do_build.sh @@ -2,16 +2,23 @@ set -e cd /root - +# Install dependencies and tools apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev p7zip-full wget + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus mkdir build cd build -cmake .. +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON make -j2 cd .. diff --git a/docker_builds/ubuntu_hirsute/do_build.sh b/docker_builds/ubuntu_hirsute/do_build.sh index 4bbd19d..8e19036 100644 --- a/docker_builds/ubuntu_hirsute/do_build.sh +++ b/docker_builds/ubuntu_hirsute/do_build.sh @@ -2,16 +2,23 @@ set -e cd /root - +# Install dependencies and tools apt update -apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +apt install -y build-essential cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk2-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev p7zip-full wget + +# Install SDRPlay libraries +wget https://www.sdrplay.com/software/SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1.run +7z x ./SDRplay_RSP_API-Linux-3.07.1 +cp x86_64/libsdrplay_api.so.3.07 /usr/lib/libsdrplay_api.so +cp inc/* /usr/include/ git clone https://github.com/AlexandreRouma/SDRPlusPlus cd SDRPlusPlus mkdir build cd build -cmake .. +cmake .. -DOPT_BUILD_SDRPLAY_SOURCE=ON make -j2 cd ..