Change .deb creation to use debhelper

Signed-off-by: Nicu Siderias <nicu.siderias@analog.com>

Author: NicuS03

CI/ubuntu/install_deps

@@ -14,7 +14,8 @@ install_deps() {
 		libxml2-dev rpm tar bzip2 gzip flex bison git curl \
 		python3-dev python3-setuptools python3-pip python3-all \
 		debhelper devscripts fakeroot libserialport-dev swig dh-python \
-		libunwind-dev libunwind8
+		libunwind-dev libunwind8 \
+		libgoogle-glog-dev mono-mcs cli-common-dev
 
 	# libiio dependencies
 	echo "libiio packages"
@@ -43,15 +44,14 @@ install_libiio() {
 	cd ${TOP_DIR}
 	git clone https://github.com/analogdevicesinc/libiio.git -b $LIBIIO_VERSION libiio
 	mkdir ./libiio/build && cd ./libiio/build
-    cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_DOC=ON -DWITH_SERIAL_BACKEND=ON -DWITH_MAN=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME}
+	cmake .. -Werror=dev -DCOMPILE_WARNING_AS_ERROR=ON -DENABLE_PACKAGING=ON -DPYTHON_BINDINGS=ON -DWITH_DOC=ON -DWITH_SERIAL_BACKEND=ON -DWITH_MAN=ON -DCPACK_SYSTEM_NAME=${ARTIFACTNAME}
 	make
-	make package 
+	make package
 	sudo apt install ./libiio-*.deb
 }
 
 handle_default() {
 	install_deps
-	install_glog
 	install_libiio
 }
 

CI/ubuntu/make_linux

@@ -1,28 +1,47 @@
-#!/bin/sh -e
+#!/bin/bash -e
 
 TOP_DIR=$(pwd)
 
 set -x
 
