Merge branch 'master' into d/configure_verbosity

Author: smoe

.github/workflows/ci.yml

@@ -92,10 +92,11 @@ jobs:
         # Note that the package build covers html docs
 
   package-arch:
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.runner }}
     strategy:
       matrix:
-        image: ["debian:bullseye", "debian:bookworm", "debian:sid"]
+        runner: ["ubuntu-24.04", "ubuntu-24.04-arm"]
+        image: ["debian:bookworm", "debian:trixie", "debian:sid"]
     container:
       image: ${{ matrix.image }}
       # IPC_OWNER is needed for shmget IPC_CREAT
@@ -129,7 +130,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         case "${{matrix.image}}" in
-            debian:sid|debian:bookworm)
+            debian:sid|debian:bookworm|debian:trixie)
                 exit 0
                 ;;
             *)
@@ -171,12 +172,37 @@ jobs:
         eatmydata adduser testrunner sudo
         chmod 0777 $(find tests/ -type d) # make test dirs world-writable for the testrunner
         su -c "eatmydata ./scripts/runtests -p ./tests" testrunner
+    - name: Gather build artifacts
+      run: |
+        set -e
+        set -x
+        ARCH=$(dpkg --print-architecture)
+        DIST=$(echo ${{ matrix.image }} | cut -d : -f 2)
+        OUTDIR="artifacts/${DIST}/${ARCH}"
+        mkdir -p "$OUTDIR"
+        cp -v $(find .. -maxdepth 1 -type f | LC_ALL=C sort) "$OUTDIR" || true
+        (cd "$OUTDIR" && sha256sum * > SHA256SUMS.txt)
+        echo "DIST=$DIST" >> "$GITHUB_ENV"
+        echo "ARCH=$ARCH" >> "$GITHUB_ENV"
+    - name: Compute artifact metadata
+      id: meta
+      run: |
+        echo "dist=$(echo ${{ matrix.image }} | cut -d : -f 2)" >> $GITHUB_OUTPUT
+        echo "arch=$(dpkg --print-architecture)" >> $GITHUB_OUTPUT
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: linuxcnc-${{ steps.meta.outputs.dist }}-${{ steps.meta.outputs.arch }}
+        path: artifacts/${{ steps.meta.outputs.dist }}/${{ steps.meta.outputs.arch }}
+        if-no-files-found: error
+
 
   package-indep:
     runs-on: ubuntu-24.04
     strategy:
       matrix:
-        image: ["debian:bullseye", "debian:bookworm", "debian:sid"]
+        image: ["debian:bookworm", "debian:trixie", "debian:sid"]
     container:
       image: ${{ matrix.image }}
       # IPC_OWNER is needed for shmget IPC_CREAT
@@ -211,7 +237,7 @@ jobs:
         DEBIAN_FRONTEND: noninteractive
       run: |
         case "${{matrix.image}}" in
-            debian:sid|debian:bookworm)
+            debian:sid|debian:bookworm|debian:trixie)
                 exit 0
                 ;;
             *)
@@ -239,11 +265,101 @@ jobs:
         eatmydata scripts/get-version-from-git | sed -re 's/^v(.*)$/\1/' >| VERSION; cat VERSION
         eatmydata git diff
         eatmydata apt-get --yes --quiet build-dep --indep-only .
