fix: merge conflicts

.github/workflows/build.yml

@@ -0,0 +1,352 @@
+#
+# build.yml - GitHub build action for AVRDUDE
+# Copyright (C) 2021 Marius Greuel
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program 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 General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+name: Build
+
+on:
+  push:
+    branches-ignore:
+      - 'onlinedocs'
+  pull_request:
+    branches-ignore:
+      - 'onlinedocs'
+  workflow_call:
+
+env:
+  BUILD_TYPE: RelWithDebInfo
+
+jobs:
+  linux-x86_64-autotools:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install prerequisites
+        run: >-
+          sudo apt-get update
+
+          sudo apt-get install -y
+          build-essential
+          automake
+          libtool
+          gettext
+          flex
+          bison
+          libelf-dev
+          libusb-dev
+          libusb-1.0-0-dev
+          libhidapi-dev
+          libftdi1-dev
+          libreadline-dev
+          libserialport-dev
+          libgpiod-dev
+          texinfo
+          texlive
+          texi2html
+      - name: Configure
+        run: >-
+          autoreconf -vis src
+
+          mkdir _ambuild && cd _ambuild
+
+          ../src/configure
+          --enable-doc
+          --enable-parport
+          --enable-linuxgpio
+          --enable-linuxspi
+      - name: Build
+        run: make -C _ambuild -j$(nproc)
+      - name: Install
+        run: sudo make -C _ambuild install
+      - name: Dryrun_test
+        run: printf "\n\n" | ./tools/test-avrdude -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
+      - name: distcheck
+        run: make -C _ambuild -j$(nproc) distcheck
+
+  linux-x86_64:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install prerequisites
+        run: >-
+          sudo apt-get update
+
+          sudo apt-get install -y
+          build-essential
+          cmake
+          flex
+          bison
+          libelf-dev
+          libusb-dev
+          libusb-1.0-0-dev
+          libhidapi-dev
+          libftdi1-dev
+          libreadline-dev
+          libserialport-dev
+          libgpiod-dev
+          texinfo
+          texlive
+          texi2html
+      - name: Configure
+        run: >-
+          cmake
+          -D BUILD_DOC=1
+          -D DEBUG_CMAKE=1
+          -D HAVE_LINUXGPIO=1
+          -D HAVE_LINUXSPI=1
+          -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          -B build
+      - name: Build
+        run: cmake --build build
+      - name: Install
+        run: sudo cmake --build build --target install
+      - name: Dryrun_test
+        run: echo -e \\n | ./tools/test-avrdude -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"        
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-linux-x86_64
+          path: |
+            build/
+            !**/*.d
+            !**/*.o
+      - name: Archive executables
+        uses: actions/upload-artifact@v3
+        with:
+          name: avrdude-linux-x86_64
+          path: |
+            build/src/avrdude
+            build/src/avrdude.conf
+
+  linux:
+    runs-on: ubuntu-latest
+    container: debian:11
+    strategy:
+      matrix:
+        include:
+          - { arch: i386, processor: i686, prefix: i686-linux-gnu, inc-lib: i386-linux-gnu }
+          - { arch: armhf, processor: armhf, prefix: arm-linux-gnueabihf, inc-lib: arm-linux-gnueabihf }
+          - { arch: arm64, processor: aarch64, prefix: aarch64-linux-gnu, inc-lib: aarch64-linux-gnu }
+    steps:
+      - uses: actions/checkout@v3
+      - name: Add architecture
+        run: |
+          dpkg --add-architecture ${{matrix.arch}}
+          apt-get update
+      - name: Install prerequisites
+        run: >-
+          apt-get update
+
+          apt-get install -y
+          git
+          cmake
+          flex
+          bison
+          crossbuild-essential-${{matrix.arch}}
+          libelf-dev:${{matrix.arch}}
+          libusb-dev:${{matrix.arch}}
+          libusb-1.0-0-dev:${{matrix.arch}}
+          libhidapi-dev:${{matrix.arch}}
+          libftdi1-dev:${{matrix.arch}}
+          libreadline-dev:${{matrix.arch}}
+          libserialport-dev:${{matrix.arch}}
+          libgpiod-dev:${{matrix.arch}}
+      - name: Configure
+        run: >-
+          cmake
+          -D DEBUG_CMAKE=1
+          -D HAVE_LINUXGPIO=1
+          -D HAVE_LINUXSPI=1
+          -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          -D CMAKE_SYSTEM_NAME=Linux
+          -D CMAKE_SYSTEM_PROCESSOR=${{matrix.processor}}
+          -D CMAKE_C_COMPILER=${{matrix.prefix}}-gcc
+          -D CMAKE_FIND_ROOT_PATH=/usr/${{matrix.prefix}}
+          -D CMAKE_INCLUDE_PATH=/usr/include/${{matrix.inc-lib}}
+          -D CMAKE_LIBRARY_PATH=/usr/lib/${{matrix.inc-lib}}
+          -B build
+      - name: Build
+        run: cmake --build build
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-linux-${{matrix.processor}}
+          path: |
+            build/
+            !**/*.d
+            !**/*.o
+      - name: Archive executables
+        uses: actions/upload-artifact@v3
+        with:
+          name: avrdude-linux-${{matrix.processor}}
+          path: |
+            build/src/avrdude
+            build/src/avrdude.conf
+
+  macos-x86_64:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install prerequisites
+        run: >-
+          # brew update
+
+          brew install
+          cmake
+          flex
+          bison
+          libelf
+          libusb
+          hidapi
+          libftdi
+          readline
+          libserialport
+      - name: Configure
+        run: >-
+          cmake
+          -D CMAKE_C_FLAGS=-I/usr/local/include
+          -D CMAKE_EXE_LINKER_FLAGS=-L/usr/local/Cellar
+          -D DEBUG_CMAKE=1
+          -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          -B build
+      - name: Build
+        run: cmake --build build
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-macos-x86_64
+          path: |
+            build/
+            !**/*.d
+            !**/*.o
+      - name: Archive executables
+        uses: actions/upload-artifact@v3
+        with:
+          name: avrdude-macos-x86_64
+          path: |
+            build/src/avrdude
+            build/src/avrdude.conf
+
+  msvc:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        include:
+          - { arch: x86, platform: Win32 }
+          - { arch: x64, platform: x64 }
+          - { arch: arm64, platform: ARM64 }
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install prerequisites
+        # As Chocolatey is notoriously unreliable, install winflexbison3 directly from GitHub.
+        # run: choco install winflexbison3
+        run: |
+          curl https://github.com/lexxmark/winflexbison/releases/download/v2.5.24/win_flex_bison-2.5.24.zip --location --output winflexbison.zip
+          unzip winflexbison.zip -d ${{github.workspace}}\winflexbison
+          echo "${{github.workspace}}\winflexbison" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      - name: Configure
+        run: >-
+          cmake
+          -A ${{matrix.platform}}
+          -D DEBUG_CMAKE=1
+          -D CMAKE_SYSTEM_VERSION=11
+          -D CMAKE_C_FLAGS_RELWITHDEBINFO="/MT /GL /Zi /O2 /Ob1 /DNDEBUG"
+          -D CMAKE_CXX_FLAGS_RELWITHDEBINFO="/MT /GL /Zi /O2 /Ob1 /DNDEBUG"
+          -D CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO="/DEBUG /INCREMENTAL:NO /LTCG /OPT:REF /OPT:ICF"
+          -D HAVE_LIBREADLINE=HAVE_LIBREADLINE-NOTFOUND
+          -D USE_EXTERNAL_LIBS=1
+          -B build
+      - name: Build
+        run: cmake --build build --config ${{env.BUILD_TYPE}}
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-msvc-${{matrix.arch}}
+          path: |
+            build/
+            !**/_deps/
+            !**/*.obj
+      - name: Move executables
+        run: |
+          mv build/src/RelWithDebInfo/avrdude.exe build/src
+          mv build/src/RelWithDebInfo/avrdude.pdb build/src
+      - name: Archive executables
+        uses: actions/upload-artifact@v3
+        with:
+          name: avrdude-msvc-${{matrix.arch}}
+          path: |
+            build/src/avrdude.exe
+            build/src/avrdude.pdb
+            build/src/avrdude.conf
+
+  mingw:
+    runs-on: windows-latest
+    defaults:
+      run:
+        shell: msys2 {0}
+    strategy:
+      matrix:
+        include:
+          - { sys: mingw64, env: x86_64 }
+          - { sys: ucrt64, env: ucrt-x86_64 }
+          - { sys: clang64, env: clang-x86_64 }
+    steps:
+      - uses: actions/checkout@v3
+      - uses: msys2/setup-msys2@v2
+        with:
+          msystem: ${{matrix.sys}}
+          update: true
+          install: >-
+            base-devel
+            mingw-w64-${{matrix.env}}-gcc
+            mingw-w64-${{matrix.env}}-cmake
+            mingw-w64-${{matrix.env}}-libelf
+            mingw-w64-${{matrix.env}}-libusb
+            mingw-w64-${{matrix.env}}-libusb-compat-git
+            mingw-w64-${{matrix.env}}-hidapi
+            mingw-w64-${{matrix.env}}-libftdi
+            mingw-w64-${{matrix.env}}-libserialport
+            mingw-w64-${{matrix.env}}-readline
+            mingw-w64-${{matrix.env}}-ncurses
+            mingw-w64-${{matrix.env}}-termcap
+      - name: Configure
+        run: >-
+          cmake
+          -G"MSYS Makefiles"
+          -D DEBUG_CMAKE=1
+          -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
+          -B build
+      - name: Build
+        run: cmake --build build
+      - name: Archive build artifacts
+        if: always()
+        uses: actions/upload-artifact@v3
+        with:
+          name: build-mingw-${{matrix.env}}
+          path: |
+            build/
+      - name: Archive executables
+        uses: actions/upload-artifact@v3
+        with:
+          name: avrdude-mingw-${{matrix.env}}
+          path: |
+            build/src/avrdude.exe
+            build/src/avrdude.conf

NEWS

@@ -22,6 +22,9 @@ Changes since version 7.3:
     - avr*timestamp() oddities #1722
     - -F option not honored bug #1740
     - "jtag2 is not a unique start of a programmer name" #1739
+    - Regression: EEPROM issue with official STK500 V1 FW #1713
+    - usbasp_write_byte in TPI mode not implemented #1755
+    - Remove calls to exit() from libavrdude library #774
 
   * Pull requests:
     - Remove 32bit MSYS2 mingw32 and clang32 build #1687
@@ -51,9 +54,11 @@ Changes since version 7.3:
     - Add buspirate hiz and pullups feature #1733
     - Add support for libgpiod v2+ API #1725
     - Remove deprecated ucr2 part #1749
-    - Move static variables to PDATA region in programmer code
-      #1750
-
+    - Make programmers libavrdude ready #1750, 1752, 1756 ... 1786
+    - Make default EEPROM readback 0xff for STK500 v1 #1753
+    - Silence gcc warning when printf format is "" #1754
+    - Remove calls to exit() from libavrdude library #1790
+    - Include libgpiod-dev in build.yml for Linux builds #1788
 
   * Internals:
 

src/CMakeLists.txt

@@ -80,7 +80,7 @@ if(MSVC)
     list(APPEND EXTRA_WINDOWS_INCLUDES "msvc")
 else()
     set(LIB_MATH m)
-    add_compile_options(-Wall -Wextra -Wno-unused-parameter)
+    add_compile_options(-Wall -Wextra -Wno-unused-parameter -Wno-format-zero-length)
 endif()
 
 # =====================================