-handle_default() {
-	mkdir -p build
-	cd build
+# Extract version from CMakeLists.txt
+get_version() {
+	grep -E "^set\(LIBM2K_VERSION_(MAJOR|MINOR|PATCH)" CMakeLists.txt | \
+		sed 's/.*[^0-9]\([0-9]*\)).*/\1/' | \
+		tr '\n' '.' | sed 's/\.$//'
+}
 
-	#create deb for bindings
-	cmake -DENABLE_PYTHON=ON -DENABLE_TOOLS=ON -DENABLE_CSHARP=OFF -DENABLE_LOG=ON -DBUILD_EXAMPLES=ON .. && make
-	sudo python3 setup.py --command-packages=stdeb.command sdist_dsc
-	cd "$(find . -type d -name "debian" | head -n 1)"
-	sudo env DEB_BUILD_OPTIONS=nocheck debuild -us -uc
-	cp ../../*.deb ${TOP_DIR}/build/
-	cd ${TOP_DIR}/build/
-	#remove the tar.gz for bindings
-	sudo rm *.tar.gz
-	ls
-
-	#create simple .deb without Python bindings
-	cmake -DENABLE_PACKAGING=ON -DDEB_DETECT_DEPENDENCIES=ON -DENABLE_PYTHON=OFF -DENABLE_CSHARP=ON -DENABLE_TOOLS=ON -DENABLE_LOG=ON -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_EXAMPLES=ON ..
-	make && make package
-	ls
+handle_default() {
+	VERSION=$(get_version)
+	ARCHITECTURE=$(dpkg --print-architecture)
+	SOURCE_DIR=$(grep "^Source:" packaging/debian/control | cut -d' ' -f2)
+	CURRENT_DIR=$(basename "$PWD")
+
+	# Copy debian directory from packaging to root
+	cp -r ${TOP_DIR}/packaging/debian ${TOP_DIR}/debian
+
+	# Replace placeholders in debian template files
+	sed -i "s/@VERSION@/${VERSION}/" ${TOP_DIR}/debian/changelog
+	sed -i "s/@DATE@/$(date -R)/" ${TOP_DIR}/debian/changelog
+	sed -i "s/@ARCHITECTURE@/${ARCHITECTURE}/" ${TOP_DIR}/debian/control
+
+	# Create orig tarball
+	pushd ..
+	tar czf ${SOURCE_DIR}_${VERSION}.orig.tar.gz ${CURRENT_DIR}
+	popd
+
+	# Build debian packages
+	debuild
+
+	# Move generated packages to build directory
+	mkdir -p ${TOP_DIR}/build
+	mv ${TOP_DIR}/../libm2k*.deb ${TOP_DIR}/build/ 2>/dev/null || true
+	mv ${TOP_DIR}/../libm2k*.changes ${TOP_DIR}/build/ 2>/dev/null || true
+	mv ${TOP_DIR}/../libm2k*.buildinfo ${TOP_DIR}/build/ 2>/dev/null || true
+	mv ${TOP_DIR}/../python3-libm2k*.deb ${TOP_DIR}/build/ 2>/dev/null || true
+
+	# List generated packages
+	ls -la ${TOP_DIR}/build/
 }
 
 handle_doxygen() {
@@ -39,4 +58,4 @@ handle_ubuntu_docker() {
 	handle_default
 }
 
-handle_${OS_TYPE}
+handle_${OS_TYPE}

azure-pipelines.yml

@@ -37,11 +37,6 @@ jobs:
 - job: LinuxBuilds
   strategy:
     matrix:
-      ubuntu_20_04:
-        imageName: 'ubuntu-20.04'
-        OS_TYPE: 'ubuntu_docker'
-        OS_VERSION: focal
-        artifactName: 'Linux-Ubuntu-20.04'
       ubuntu_22_04:
         imageName: 'ubuntu-22.04'
         OS_TYPE: 'ubuntu_docker'
@@ -73,7 +68,7 @@ jobs:
     condition: ne(variables['System.JobName'], 'deploy_doxygen')
     inputs:
       sourceFolder: '$(Agent.BuildDirectory)/s/build/'
-      contents: '$(Agent.BuildDirectory)/s/build/?(libm2k*.deb|libm2k*.rpm)'
+      contents: '$(Agent.BuildDirectory)/s/build/?(libm2k*.deb|libm2k*.rpm|python3-libm2k*.deb)'
       targetFolder: '$(Build.ArtifactStagingDirectory)'
   - task: PublishPipelineArtifact@1
     condition: and(succeeded(), ne(variables['System.JobName'], 'deploy_doxygen'))
@@ -86,10 +81,6 @@ jobs:
     clean: all
   strategy:
     matrix:
-      macOS_13_x64:
-        poolName: 'Azure Pipelines'
-        vmImage: 'macOS-13'
-        artifactName: 'macOS-13-x64'
       macOS_14_x64:
         poolName: 'Azure Pipelines'
         vmImage: 'macOS-14'
@@ -170,85 +161,78 @@ jobs:
       TWINE_USERNAME: '__token__'
       TWINE_PASSWORD: $(TWINE_PASSWORD)
 
-- job: WindowsBuilds
-  workspace:
-    clean: all
-  strategy:
-    matrix:
-      VS_2022:
-        poolName: 'Azure Pipelines'
-        vmImage: 'windows-2022'
-        COMPILER: 'Visual Studio 17 2022'
-        ARCH: 'x64'
-        PLATFORM: 'win64'
-        artifactName: 'Windows-VS-2022-x64'
-      VS_2019:
-        poolName: 'Azure Pipelines'
-        vmImage: 'windows-2019'
-        COMPILER: 'Visual Studio 16 2019'
-        ARCH: 'x64'
-        PLATFORM: 'win64'
-        artifactName: 'Windows-VS-2019-x64'
-  pool:
-    vmImage: $[ variables['vmImage'] ]
-  steps:
-    - checkout: self
-      fetchDepth: 1
-      clean: true
-    - task: UsePythonVersion@0
-      inputs:
-        versionSpec: '3.11'
-    - task: PowerShell@2
-      displayName: 'Install Dependencies'
-      inputs:
-        targetType: filePath
-        filePath: ./CI/windows/install_deps.ps1
-    - task: PowerShell@2
-      displayName: "Build libm2k"
-      inputs:
-        targetType: 'filePath'
-        filePath: ./CI/windows/make_windows.ps1
-    - ${{ each pyVersion in parameters.pythonVersions }}:
-      - task: UsePythonVersion@0
-        displayName: Use Python ${{ pyVersion }}
-        inputs:
-          versionSpec: '${{ pyVersion }}'
-      - powershell: |
-              $SRC_DIR = Get-Item -Path $env:BUILD_SOURCESDIRECTORY
-              $OUTSIDE_BUILD = $SRC_DIR.Parent.FullName
-
-              $BUILD_DIR = Join-Path $OUTSIDE_BUILD "libm2k-$env:PLATFORM"
-              $TEMP_BUILD_DIR = Join-Path $SRC_DIR "tmp-build-$env:PLATFORM"
-
-              Set-Location $TEMP_BUILD_DIR
-              python.exe -m pip install --user --upgrade pip setuptools wheel twine build virtualenv
-              $env:COMPILE_BINDINGS = $true
-              python.exe -m build
-              Remove-Item Env:COMPILE_BINDINGS
-              Copy-Item -Path "dist/libm2k*.whl" -Destination (Join-Path $BUILD_DIR "dist")
-              Set-Location $SRC_DIR
-        displayName: Wheel Python ${{ pyVersion }}
-    - task: PowerShell@2
-      displayName: 'Create libm2k-system-setup installer'
-      condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
-      inputs:
-        targetType: 'filePath'
-        filePath: ./CI/windows/create_installer.ps1
-    - task: PublishPipelineArtifact@1
-      condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
-      inputs:
-        targetPath: '$(Build.ArtifactStagingDirectory)/installer'
-        artifactName: 'Libm2k-System-Setup-Exe'
-    - task: PowerShell@2
-      displayName: "Create ZIPs"
-      inputs:
-        targetType: 'filePath'
-        filePath: ./CI/windows/create_zips.ps1
-    - task: PublishPipelineArtifact@1
-      condition: succeeded()
-      inputs:
-        targetPath: '$(Build.ArtifactStagingDirectory)/libm2k-$(PLATFORM)'
-        artifactName: '$(artifactName)'
+#- job: WindowsBuilds
+#  workspace:
+#    clean: all
+#  strategy:
+#    matrix:
+#      VS_2022:
+#        poolName: 'Azure Pipelines'
+#        vmImage: 'windows-2022'
+#        COMPILER: 'Visual Studio 17 2022'
+#        ARCH: 'x64'
+#        PLATFORM: 'win64'
+#        artifactName: 'Windows-VS-2022-x64'
+#  pool:
+#    vmImage: $[ variables['vmImage'] ]
+#  steps:
+#    - checkout: self
+#      fetchDepth: 1
+#      clean: true
+#    - task: UsePythonVersion@0
+#      inputs:
+#        versionSpec: '3.11'
+#    - task: PowerShell@2
+#      displayName: 'Install Dependencies'
+#      inputs:
+#        targetType: filePath
+#        filePath: ./CI/windows/install_deps.ps1
+#    - task: PowerShell@2
+#      displayName: "Build libm2k"
+#      inputs:
+#        targetType: 'filePath'
+#        filePath: ./CI/windows/make_windows.ps1
+#    - ${{ each pyVersion in parameters.pythonVersions }}:
+#      - task: UsePythonVersion@0
+#        displayName: Use Python ${{ pyVersion }}
+#        inputs:
+#          versionSpec: '${{ pyVersion }}'
+#      - powershell: |
+#              $SRC_DIR = Get-Item -Path $env:BUILD_SOURCESDIRECTORY
+#              $OUTSIDE_BUILD = $SRC_DIR.Parent.FullName
+#
+#              $BUILD_DIR = Join-Path $OUTSIDE_BUILD "libm2k-$env:PLATFORM"
+#              $TEMP_BUILD_DIR = Join-Path $SRC_DIR "tmp-build-$env:PLATFORM"
+#
+#              Set-Location $TEMP_BUILD_DIR
+#              python.exe -m pip install --user --upgrade pip setuptools wheel twine build virtualenv
+#              $env:COMPILE_BINDINGS = $true
+#              python.exe -m build
+#              Remove-Item Env:COMPILE_BINDINGS
+#              Copy-Item -Path "dist/libm2k*.whl" -Destination (Join-Path $BUILD_DIR "dist")
+#              Set-Location $SRC_DIR
+#        displayName: Wheel Python ${{ pyVersion }}
+#    - task: PowerShell@2
+#      displayName: 'Create libm2k-system-setup installer'
+#      condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
+#      inputs:
+#        targetType: 'filePath'
+#        filePath: ./CI/windows/create_installer.ps1
+#    - task: PublishPipelineArtifact@1
+#      condition: and(succeeded(), eq(variables['System.JobName'], 'VS_2022'))
+#      inputs:
+#        targetPath: '$(Build.ArtifactStagingDirectory)/installer'
+#        artifactName: 'Libm2k-System-Setup-Exe'
+#    - task: PowerShell@2
+#      displayName: "Create ZIPs"
+#      inputs:
+#        targetType: 'filePath'
+#        filePath: ./CI/windows/create_zips.ps1
+#    - task: PublishPipelineArtifact@1
+#      condition: succeeded()
+#      inputs:
+#        targetPath: '$(Build.ArtifactStagingDirectory)/libm2k-$(PLATFORM)'
+#        artifactName: '$(artifactName)'
 
 
 

packaging/debian/changelog

@@ -0,0 +1,5 @@
+libm2k (@VERSION@) UNRELEASED; urgency=low
+
+  * Automated package build.
+
+ -- Engineerzone <https://ez.analog.com/community/linux-device-drivers>  @DATE@

packaging/debian/control

@@ -0,0 +1,70 @@
+Source: libm2k
+Section: libs
+Priority: optional
+Maintainer: Engineerzone <https://ez.analog.com/community/linux-device-drivers>
+Build-Depends: debhelper-compat (= 13),
+               cmake,
+               libiio-dev,
+               libgoogle-glog-dev,
+               libserialport-dev,
+               swig,
+               python3-dev,
+               dh-python,
+               mono-mcs,
+               cli-common-dev
+Standards-Version: 4.6.0
+Homepage: https://github.com/analogdevicesinc/libm2k
+Vcs-Git: https://github.com/analogdevicesinc/libm2k.git
+Vcs-Browser: https://github.com/analogdevicesinc/libm2k
+Rules-Requires-Root: no
+
+Package: libm2k
+Architecture: @ARCHITECTURE@
+Multi-Arch: same
+Depends: libiio (>= 0.24), ${shlibs:Depends}, ${misc:Depends}
+Description: Library for interfacing with ADALM2000
+ libm2k is a C++ library for interfacing with the ADALM2000, a
+ portable lab for electronics learning and development.
+ .
+ This package contains the shared library.
+
+Package: libm2k-dev
+Section: libdevel
+Architecture: @ARCHITECTURE@
+Multi-Arch: same
+Depends: libm2k (= ${binary:Version}), ${misc:Depends}
+Description: Library for interfacing with ADALM2000 - development files
+ libm2k is a C++ library for interfacing with the ADALM2000, a
+ portable lab for electronics learning and development.
+ .
+ This package contains the development files.
+
+Package: libm2k-tools
+Section: utils
+Architecture: @ARCHITECTURE@
+Depends: libm2k (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Command-line tools for ADALM2000
+ libm2k is a C++ library for interfacing with the ADALM2000, a
+ portable lab for electronics learning and development.
+ .
+ This package contains the m2kcli command-line tool.
+
+Package: python3-libm2k
+Section: python
+Architecture: @ARCHITECTURE@
+Depends: libm2k (= ${binary:Version}), ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Python 3 bindings for libm2k
+ libm2k is a C++ library for interfacing with the ADALM2000, a
+ portable lab for electronics learning and development.
+ .
+ This package contains the Python 3 bindings.
+
+Package: libm2k-csharp
+Section: cli-mono
+Architecture: @ARCHITECTURE@
+Depends: libm2k (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}
+Description: C# bindings for libm2k
+ libm2k is a C++ library for interfacing with the ADALM2000, a
+ portable lab for electronics learning and development.
+ .
+ This package contains the C# bindings.

packaging/debian/copyright

@@ -0,0 +1,24 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: libm2k
+Upstream-Contact: Engineerzone <https://ez.analog.com/community/linux-device-drivers>
+Source: https://github.com/analogdevicesinc/libm2k
+
+Files: *
+Copyright: 2019-2025 Analog Devices Inc.
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".

packaging/debian/libm2k-csharp.install

@@ -0,0 +1,3 @@
+usr/lib/*/libm2k-sharp-cxx-wrap.so*
+usr/lib/cli/
+usr/lib/pkgconfig/libm2k-sharp.pc