Merge pull request #1681 from ndim/improve-autotool-build

Improve autotool build (part 1/n)

Author: stefanrueger

.github/workflows/build.yml

@@ -31,6 +31,51 @@ 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
+          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:

.gitignore

@@ -40,7 +40,10 @@ ltmain.sh
 ylwrap
 tags
 cscope.out
-/src/avrdude-[1-9].*.tar.*
+/src/avrdude-[1-9].[0-9].tar.*
+/src/avrdude-[1-9].[0-9]/
+/src/avrdude-[1-9].[0-9]-20[0-9][0-9][01][0-9][0-3][0-9].tar.*
+/src/avrdude-[1-9].[0-9]-20[0-9][0-9][01][0-9][0-3][0-9]/
 /src/GNUmakefile
 
 *.o

CMakeLists.txt

@@ -69,14 +69,14 @@ if(Git_FOUND)
         )
 
     execute_process(
-        COMMAND "${GIT_EXECUTABLE}" log -1 --format=%ad --date=format:%Y%m%d
+        COMMAND "${GIT_EXECUTABLE}" log -1 --format=%cd --date=format:%Y%m%d
         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
         OUTPUT_VARIABLE GIT_COMMIT_DATE
         ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
         )
 
     execute_process(
-        COMMAND "${GIT_EXECUTABLE}" log -1 --format=%ad --date=format:%Y
+        COMMAND "${GIT_EXECUTABLE}" log -1 --format=%cd --date=format:%Y
         WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
         OUTPUT_VARIABLE GIT_COMMIT_YEAR
         ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE

src/GNUmakefile.in

@@ -1,15 +1,15 @@
-# Helps update the version number automatically if using GNU make.
-include Makefile
+# @configure_input@
 
-AUTORECONF ?= autoreconf
-AUTORECONF_OPTS ?= -vis
+include Makefile
 
-script_version := $(shell $(top_srcdir)/build-helpers/package-version $(top_srcdir) version-stamp)
-ifneq ($(PACKAGE_VERSION),$(script_version))
-$(info autoconf and script versions do not match: $(PACKAGE_VERSION) vs $(script_version))
-$(info Removing autom4te.cache and related files and re-running autoreconf)
-dummy1 := $(shell rm -rf $(top_srcdir)/autom4te.cache)
-dummy2 := $(shell $(AUTORECONF) $(AUTORECONF_OPTS) $(top_srcdir))
+need_to_rerun := $(shell $(top_srcdir)/build-helpers/versioninfo.sh "$(top_srcdir)" "@VERSIONINFO_STAMPFILE@" | { @VERSIONINFO_READ@; \
+         if @VERSIONINFO_IS_UNCHANGED@ \
+           echo "no"; \
+         fi; } )
+ifneq (no,$(need_to_rerun))
+$(info Recorded and current version information do not match.)
+$(info Re-running autoreconf via bootstrap.)
+dummy1 := $(shell $(top_srcdir)/bootstrap)
 endif
 
 # vim: syntax=make

src/Makefile.am

@@ -40,7 +40,7 @@ CLEANFILES = \
 	config_gram.h \
 	lexer.c
 
-include build-helpers/package-version.mk
+include build-helpers/versioninfo.mk
 
 BUILT_SOURCES = $(CLEANFILES)
 
@@ -248,4 +248,4 @@ backup-avrdude-conf:
 			${DESTDIR}${sysconfdir}/avrdude.conf.bak; \
 	fi
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I auto-m4 -I build-helpers

src/auto-aux/.gitignore

@@ -0,0 +1,2 @@
+# Ensure git creates empty directory for autotools to place files into
+*

src/auto-m4/.gitignore

@@ -0,0 +1,2 @@
+# Ensure creation of empty directory for autotools to place files into
+*

src/autotools-build.sh

@@ -0,0 +1,57 @@
+#! /bin/sh
+
+set -ex
+
+cd "$(dirname "$0")"
+top_srcdir="$(pwd)"
+
+ostype="$(uname | tr A-Z a-z)"
+
+if test "x$MAKE" = x; then
+  if gmake --version > /dev/null 2>&1; then
+    MAKE=gmake
+  fi
+fi
+make="${make-"${MAKE-make} -j$(nproc)"}"
+
+rm -rf autom4te.cache/
+
+prefix="$top_srcdir/build_autotools-prefix"
+rm -rf "$prefix"
+
+top_builddir="$top_srcdir/build_autotools"
+
+# Remove remainders of failed distcheck attempts
+for dir in "$top_builddir"
+do
+    if test -d "$dir"; then
+	chmod -R +w "$dir"
+    fi
+done
+rm -rf "$top_builddir"
+
+./bootstrap
+
+mkdir "$top_builddir"
+cd "$top_builddir"
+
+configure_opts=""
+configure_opts="$configure_opts --disable-silent-rules"
+configure_opts="$configure_opts --enable-parport"
+case "$ostype" in
+  *linux)
+    configure_opts="$configure_opts --enable-linuxgpio --enable-linuxspi"
+    configure_opts="$configure_opts --enable-doc"
+    ;;
+esac
+
+$top_srcdir/configure --prefix="$prefix" ${configure_opts}
+
+$make all
+$make check
+$make install
+$make installcheck
+
+printf "\n\n" | $top_srcdir/../tools/test-avrdude -e $prefix/bin/avrdude -d0 -p"-cdryrun -pm2560" -p"-cdryrun -pavr64du28"
+
+$make distcheck

src/bootstrap

@@ -1,5 +1,8 @@
 #! /bin/sh
 
+cd "$(dirname "$0")"
+
+: ${AUTORECONF="autoreconf${AC_VER}"}
 : ${AUTOHEADER="autoheader${AC_VER}"}
 : ${AUTOCONF="autoconf${AC_VER}"}
 : ${ACLOCAL="aclocal${AM_VER}"}
@@ -17,9 +20,6 @@ rm -rf autom4te.cache
 # probe for that
 LIBTOOLIZE=libtoolize
 glibtoolize --version > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize
-${LIBTOOLIZE}
+export LIBTOOLIZE
 
-${ACLOCAL}
-${AUTOHEADER}
-${AUTOCONF}
-${AUTOMAKE} -a -c
+${AUTORECONF} -i "$@"