-        eatmydata debuild -us -uc --build=all
+        eatmydata debuild -us -uc --build=source,all
     - name: Test install debian packages
       env:
         DEBIAN_FRONTEND: noninteractive
       run: |
         set -e
         set -x
         eatmydata apt-get --yes --quiet install ../*.deb
+    - name: Gather build artifacts
+      run: |
+        set -e
+        set -x
+        DIST=$(echo ${{ matrix.image }} | cut -d : -f 2)
+        ARCH=all
+        OUTDIR="artifacts/${DIST}/${ARCH}"
+        mkdir -p "$OUTDIR"
+        cp -v $(find .. -maxdepth 1 -type f | LC_ALL=C sort) "$OUTDIR" || true
+        (cd "$OUTDIR" && sha256sum * > SHA256SUMS.txt)
+        echo "DIST=$DIST" >> "$GITHUB_ENV"
+        echo "ARCH=$ARCH" >> "$GITHUB_ENV"
+    - name: Compute artifact metadata
+      id: meta
+      run: |
+        echo "dist=$(echo ${{ matrix.image }} | cut -d : -f 2)" >> $GITHUB_OUTPUT
+        echo "arch=all" >> $GITHUB_OUTPUT
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: linuxcnc-${{ steps.meta.outputs.dist }}-${{ steps.meta.outputs.arch }}
+        path: artifacts/${{ steps.meta.outputs.dist }}/${{ steps.meta.outputs.arch }}
+        if-no-files-found: error
+
+
+  cppcheck:
+    runs-on: ubuntu-24.04
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+        fetch-depth: 0
+    - name: Perform Source Code checks that were successful in the past
+      continue-on-error: true
+      run: |
+        set -x
+        git fetch --recurse-submodules=no https://github.com/linuxcnc/linuxcnc refs/tags/*:refs/tags/*
+        sudo apt-get -y install cppcheck shellcheck
+        scripts/cppcheck.sh
+    - name: Shellcheck
+      continue-on-error: true
+      run: |
+        scripts/shellcheck.sh
+
+
+  release:
+    name: Release packages
+    needs:
+      - package-arch
+      - package-indep
+    if: (github.event_name == 'release' && github.event.action == 'published') || startsWith(github.ref, 'refs/tags/')
+    permissions:
+      contents: write
+    runs-on: ubuntu-24.04
+    steps:
+    - name: Download artifacts
+      uses: actions/download-artifact@v4
+      with:
+        path: release_artifacts
+    - name: Prepare upload assets
+      run: |
+        set -e
+        mkdir -p upload
+        echo "Downloaded artifacts layout:" && find release_artifacts -maxdepth 3 -print | sed 's/^/  /'
+        for d in release_artifacts/*; do
+          [ -d "$d" ] || continue
+          name=$(basename "$d")
+          # Expect name like linuxcnc-bookworm-amd64 or linuxcnc-trixie-all
+          dist=${name#linuxcnc-}
+          dist=${dist%-*}
+          arch=${name##*-}
+          echo "Processing artifact: $name (dist=$dist arch=$arch)"
+          # Copy built files into distro and arch specific directory
+          mkdir "upload/${dist}-${arch}/"
+          # sort file list for stable output
+          for f in $(find "$d" -maxdepth 1 -type f | LC_ALL=C sort); do
+            [ -f "$f" ] || continue
+            cp "$f" "upload/${dist}-${arch}"
+          done
+          echo "Preview of SHA256SUMS.txt:" && sed -n '1,200p' "upload/${dist}-${arch}/SHA256SUMS.txt" | sed 's/^/  /'
+          echo "Upload dir contents:" && ls -l "upload/${dist}-${arch}" | sed 's/^/  /'
+        done
+    - name: Create GitHub Release and upload assets
+      uses: softprops/action-gh-release@v2
+      with:
+        files: |
+          upload/*
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -11,6 +11,7 @@ build-stamp
 *.mod.c
 *.cmd
 .tmp*
+src/*.mod
 # Ignore generated html files, 
 /docs/src/*/*.html
 # docs/html/.gitignore is for the html directory
@@ -26,12 +27,15 @@ src/modules.order
 /configs/*/emc.nml
 !/configs/common/emc.nml
 /docs/src/source-highlight/local
+docs/src/*/gui/gmoccapy_release_notes.txt
 lib/python/gremlin.py
 lib/python/qt5_graphics.py
 lib/python/touchy
 configs/sim/gmoccapy/*.pref
 configs/sim/gmoccapy/gmoccapy_plasma/*.pref
 configs/sim/gmoccapy/gmoccapy-JA/*.pref
+configs/**/*.tbl.bak
+configs/**/halshow.preferences
 # Miscellaneous generated files (Rob)
 cscope
 cscope.*
@@ -45,20 +49,11 @@ position.txt
 *.result
 # Ignore temp files
 *.swp
+*~
 # Ignore po4a temp files
 *.failed.po
 *-new_??.po
 # Ignore stamp files
 *.*-stamp
 # Ignore VSCode settings
 .vscode/settings.json
-# Ignore po4a-generated files for other languages
-docs/help/es/*
-docs/help/fr/*
-docs/help/hu/*
-docs/help/nb/*
-docs/help/vi/*
-docs/help/zh_CN/*
-docs/src/*/gui/gmoccapy_release_notes.txt
-configs/**/*.tbl.bak
-configs/**/halshow.preferences

VERSION

@@ -1 +1,2 @@
 2.10.0~pre0
+

bin/profile_axis

@@ -1,4 +1,4 @@
 #!/bin/bash
-SCRIPT_LOCATION=$(dirname $(readlink -f $0))
-python3 -mcProfile -o axis.profile $SCRIPT_LOCATION/axis "$@"
+SCRIPT_LOCATION=$(dirname "$(readlink -f "$0")")
+python3 -mcProfile -o axis.profile "$SCRIPT_LOCATION"/axis "$@"
 (echo sort cumulative; echo stats 20) | python3 -mpstats axis.profile

