ci/appimage-x86_86: add compatibility with libiio v1

Signed-off-by: Bindea Cristian <cristian.bindea@analog.com>

Author: bindea-cristian

.github/workflows/build_ubuntu_appimage.yml

@@ -3,15 +3,15 @@ name: Osc x86_64 AppImage Build
 on: [push, pull_request]
 
 env:
-  BUILD_HOST: ubuntu-22.04
+  BUILD_HOST: ubuntu-24.04
   USERNAME: github-actions
 
 jobs:
 
   build_osc_x86-64_appimage:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container:
-        image: cristianbindea/osc-ubuntu20:latest
+        image: cristianbindea/osc-ubuntu20-libiio1:latest
         options: --user root
 
     steps:
@@ -25,7 +25,7 @@ jobs:
           run: |
                 cd $GITHUB_WORKSPACE
                 ./CI/appimage_x86_64/build_osc.sh
-                ./CI/appimage_x86_64/create_appimage.sh get_tools create_appdir create_appimage move_appimage
+                ./CI/appimage_x86_64/create_appimage.sh run_workflow
 
         - name: Set short git commit SHA
           shell: bash

CI/appimage_x86_64/create_appimage.sh

@@ -65,8 +65,23 @@ create_appdir()
 	cp -R $APP_DIR/usr/share/icons $APP_DIR/usr/bin
 	cp $SRC_DIR/build/styles.css $APP_DIR/usr/bin
 
-	cp /usr/local/lib/libad9361.so $APP_DIR/usr/lib
-	cp /usr/local/lib/libad9166.so $APP_DIR/usr/lib
+	cp /usr/local/lib/libad9361.so.0.2 $APP_DIR/usr/lib
+	cp /usr/local/lib/libad9166.so.0.2 $APP_DIR/usr/lib
+	cp /usr/lib/x86_64-linux-gnu/libiio.so.0 $APP_DIR/usr/lib
+
+	# Create the necessary symlinks
+	pushd $APP_DIR/usr/lib
+	ln -s libiio.so.1 libiio.so
+	ln -s libiio.so.1 libiio.so.1.0
+	ln -s libad9361.so.0.2 libad9361.so
+	ln -s libad9361.so.0.2 libad9361.so.0
+	ln -s libad9361.so.0.2 libad9361-iio.so
+	ln -s libad9361.so.0.2 libad9361-iio.so.0
+	ln -s libad9166.so.0.2 libad9166.so
+	ln -s libad9166.so.0.2 libad9166.so.0
+	ln -s libad9166.so.0.2 libad9166-iio.so
+	ln -s libad9166.so.0.2 libad9166-iio.so.0
+	popd
 
 	popd
 }
@@ -82,6 +97,12 @@ move_appimage(){
 	chmod +x $SRC_DIR/ADI_IIO_Oscilloscope-x86_64.AppImage
 }
 
+run_workflow(){
+	get_tools
+	create_appdir
+	create_appimage
+	move_appimage
+}
 for arg in $@; do
 	$arg
 done

CI/appimage_x86_64/create_docker_image.sh

@@ -2,7 +2,7 @@
 
 SRC_SCRIPT=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-docker build -t cristianbindea/osc-ubuntu20:testing -f docker/Dockerfile .
+docker build -t cristianbindea/osc-ubuntu20-libiio1:testing -f docker/Dockerfile .
 
 # # build the image using old backend
-# DOCKER_BUILDKIT=0 docker build -t cristianbindea/osc-ubuntu20:testing -f docker/Dockerfile .
+# DOCKER_BUILDKIT=0 docker build -t cristianbindea/osc-ubuntu20-libiio1:testing -f docker/Dockerfile .

CI/appimage_x86_64/docker/Dockerfile

@@ -26,7 +26,7 @@ USER $USER
 WORKDIR /home/${USER}/scripts
 COPY install_deps.sh .
 RUN sudo chown -R $USER:$USER /home/${USER}/scripts
