Merge branch 'analogdevicesinc:master' into master

.github/workflows/dockerimage.yml

@@ -21,3 +21,12 @@ jobs:
       with:
         name: Scopy.flatpak
         path: ${{ github.workspace }}/Scopy.flatpak
+    - name: Upload master flatpak build to continous prerelease
+      if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+      run: |
+        wget https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_linux_amd64.tar.gz 
+        tar xvf ghr_v0.13.0_linux_amd64.tar.gz
+        ghr_v0.13.0_linux_amd64/ghr -u ${{ github.repository_owner }} -r scopy -name "Continuous build" -b "Latest succesful master build " -prerelease -debug -replace continous ${{ github.workspace }}/Scopy.flatpak
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

CI/appveyor/build_appveyor_macos.sh

@@ -21,8 +21,13 @@ mkdir -p build
 cd build
 
 if [ "$APPVEYOR" == "true" ] ; then
+	MACOS_VERSION=$(/usr/libexec/PlistBuddy -c "Print:ProductVersion" /System/Library/CoreServices/SystemVersion.plist)
+	if [[ "$MACOS_VERSION" == "10.14."* ]] ; then
+		export MACOSX_DEPLOYMENT_TARGET=10.13
+	fi
 	cmake ..
 	make -j${NUM_JOBS}
+	otool -l ./Scopy.app/Contents/MacOS/Scopy # for debugging
 else
 	cmake -DCMAKE_PREFIX_PATH="$STAGINGDIR;${QT_PATH}/lib/cmake" -DCMAKE_INSTALL_PREFIX="$STAGINGDIR" \
 		-DCMAKE_EXE_LINKER_FLAGS="-L${STAGINGDIR}/lib" ..

CI/appveyor/build_appveyor_mingw.sh

@@ -11,17 +11,25 @@ WORKDIR=${PWD}
 echo BUILD_NO $BUILD_NO
 JOBS=$(nproc)
 
+
 wget http://swdownloads.analog.com/cse/m1k/drivers/dpinst.zip
 wget http://swdownloads.analog.com/cse/m1k/drivers/dfu-util.zip
 7z x -y "dpinst.zip" -o"/c/dpinst"
 7z x -y "dfu-util.zip" -o"/c/dfu-util"
 
+# github release upload tool install
+wget https://github.com/tcnksm/ghr/releases/download/v0.13.0/ghr_v0.13.0_windows_amd64.zip
+7z x -y ghr_v0.13.0_windows_amd64.zip -o"/c/ghr"
+UPLOAD_TOOL=/c/ghr/ghr_v0.13.0_windows_amd64/ghr.exe
+
+
 CC=/${MINGW_VERSION}/bin/${ARCH}-w64-mingw32-gcc.exe
 CXX=/${MINGW_VERSION}/bin/${ARCH}-w64-mingw32-g++.exe
 CMAKE_OPTS="\
 	-DCMAKE_C_COMPILER:FILEPATH=${CC} \
 	-DCMAKE_CXX_COMPILER:FILEPATH=${CXX} \
 	-DPKG_CONFIG_EXECUTABLE=/$MINGW_VERSION/bin/pkg-config.exe \
+	-DCMAKE_CXX_FLAGS="-fno-omit-frame-pointer" \
 	-DCMAKE_PREFIX_PATH=/c/msys64/$MINGW_VERSION/lib/cmake \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	"
@@ -33,8 +41,9 @@ SCOPY_CMAKE_OPTS="\
 	-DPYTHON_EXECUTABLE=/$MINGW_VERSION/bin/python3.exe \
 	"
 