configs/apps/gladevcp/animated-backdrop/animated-backdrop.demo

@@ -2,6 +2,6 @@
 
 thisfile=$(readlink -f "$0")
 thisdir=$(dirname "$thisfile")
-cd "$thisdir"
+cd "$thisdir" || { echo "E: Could not change directory to '$thisdir'"; exit 1; }
 
 gladevcp_demo -u ./cairodraw.py ./cairodraw.ui

configs/apps/gladevcp/animated-backdrop/cairodraw.py

@@ -1,29 +1,29 @@
-
-import gtk, sys, cairo
+import cairo
 from math import pi
 
 
 pngfile = 'vortex.me.png'
 
 class HandlerClass:
 
-    def on_expose(self,widget,data=None):
-        print("on_expose")
-        cr = widget.window.cairo_create()
+    def on_draw(self, widget, cr):
+        print("on_draw")
 
         # Sets the operator to clear which deletes everything below
         # where an object is drawn
         cr.set_operator(cairo.OPERATOR_CLEAR)
+        width = widget.get_allocated_width()
+        height = widget.get_allocated_height()
         # Makes the mask fill the entire window
-        cr.rectangle(0.0, 0.0, *widget.get_size())
+        cr.rectangle(0.0, 0.0, width, height)
         # Deletes everything in the window (since the compositing
         # operator is clear and mask fills the entire window
         cr.fill()
         # Set the compositing operator back to the default
         cr.set_operator(cairo.OPERATOR_OVER)
 
         if self.scale:
-            x, y, w, h = widget.allocation
+            w, h = widget.get_allocated_width(), widget.get_allocated_height()
             cr.scale(1.0 *w / self.width, 1.0*h/self.height)
 
         cr.set_source_surface(self.img, 0, 0)
@@ -49,8 +49,8 @@ def __init__(self, halcomp,builder,useropts):
         # This sets the windows colormap, so it supports transparency.
         # This will only work if the wm support alpha channel
         screen = win.get_screen()
-        rgba = screen.get_rgba_colormap()
-        win.set_colormap(rgba)
+        rgba = screen.get_rgba_visual()
+        win.set_visual(rgba)
 
         # scaling the bitmap is possible by turning this on
         # however the fixed widget does NOT do proportional scaling

configs/apps/gladevcp/animated-backdrop/cairodraw.ui

@@ -1,18 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.38.2 -->
 <interface>
-  <!-- interface-requires gladevcp 0.0 -->
-  <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
+  <requires lib="gtk+" version="3.0"/>
+  <requires lib="gladevcp" version="0.0"/>
   <object class="GtkWindow" id="window1">
-    <signal name="expose_event" handler="on_expose"/>
+    <property name="can-focus">False</property>
+    <signal name="draw" handler="on_draw" swapped="no"/>
     <child>
       <object class="GtkFixed" id="fixed1">
         <property name="visible">True</property>
+        <property name="can-focus">False</property>
         <child>
           <object class="HAL_LED" id="hal_led1">
-            <property name="width_request">100</property>
-            <property name="height_request">80</property>
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
             <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="led-blink-rate">0</property>
           </object>
           <packing>
             <property name="x">57</property>
@@ -22,13 +26,13 @@
         <child>
           <object class="HAL_Button" id="hal_button1">
             <property name="label" translatable="yes">button</property>
-            <property name="width_request">100</property>
-            <property name="height_request">80</property>
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
-            <property name="has_tooltip">True</property>
-            <property name="tooltip_text" translatable="yes">a tooltip</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
+            <property name="has-tooltip">True</property>
+            <property name="tooltip-text" translatable="yes">a tooltip</property>
           </object>
           <packing>
             <property name="x">250</property>
@@ -38,11 +42,11 @@
         <child>
           <object class="HAL_ToggleButton" id="hal_togglebutton1">
             <property name="label" translatable="yes">togglebutton</property>
-            <property name="width_request">100</property>
-            <property name="height_request">80</property>
+            <property name="width-request">100</property>
+            <property name="height-request">80</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
           </object>
           <packing>
             <property name="x">29</property>

configs/apps/gladevcp/by-widget/combobox.demo

@@ -2,6 +2,6 @@
 
 thisfile=$(readlink -f "$0")
 thisdir=$(dirname "$thisfile")
-cd "$thisdir"
+cd "$thisdir" || { echo "E: Could not change directory to '$thisdir'"; exit 1; }
 
-gladevcp_demo -u ./combobox ./combobox.ui
+gladevcp_demo -u combobox.py combobox.ui