Skip to content

Commit ba6a3cc

Browse files
committed
Updated versions and changelogs
1 parent 9f95769 commit ba6a3cc

File tree

6 files changed

+144
-124
lines changed

6 files changed

+144
-124
lines changed

.appveyor.yml

Lines changed: 117 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -20,125 +20,125 @@ environment:
2020
# -DBUILD_SERVER=OFF \
2121
# -DCMAKE_PREFIX_PATH=C:\\Qt\\5.15.2\\msvc2019_64;C:\\Libraries\\boost_1_73_0"
2222
# CMAKE_GENERATOR: Ninja
23-
- TARGET: ubuntu2204prod
24-
APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
25-
APPVEYOR_BUILD_WORKER_IMAGE: Linux
26-
CC: "gcc-11"
27-
CXX: "g++-11"
28-
CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
29-
-DARCH_OPT=nehalem \
30-
-DDEBUG_OUTPUT=ON \
31-
-DENABLE_EXTERNAL_LIBRARIES=AUTO \
32-
-DBUILD_SERVER=OFF"
23+
# - TARGET: ubuntu2204prod
24+
# APPVEYOR_BUILD_WORKER_CLOUD: nasrock Docker
25+
# APPVEYOR_BUILD_WORKER_IMAGE: Linux
26+
# CC: "gcc-11"
27+
# CXX: "g++-11"
28+
# CMAKE_CUSTOM_OPTIONS: "-DCMAKE_BUILD_TYPE=Release \
29+
# -DARCH_OPT=nehalem \
30+
# -DDEBUG_OUTPUT=ON \
31+
# -DENABLE_EXTERNAL_LIBRARIES=AUTO \
32+
# -DBUILD_SERVER=OFF"
3333
- TARGET: ubuntu2204docker
3434
APPVEYOR_BUILD_WORKER_CLOUD: nasrock
3535
APPVEYOR_BUILD_WORKER_IMAGE: Linux
3636
APPVEYOR_CONSOLE_DISABLE_PTY: true
3737