-RUN ./install_deps.sh install_apt_pkgs install_gtkdatabox install_libserialport install_libiio install_libad9361 install_libad9166
+RUN ./install_deps.sh build_all
 WORKDIR /home/${USER}
 
 # Clean image

CI/appimage_x86_64/install_deps.sh

@@ -9,8 +9,10 @@ STAGING_AREA=$SRC_SCRIPT/staging
 
 LIBSERIALPORT_BRANCH="master"
 LIBIIO_BRANCH="main"
-LIBAD9361_BRANCH="main"
-LIBAD9166_BRANCH="main"
+LIBAD9361_BRANCH="staging/libiio1-support"
+LIBAD9166_BRANCH="staging/libiio1-support"
+
+BUILD_STATUS_FILE=$SRC_SCRIPT/build-status-appimage-x86_64
 
 JOBS="-j14"
 
@@ -37,10 +39,16 @@ install_apt_pkgs() {
         	git \
         	libtool \
         	libfuse2 \
-        	dpkg-dev
+		dpkg-dev \
+		libzstd-dev \
+		libserialport-dev
         "
         sudo apt-get update
         sudo DEBIAN_FRONTEND=noninteractive apt-get install -y $APT_PKGS
+
+	echo "apt packages installed" >> $BUILD_STATUS_FILE
+	apt list --installed >> $BUILD_STATUS_FILE
+	echo "" >> $BUILD_STATUS_FILE
 }
 
 install_gtkdatabox() {
@@ -53,6 +61,7 @@ install_gtkdatabox() {
         cd gtkdatabox-1.0.0
         ./configure
 	sudo make $JOBS install
+	echo "gtkdatabox-1.0.0: https://downloads.sourceforge.net/project/gtkdatabox/gtkdatabox-1/gtkdatabox-1.0.0.tar.gz" >> $BUILD_STATUS_FILE
 	popd
 }
 
@@ -63,9 +72,10 @@ install_libiio() {
 	cd libiio
 	mkdir -p build
 	cd build
-	cmake -DWITH_SERIAL_BACKEND=ON -DLIBIIO_COMPAT=on ../
+	cmake -DWITH_SERIAL_BACKEND=ON -DLIBIIO_COMPAT=ON ../
 	make $JOBS
 	sudo make install
+	echo "$(basename -a "$(git config --get remote.origin.url)") - $(git rev-parse --abbrev-ref HEAD) - $(git rev-parse --short HEAD)" >> $BUILD_STATUS_FILE
 	popd
 }
 
@@ -79,6 +89,7 @@ install_libad9361() {
 	cmake ../
 	make $JOBS
 	sudo make install
+	echo "$(basename -a "$(git config --get remote.origin.url)") - $(git rev-parse --abbrev-ref HEAD) - $(git rev-parse --short HEAD)" >> $BUILD_STATUS_FILE
 	popd
 	}
 
@@ -92,20 +103,21 @@ install_libad9166 () {
 	cmake ../
 	make $JOBS
 	sudo make install
+	echo "$(basename -a "$(git config --get remote.origin.url)") - $(git rev-parse --abbrev-ref HEAD) - $(git rev-parse --short HEAD)" >> $BUILD_STATUS_FILE
 	popd
 }
 
-install_libserialport() {
-	mkdir -p $STAGING_AREA
-	pushd $STAGING_AREA
-	[ -d 'libserialport' ] || git clone https://github.com/sigrokproject/libserialport -b $LIBSERIALPORT_BRANCH libserialport
-	cd libserialport
-	./autogen.sh
-        ./configure
-        make $JOBS
-        sudo make install
-	popd
-	
+move_build_status() {
+	sudo mv $BUILD_STATUS_FILE $HOME
+}
+
+build_all() {
+	install_apt_pkgs
+	install_gtkdatabox
+	install_libiio
+	install_libad9361
+	install_libad9166
+	move_build_status
 }
 
 for arg in $@; do