-PYTHON_LOCATION=/$MINGW_VERSION/lib/python3.8
-PYTHON_FILES="${PYTHON_LOCATION}/*.py ${PYTHON_LOCATION}/asyncio ${PYTHON_LOCATION}/collections ${PYTHON_LOCATION}/concurrent ${PYTHON_LOCATION}/config-3.* ${PYTHON_LOCATION}/ctypes ${PYTHON_LOCATION}/distutils ${PYTHON_LOCATION}/encodings ${PYTHON_LOCATION}/lib-dynload ${PYTHON_LOCATION}/site-packages"
+#PYTHON_LOCATION=/$MINGW_VERSION/lib/python3.8
+#PYTHON_FILES="${PYTHON_LOCATION}/*.py ${PYTHON_LOCATION}/asyncio ${PYTHON_LOCATION}/collections ${PYTHON_LOCATION}/concurrent ${PYTHON_LOCATION}/config-3.* ${PYTHON_LOCATION}/ctypes ${PYTHON_LOCATION}/distutils ${PYTHON_LOCATION}/encodings ${PYTHON_LOCATION}/lib-dynload ${PYTHON_LOCATION}/site-packages"
+PYTHON_FILES=/$MINGW_VERSION/lib/python3.*
 
 DLL_DEPS=$(cat ${WORKDIR}/CI/appveyor/mingw_dll_deps)
 DLL_DEPS="$DLL_DEPS $PYTHON_FILES"
@@ -106,6 +115,13 @@ dump_syms -r /c/$DEST_FOLDER/Scopy.exe > /c/$DEST_FOLDER/Scopy.exe.sym
 mkdir /c/$DEBUG_FOLDER
 mv /c/$DEST_FOLDER/Scopy.exe.sym /c/$DEBUG_FOLDER
 mv /c/$DEST_FOLDER/.debug /c/$DEBUG_FOLDER