38-
for:
39-
# - matrix:
40-
# only:
41-
# - TARGET: 'vs2019gui'
42-
# cache:
43-
# - C:\ProgramData\chocolatey\bin
44-
# - C:\ProgramData\chocolatey\lib
45-
# build_script:
46-
# - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
47-
# # Install GNU patch as applying patches with git fails in BladeRF tree
48-
# - choco install patch
49-
# - git submodule update --init --recursive
50-
# - mkdir build && cd build
51-
# - cmake .. -G "%CMAKE_GENERATOR%" %CMAKE_CUSTOM_OPTIONS%
52-
# - cmake --build . --config Release --target package
53-
# artifacts: # push installer executable
54-
# path: build\*.exe
55-
# name: installer
56-
# deploy:
57-
# release: sdrangel-v$(appveyor_build_version)
58-
# description: 'SDRangel Windows'
59-
# provider: GitHub
60-
# auth_token:
61-
# secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
62-
# artifact: installer, portable
63-
# draft: false
64-
# prerelease: false
65-
# tag: $(APPVEYOR_REPO_TAG_NAME) # will not work until tag is pushed
66-
# on:
67-
# APPVEYOR_REPO_TAG: true # deploy on tag push only
68-
# branch: master # release from master branch only
69-
- matrix:
70-
only:
71-
- TARGET: ubuntu2204prod
72-
clone_folder: /home/appveyor/projects
73-
cache:
74-
- $HOME/external/
75-
install:
76-
- sh: sudo apt-get update
77-
- sh: echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
78-
# not sdrplay with soapysdr; libairspyhf-dev is too old (no lna)
79-
- sh: |
80-
sudo apt-get -y install build-essential cmake git xxd \
81-
devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \
82-
qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
83-
libqt5quick5 qtwebengine5-dev qtbase5-private-dev \
84-
qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
85-
qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
86-
libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
87-
libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libqt5svg5-dev libfaad-dev libflac-dev zlib1g-dev \
88-
libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
89-
libxml2-dev bison flex ffmpeg libpostproc-dev libavcodec-dev libavformat-dev \
90-
libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
91-
libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev libhamlib-dev \
92-
python3-mako python3-cheetah python3-numpy \
93-
autoconf automake libtool ninja-build libclang1-11
94-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_cm256cc.sh; fi
95-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_mbelib.sh; fi
96-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_serialdv.sh; fi
97-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_dsdcc.sh; fi
98-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_perseus-sdr.sh; fi
99-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_xtrx-sdr.sh; fi
100-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_airspyhf.sh; fi
101-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_rtlsdr.sh; fi
102-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_limesuite.sh; fi
103-
- sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_ggmorse.sh; fi
104-
- sh: bash cmake/ci/build_sdrplay.sh
105-
before_build:
106-
- sh: bash -c export
107-
- sh: bash -c pwd
108-
build_script:
109-
- sh: ./cmake/ci/build_sdrangel.sh
110-
test_script:
111-
# debian build path
112-
- sh: ./obj-x86_64-linux-gnu/sdrangelbench
113-
after_build:
114-
- sh: mkdir sdrangel-${APPVEYOR_BUILD_VERSION}
115-
- sh: cp ../*.deb ../*.build ../*.buildinfo ../*.changes sdrangel-${APPVEYOR_BUILD_VERSION}
116-
- sh: tar -czf sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz sdrangel-${APPVEYOR_BUILD_VERSION}
117-
artifacts:
118-
- path: sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz
119-
name: package2204
120-
# deploy:
121-
# release: sdrangel-v$(appveyor_build_version)
122-
# description: 'SDRangel Ubuntu 22.04'
123-
# provider: GitHub
124-
# auth_token:
125-
# secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
126-
# artifact: archive
127-
# draft: false
128-
# prerelease: false
129-
# on:
130-
# APPVEYOR_REPO_TAG: true # deploy on tag push only
131-
# branch: master # release from master branch only
132-
deploy:
133-
provider: Environment
134-
name: f4exb
135-
- matrix:
136-
only:
137-
- TARGET: ubuntu2204docker
138-
before_build:
139-
- git clone https://github.com/f4exb/sdrangel-docker.git
140-
- cd sdrangel-docker
141-
build_script:
142-
- cd sdrangel
143-
- ./build_vanilla.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
144-
- ./build_server.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
38+
# for:
39+
# # - matrix:
40+
# # only:
41+
# # - TARGET: 'vs2019gui'
42+
# # cache:
43+
# # - C:\ProgramData\chocolatey\bin
44+
# # - C:\ProgramData\chocolatey\lib
45+
# # build_script:
46+
# # - call "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"
47+
# # # Install GNU patch as applying patches with git fails in BladeRF tree
48+
# # - choco install patch
49+
# # - git submodule update --init --recursive
50+
# # - mkdir build && cd build
51+
# # - cmake .. -G "%CMAKE_GENERATOR%" %CMAKE_CUSTOM_OPTIONS%
52+
# # - cmake --build . --config Release --target package
53+
# # artifacts: # push installer executable
54+
# # path: build\*.exe
55+
# # name: installer
56+
# # deploy:
57+
# # release: sdrangel-v$(appveyor_build_version)
58+
# # description: 'SDRangel Windows'
59+
# # provider: GitHub
60+
# # auth_token:
61+
# # secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
62+
# # artifact: installer, portable
63+
# # draft: false
64+
# # prerelease: false
65+
# # tag: $(APPVEYOR_REPO_TAG_NAME) # will not work until tag is pushed
66+
# # on:
67+
# # APPVEYOR_REPO_TAG: true # deploy on tag push only
68+
# # branch: master # release from master branch only
69+
# - matrix:
70+
# only:
71+
# - TARGET: ubuntu2204prod
72+
# clone_folder: /home/appveyor/projects
73+
# cache:
74+
# - $HOME/external/
75+
# install:
76+
# - sh: sudo apt-get update
77+
# - sh: echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
78+
# # not sdrplay with soapysdr; libairspyhf-dev is too old (no lna)
79+
# - sh: |
80+
# sudo apt-get -y install build-essential cmake git xxd \
81+
# devscripts fakeroot debhelper libfftw3-dev qtbase5-dev libopengl-dev libqt5opengl5-dev \
82+
# qttools5-dev qttools5-dev-tools qtmultimedia5-dev libqt5multimedia5-plugins libqt5websockets5-dev \
83+
# libqt5quick5 qtwebengine5-dev qtbase5-private-dev \
84+
# qml-module-qtlocation qml-module-qtpositioning qml-module-qtquick-window2 qml-module-qtquick-dialogs \
85+
# qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-layouts qml-module-qtgraphicaleffects \
86+
# libqt5serialport5-dev qtdeclarative5-dev qtpositioning5-dev qtlocation5-dev \
87+
# libqt5charts5-dev libqt5texttospeech5-dev libqt5gamepad5-dev libqt5svg5-dev libfaad-dev libflac-dev zlib1g-dev \
88+
# libusb-1.0-0-dev libhidapi-dev libboost-all-dev libasound2-dev libopencv-dev libopencv-imgcodecs-dev \
89+
# libxml2-dev bison flex ffmpeg libpostproc-dev libavcodec-dev libavformat-dev \
90+
# libopus-dev libcodec2-dev libairspy-dev libhackrf-dev \
91+
# libbladerf-dev libsoapysdr-dev libiio-dev libuhd-dev libhamlib-dev \
92+
# python3-mako python3-cheetah python3-numpy \
93+
# autoconf automake libtool ninja-build libclang1-11
94+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_cm256cc.sh; fi
95+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_mbelib.sh; fi
96+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_serialdv.sh; fi
97+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_dsdcc.sh; fi
98+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_perseus-sdr.sh; fi
99+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_xtrx-sdr.sh; fi
100+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_airspyhf.sh; fi
101+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_rtlsdr.sh; fi
102+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_limesuite.sh; fi
103+
# - sh: if [[ ! "${CMAKE_CUSTOM_OPTIONS}" =~ "ENABLE_EXTERNAL_LIBRARIES" ]]; then bash cmake/ci/build_ggmorse.sh; fi
104+
# - sh: bash cmake/ci/build_sdrplay.sh
105+
# before_build:
106+
# - sh: bash -c export
107+
# - sh: bash -c pwd
108+
# build_script:
109+
# - sh: ./cmake/ci/build_sdrangel.sh
110+
# test_script:
111+
# # debian build path
112+
# - sh: ./obj-x86_64-linux-gnu/sdrangelbench
113+
# after_build:
114+
# - sh: mkdir sdrangel-${APPVEYOR_BUILD_VERSION}
115+
# - sh: cp ../*.deb ../*.build ../*.buildinfo ../*.changes sdrangel-${APPVEYOR_BUILD_VERSION}
116+
# - sh: tar -czf sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz sdrangel-${APPVEYOR_BUILD_VERSION}
117+
# artifacts:
118+
# - path: sdrangel-${APPVEYOR_BUILD_VERSION}.tar.gz
119+
# name: package2204
120+
# # deploy:
121+
# # release: sdrangel-v$(appveyor_build_version)
122+
# # description: 'SDRangel Ubuntu 22.04'
123+
# # provider: GitHub
124+
# # auth_token:
125+
# # secure: kyU5TaXRoily6q/QLRLqal2xCFGWEdnb8AJIu7FknsUQyj1wjRGmqC2My+Wfszod
126+
# # artifact: archive
127+
# # draft: false
128+
# # prerelease: false
129+
# # on:
130+
# # APPVEYOR_REPO_TAG: true # deploy on tag push only
131+
# # branch: master # release from master branch only
132+
# deploy:
133+
# provider: Environment
134+
# name: f4exb
135+
# - matrix:
136+
# only:
137+
# - TARGET: ubuntu2204docker
138+
# before_build:
139+
# - git clone https://github.com/f4exb/sdrangel-docker.git
140+
# - cd sdrangel-docker
141+
# build_script:
142+
# - cd sdrangel
143+
# - ./build_vanilla.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}
144+
# - ./build_server.sh -T ${APPVEYOR_PULL_REQUEST_HEAD_COMMIT:-${APPVEYOR_REPO_COMMIT}}

CHANGELOG

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
sdrangel (7.22.4-1) unstable; urgency=medium
2+
3+
* Use macos-12 for Mac x86 build. PR #2321
4+
* Workaround for "hdiutil: create failed - Resource busy"
5+
* Pager: Add alpha and numeric columns. Implements #2319. PR #2320
6+
* Added qtwebchannel dependecy to fix missing 3d Map and Sky Map from Windows release. PR #2316
7+
* Removed .deb package build from Appveyor
8+
9+
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Mom, 11 Nov 2024 08:42:03 +0100
10+
111
sdrangel (7.22.3-1) unstable; urgency=medium
212

313
* Add deb dependencies for pipewire. PR #2314
@@ -18,7 +28,7 @@ sdrangel (7.22.3-1) unstable; urgency=medium
1828
* Update Qt optional packages for 6.8 , PR #2287
1929
* Use Qt 6.8 for Windows build. PR #2287
2030

21-
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sat, 09 Nov 2024 17:30:44 +0100
31+
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sat, 09 Nov 2024 17:30:44 +0100
2232

2333
sdrangel (7.22.2-1) unstable; urgency=medium
2434

@@ -41,7 +51,7 @@ sdrangel (7.22.2-1) unstable; urgency=medium
4151
* RemoteTCPInput: Add wss protocol support. PR #2270
4252
* Fix DeviceAPI::deserialize. Fixes #2266. PR #2267
4353

44-
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 20 Oct 2024 08:26:38 +0200
54+
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 20 Oct 2024 08:26:38 +0200
4555

4656
sdrangel (7.22.1-1) unstable; urgency=medium
4757

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
2020
# configure version
2121
set(sdrangel_VERSION_MAJOR "7")
2222
set(sdrangel_VERSION_MINOR "22")
23-
set(sdrangel_VERSION_PATCH "3")
23+
set(sdrangel_VERSION_PATCH "4")
2424
set(sdrangel_VERSION_SUFFIX "")
2525

2626
# SDRAngel cmake options

debian/changelog

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
sdrangel (7.22.4-1) unstable; urgency=medium
2+
3+
* Use macos-12 for Mac x86 build. PR #2321
4+
* Workaround for "hdiutil: create failed - Resource busy"
5+
* Pager: Add alpha and numeric columns. Implements #2319. PR #2320
6+
* Added qtwebchannel dependecy to fix missing 3d Map and Sky Map from Windows release. PR #2316
7+
* Removed .deb package build from Appveyor
8+
9+
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Mom, 11 Nov 2024 08:42:03 +0100
10+
111
sdrangel (7.22.3-1) unstable; urgency=medium
212

313
* Add deb dependencies for pipewire. PR #2314
@@ -18,7 +28,7 @@ sdrangel (7.22.3-1) unstable; urgency=medium
1828
* Update Qt optional packages for 6.8 , PR #2287
1929
* Use Qt 6.8 for Windows build. PR #2287
2030

21-
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sat, 09 Nov 2024 17:30:44 +0100
31+
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sat, 09 Nov 2024 17:30:44 +0100
2232

2333
sdrangel (7.22.2-1) unstable; urgency=medium
2434

@@ -41,7 +51,7 @@ sdrangel (7.22.2-1) unstable; urgency=medium
4151
* RemoteTCPInput: Add wss protocol support. PR #2270
4252
* Fix DeviceAPI::deserialize. Fixes #2266. PR #2267
4353

44-
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 20 Oct 2024 08:26:38 +0200
54+
-- Edouard Griffiths, F4EXB <f4exb06@gmail.com> Sun, 20 Oct 2024 08:26:38 +0200
4555

4656
sdrangel (7.22.1-1) unstable; urgency=medium
4757

gitdiff.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ PLUGINS=$(git diff --name-only ${1}..${2} | grep plugins/ | cut -d'/' -f2,3 | so
44
for plugin in $PLUGINS
55
do
66
FILE=$(find $BASEDIR/plugins/$plugin -name "*plugin.cpp")
7-
sed -i -E "s/QStringLiteral\(\"7\.(.*)\"\)/QStringLiteral\(\"7\.22\.3\"\)/" $FILE
7+
sed -i -E "s/QStringLiteral\(\"7\.(.*)\"\)/QStringLiteral\(\"7\.22\.4\"\)/" $FILE
88
done
99

plugins/channelrx/demodpager/pagerdemodplugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
const PluginDescriptor PagerDemodPlugin::m_pluginDescriptor = {
3434
PagerDemod::m_channelId,
3535
QStringLiteral("Pager Demodulator"),
36-
QStringLiteral("7.22.3"),
36+
QStringLiteral("7.22.4"),
3737
QStringLiteral("(c) Jon Beniston, M7RCE"),
3838
QStringLiteral("https://github.com/f4exb/sdrangel"),
3939
true,

0 commit comments

Comments
 (0)