+/c/cv2pdb/cv2pdb /c/$DEST_FOLDER/Scopy.exe
+/c/cv2pdb/cv2pdb /c/$DEST_FOLDER/libm2k.dll
+/c/cv2pdb/cv2pdb /c/$DEST_FOLDER/libiio.dll
+/c/cv2pdb/cv2pdb /c/$DEST_FOLDER/libgnuradio-m2k.dll
+/c/cv2pdb/cv2pdb /c/$DEST_FOLDER/libgnuradio-scopy.dll
+cp -R /c/projects/scopy /c/$DEBUG_FOLDER/scopy
+mv /c/$DEST_FOLDER/*.pdb /c/$DEBUG_FOLDER
 
 cp -r /c/projects/scopy/drivers /c/$DEST_FOLDER
 if [[ $ARCH_BIT == "64" ]]; then
@@ -128,3 +144,16 @@ appveyor AddMessage "11. Creating installer"
 iscc //Qp /c/$BUILD_FOLDER/scopy-$ARCH_BIT.iss
 appveyor PushArtifact $DEPLOY_FILE
 appveyor AddMessage "12. Job complete"
+
+if [ "$APPVEYOR_REPO_BRANCH" = "master" ]; then
+	echo Identified master branch
+	if [ -z "$APPVEYOR_PULL_REQUEST_NUMBER" ]; then
+		echo Not a pull request
+		mkdir /c/to_deploy
+		cp /c/scopy-${ARCH_BIT}bit.zip /c/to_deploy
+		cp /c/debug-${ARCH_BIT}bit.zip /c/to_deploy
+		cp $DEPLOY_FILE /c/to_deploy
+		$UPLOAD_TOOL -u $APPVEYOR_ACCOUNT_NAME -r $APPVEYOR_PROJECT_NAME -name "Continuous build" -b "Latest succesful master build " -prerelease -debug -replace continous /c/to_deploy
+	fi
+fi
+

CI/appveyor/data

@@ -0,0 +1 @@
+vineri 26 martie 2021, 13:48:33 +0200

CI/appveyor/install_macos_deps.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LIBIIO_BRANCH=master
+LIBIIO_VERSION=v0.21
 LIBAD9361_BRANCH=master
 LIBM2K_BRANCH=master
 GRIIO_BRANCH=upgrade-3.8
@@ -11,20 +11,22 @@ GRM2K_BRANCH=master
 QWT_BRANCH=qwt-6.1-multiaxes
 QWTPOLAR_BRANCH=master # not used
 LIBSIGROK_BRANCH=master
-LIBSIGROKDECODE_BRANCH=master #not used
+LIBSIGROKDECODE_BRANCH=master
 BOOST_VERSION_FILE=1_73_0
 BOOST_VERSION=1.73.0
 LIBTINYIIOD_BRANCH=master
 
 PYTHON="python3"
 PACKAGES=" ${QT_FORMULAE} pkg-config cmake fftw bison gettext autoconf automake libtool libzip glib libusb glog $PYTHON"
-PACKAGES="$PACKAGES doxygen wget gnu-sed libmatio dylibbundler libxml2"
+PACKAGES="$PACKAGES doxygen wget gnu-sed libmatio dylibbundler libxml2 ghr"
 
 set -e
 cd ~
 WORKDIR=${PWD}
 NUM_JOBS=4
 
+brew update
+brew search ${QT_FORMULAE}
 brew_install_or_upgrade() {
 	brew install $1 || \
 		brew upgrade $1 || \
@@ -63,10 +65,12 @@ QMAKE="$(command -v qmake)"
 CMAKE_OPTS="-DCMAKE_PREFIX_PATH=$STAGINGDIR -DCMAKE_INSTALL_PREFIX=$STAGINGDIR"
 
 build_libiio() {
-	echo "### Building libiio - branch $LIBIIO_BRANCH"
+	echo "### Building libiio - version $LIBIIO_VERSION"
 
 	cd ~
-	git clone --depth 1 https://github.com/analogdevicesinc/libiio.git -b $LIBIIO_BRANCH ${WORKDIR}/libiio
+	git clone https://github.com/analogdevicesinc/libiio.git ${WORKDIR}/libiio
+	cd ${WORKDIR}/libiio
+	git checkout $LIBIIO_VERSION
 
 	mkdir ${WORKDIR}/libiio/build-${ARCH}
 	cd ${WORKDIR}/libiio/build-${ARCH}
@@ -137,7 +141,7 @@ build_boost() {
 	echo "### Building boost - version $BOOST_VERSION_FILE"
 
 	cd ~
-	wget https://dl.bintray.com/boostorg/release/$BOOST_VERSION/source/boost_$BOOST_VERSION_FILE.tar.gz
+	wget https://boostorg.jfrog.io/artifactory/main/release/$BOOST_VERSION/source/boost_$BOOST_VERSION_FILE.tar.gz
 	tar -xzf boost_$BOOST_VERSION_FILE.tar.gz
 	cd boost_$BOOST_VERSION_FILE
 	patch -p1 <  ${WORKDIR}/projects/scopy/CI/appveyor/patches/boost-darwin.patch
@@ -240,11 +244,11 @@ build_libsigrokdecode() {
 	echo "### Building libsigrokdecode - branch $LIBSIGROKDECODE_BRANCH"
 
 	git clone --depth 1 https://github.com/sigrokproject/libsigrokdecode.git -b $LIBSIGROKDECODE_BRANCH ${WORKDIR}/libsigrokdecode
-	mkdir -p ${WORKDIR}/libsigrokdecode/build-${ARCH}
 	cd ${WORKDIR}/libsigrokdecode
 
 	./autogen.sh
 	./configure
+
 	sudo make $JOBS install
 }
 
@@ -257,14 +261,14 @@ patch_qwtpolar_mac() {
 +++ b/qwtpolarconfig.pri
 @@ -16,7 +16,9 @@ QWT_POLAR_VER_PAT      = 1
  QWT_POLAR_VERSION      = \$\${QWT_POLAR_VER_MAJ}.\$\${QWT_POLAR_VER_MIN}.\$\${QWT_POLAR_VER_PAT}
- 
+
  unix {
 -    QWT_POLAR_INSTALL_PREFIX    = /usr/local/qwtpolar-\$\$QWT_POLAR_VERSION
 +    QWT_POLAR_INSTALL_PREFIX    = $STAGINGDIR
 +    QMAKE_CXXFLAGS              = -I${STAGINGDIR}/include
 +    QMAKE_LFLAGS                = ${STAGINGDIR}/lib/libqwt*dylib
  }
- 
+
  win32 {
 EOF
 }

CI/appveyor/install_msys_deps.sh

@@ -7,7 +7,15 @@ echo "Download and install pre-compiled libraries ... "
 wget "https://ci.appveyor.com/api/projects/$SCOPY_MINGW_BUILD_DEPS_FORK/scopy-mingw-build-deps/artifacts/scopy-$MINGW_VERSION-build-deps-pacman.txt?branch=$SCOPY_MINGW_BUILD_DEPS_BRANCH&job=Environment: MINGW_VERSION=$MINGW_VERSION, ARCH=$ARCH" -O /tmp/scopy-$MINGW_VERSION-build-deps-pacman.txt
 wget "https://ci.appveyor.com/api/projects/$SCOPY_MINGW_BUILD_DEPS_FORK/scopy-mingw-build-deps/artifacts/scopy-$MINGW_VERSION-build-deps.tar.xz?branch=$SCOPY_MINGW_BUILD_DEPS_BRANCH&job=Environment: MINGW_VERSION=$MINGW_VERSION, ARCH=$ARCH" -O /tmp/scopy-$MINGW_VERSION-build-deps.tar.xz
 wget "https://ci.appveyor.com/api/projects/$SCOPY_MINGW_BUILD_DEPS_FORK/scopy-mingw-build-deps/artifacts/scopy-mingw-build-status?branch=$SCOPY_MINGW_BUILD_DEPS_BRANCH&job=Environment: MINGW_VERSION=$MINGW_VERSION, ARCH=$ARCH" -O /tmp/scopy-mingw-build-status
+
+
 cd /c
+
+pacman -S --noconfirm unzip
+wget https://swdownloads.analog.com/cse/scopydeps/cv2pdb.zip
+unzip cv2pdb.zip
+#/c/cv2pdb/cv2pdb.exe
+
 tar xJf /tmp/scopy-$MINGW_VERSION-build-deps.tar.xz
 
 cat /tmp/scopy-mingw-build-status
@@ -16,6 +24,7 @@ SCOPY_MINGW_BUILD_DEPS_PACMAN=$(</tmp/scopy-$MINGW_VERSION-build-deps-pacman.txt
 PACMAN_SYNC_DEPS="
 	$SCOPY_MINGW_BUILD_DEPS_PACMAN\
 	mingw-w64-$ARCH-matio \
+	unzip \
 "
 
 #	/c/old_msys_deps_$MINGW_VERSION/mingw-w64-$ARCH-boost-1.72.0-3-any.pkg.tar.zst \
@@ -27,7 +36,7 @@ PACMAN_REPO_DEPS="
 
 PATH=/c/msys64/$MINGW_VERSION/bin:$PATH
 echo "### Installing the dependencies"
-pacman --noconfirm --needed -Sy $PACMAN_SYNC_DEPS
+pacman --noconfirm --needed -S $PACMAN_SYNC_DEPS
 pacman --noconfirm -U  $PACMAN_REPO_DEPS
 
 # Hack: Qt5Qml CMake script throws errors when loading its plugins. So let's just drop those plugins.

CI/appveyor/install_ubuntu_18_deps.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LIBIIO_BRANCH=master
+LIBIIO_VERSION=v0.21
 LIBAD9361_BRANCH=master
 GLOG_BRANCH=v0.4.0
 LIBM2K_BRANCH=master
@@ -12,7 +12,7 @@ GRM2K_BRANCH=master
 QWT_BRANCH=qwt-6.1-multiaxes
 QWTPOLAR_BRANCH=master # not used
 LIBSIGROK_BRANCH=master
-LIBSIGROKDECODE_BRANCH=master #not used
+LIBSIGROKDECODE_BRANCH=master
 LIBTINYIIOD_BRANCH=master
 
 set -e
@@ -45,10 +45,12 @@ install_apt() {
 }
 
 build_libiio() {
-	echo "### Building libiio - branch $LIBIIO_BRANCH"
+	echo "### Building libiio - version $LIBIIO_VERSION"
 
 	cd ~
-	git clone --depth 1 https://github.com/analogdevicesinc/libiio.git -b $LIBIIO_BRANCH ${WORKDIR}/libiio
+	git clone https://github.com/analogdevicesinc/libiio.git ${WORKDIR}/libiio
+	cd ${WORKDIR}/libiio
+	git checkout $LIBIIO_VERSION
 
 	mkdir ${WORKDIR}/libiio/build-${ARCH}
 	cd ${WORKDIR}/libiio/build-${ARCH}
@@ -197,15 +199,13 @@ build_libsigrok() {
 build_libsigrokdecode() {
 	echo "### Building libsigrokdecode - branch $LIBSIGROKDECODE_BRANCH"
 
-	mkdir -p ${WORKDIR}/libsigrokdecode/build-${ARCH}
-	cd ${WORKDIR}/libsigrokdecode
-
-	wget http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.3.tar.gz -O- \
-		| tar xz --strip-components=1 -C ${WORKDIR}/libsigrokdecode
+	git clone --depth 1 https://github.com/sigrokproject/libsigrokdecode.git -b $LIBSIGROKDECODE_BRANCH ${WORKDIR}/libsigrokdecode
 
-#	cd build-${ARCH}
+	cd ${WORKDIR}/libsigrokdecode
 
+	./autogen.sh
 	./configure
+
 	sudo make $JOBS install
 	#DESTDIR=${WORKDIR} make $JOBS install
 }

CI/appveyor/install_ubuntu_20_deps.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LIBIIO_BRANCH=master
+LIBIIO_VERSION=v0.21
 LIBAD9361_BRANCH=master
 GLOG_BRANCH=v0.4.0
 LIBM2K_BRANCH=master
@@ -12,7 +12,7 @@ GRM2K_BRANCH=master
 QWT_BRANCH=qwt-6.1-multiaxes
 QWTPOLAR_BRANCH=master # not used
 LIBSIGROK_BRANCH=master
-LIBSIGROKDECODE_BRANCH=master #not used
+LIBSIGROKDECODE_BRANCH=master
 LIBTINYIIOD_BRANCH=master
 
 set -e
@@ -36,10 +36,12 @@ install_apt() {
 }
 
 build_libiio() {
-	echo "### Building libiio - branch $LIBIIO_BRANCH"
+	echo "### Building libiio - version $LIBIIO_VERSION"
 
 	cd ~
-	git clone --depth 1 https://github.com/analogdevicesinc/libiio.git -b $LIBIIO_BRANCH ${WORKDIR}/libiio
+	git clone https://github.com/analogdevicesinc/libiio.git ${WORKDIR}/libiio
+	cd ${WORKDIR}/libiio
+	git checkout $LIBIIO_VERSION
 
 	mkdir ${WORKDIR}/libiio/build-${ARCH}
 	cd ${WORKDIR}/libiio/build-${ARCH}
@@ -188,15 +190,13 @@ build_libsigrok() {
 build_libsigrokdecode() {
 	echo "### Building libsigrokdecode - branch $LIBSIGROKDECODE_BRANCH"
 
-	mkdir -p ${WORKDIR}/libsigrokdecode/build-${ARCH}
-	cd ${WORKDIR}/libsigrokdecode
-
-	wget http://sigrok.org/download/source/libsigrokdecode/libsigrokdecode-0.5.3.tar.gz -O- \
-		| tar xz --strip-components=1 -C ${WORKDIR}/libsigrokdecode
+	git clone --depth 1 https://github.com/sigrokproject/libsigrokdecode.git -b $LIBSIGROKDECODE_BRANCH ${WORKDIR}/libsigrokdecode
 
-#	cd build-${ARCH}
+	cd ${WORKDIR}/libsigrokdecode
 
+	./autogen.sh
 	./configure
+
 	sudo make $JOBS install
 	#DESTDIR=${WORKDIR} make $JOBS install
 }

CI/appveyor/package_darwin.sh

@@ -104,3 +104,14 @@ sudo python /tmp/macdeployqtfix.py ./Scopy.app/Contents/MacOS/Scopy ./Scopy.app/
 
 sudo macdeployqt Scopy.app -dmg
 ls
+
+UPLOAD_TOOL=ghr
+
+if [ "$APPVEYOR_REPO_BRANCH" = "master" ]; then
+	echo Identified master branch
+	if [ -z "$APPVEYOR_PULL_REQUEST_NUMBER" ]; then
+		echo Not a pull request
+		$UPLOAD_TOOL -u $APPVEYOR_ACCOUNT_NAME -r $APPVEYOR_PROJECT_NAME -name "Continuous build" -b "Latest succesful master build " -prerelease -debug -replace continous $DEPLOY_FILE
+	fi
+fi
+

CMakeLists.txt

@@ -83,6 +83,7 @@ endif (MSVC)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5 COMPONENTS LinguistTools REQUIRED)
 find_package(Qt5Concurrent REQUIRED)
+find_package(Qt5Network REQUIRED)
 
 FILE(GLOB TS_FILES ${CMAKE_SOURCE_DIR}/resources/translations/*.ts)
 set_source_files_properties(${TS_FILES} PROPERTIES OUTPUT_LOCATION ${CMAKE_CURRENT_BINARY_DIR})
@@ -192,6 +193,7 @@ pkg_check_modules(SIGCPP REQUIRED sigc++-2.0)
 pkg_check_modules(LIBSIGROK_DECODE REQUIRED libsigrokdecode)
 pkg_get_variable(LIBSIGROK_DECODERS_DIR libsigrokdecode decodersdir)
 message(CMAKE_PATH ${CMAKE_PREFIX_PATH})
+message(NETWORK ${Qt5Network_INCLUDE_DIRS} ${Qt5Network_LIBRARIES})
 include_directories(
 	${Boost_INCLUDE_DIRS}
 	${Qt5Widgets_INCLUDE_DIRS}
@@ -371,6 +373,7 @@ target_link_libraries(${PROJECT_NAME} LINK_PRIVATE
 		${Qt5Concurrent_LIBRARIES}
 		${Qt5Qml_LIBRARIES}
 		${Qt5UiTools_LIBRARIES}
+		${Qt5Network_LIBRARIES}
 		gnuradio::gnuradio-runtime
 		gnuradio::gnuradio-analog
 		gnuradio::gnuradio-blocks

appveyor.yml

@@ -23,6 +23,17 @@ environment:
           BUILD_DEPS_CMD: "C:\\msys64\\usr\\bin\\bash CI\\appveyor\\build_appveyor_mingw.sh"
           DEPLOY_FILE: "C:\\scopy-%ARCH_BIT%-setup.exe"
 
+        - ARCH: x86_64
+          ARCH_BIT: 64
+          APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave
+          BUILD_DEPS_CMD: "/Users/appveyor/projects/scopy/CI/appveyor/install_macos_deps.sh"
+          BUILD_CMD: "/Users/appveyor/projects/scopy/CI/appveyor/build_appveyor_macos.sh"
+          PACKAGE_CMD: "/Users/appveyor/projects/scopy/CI/appveyor/package_darwin.sh"
+          DEPLOY_FILE: "/Users/appveyor/projects/scopy/build/Scopy.dmg"
+          C_COMPILER: -DCMAKE_C_COMPILER=/usr/bin/gcc
+          CXX_COMPILER: -DCMAKE_CXX_COMPILER=/usr/bin/g++
+          QT_FORMULAE: "qt5"
+
         - ARCH: x86_64
           ARCH_BIT: 64
           APPVEYOR_BUILD_WORKER_IMAGE: macos
@@ -65,8 +76,14 @@ install:
     - cmd: choco install InnoSetup
 
 build_script:
+    # Update MSYS2 - https://www.msys2.org/docs/ci/#appveyor
+    - cmd: C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"  # Core update (in case any core packages are outdated)
+    - cmd: C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syuu"  # Normal update
+
+    # Then run your code
+    - cmd: set CHERE_INVOKING='yes'  # Preserve the current working directory
+    - cmd: set MSYSTEM='MINGW64'  # Start a 64 bit Mingw environment
     - cmd: C:\msys64\usr\bin\bash -lc "/c/projects/scopy/CI/appveyor/extract_msys_deps.sh"
-    - cmd: C:\msys64\usr\bin\bash -lc "pacman --noconfirm -Syu"
     - cmd: set PATH=%PATH%;"C:\Program Files (x86)\Inno Setup 6"
     - cmd: "%BUILD_DEPS_CMD%"