This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=3ab64fae1f5cd8613a8ec62d066bd02f9b4ed295 commit 3ab64fae1f5cd8613a8ec62d066bd02f9b4ed295 Author: Guillem Jover <[email protected]> AuthorDate: Sat Dec 4 05:24:45 2021 +0100 build: Move build helper tools into build-aux/ This unclutters the source tree, and moves the files where they belong in normal autotools build systems. --- Makefile.am | 14 +++++++------- check.am => build-aux/check.am | 0 cpan.am => build-aux/cpan.am | 0 gen-changelog => build-aux/gen-changelog | 0 get-version => build-aux/get-version | 0 doc/lcov-inject.pl => build-aux/lcov-inject | 2 +- run-script => build-aux/run-script | 2 +- configure.ac | 5 +++-- debian/rules | 2 +- lib/dpkg/t/Makefile.am | 2 +- m4/dpkg-arch.m4 | 2 +- m4/dpkg-build.m4 | 2 +- scripts/Makefile.am | 2 +- src/Makefile.am | 2 +- t/shellcheck.t | 4 ++-- utils/Makefile.am | 2 +- 16 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Makefile.am b/Makefile.am index 352269778..dfd92850e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -60,11 +60,11 @@ EXTRA_DIST = \ ChangeLog.old \ README.l10n \ autogen \ - gen-changelog \ - get-version \ - run-script \ + build-aux/gen-changelog \ + build-aux/get-version \ + build-aux/lcov-inject \ + build-aux/run-script \ doc/coding-style.txt \ - doc/lcov-inject.pl \ debian/README.bug-usertags \ debian/bug-script \ debian/changelog \ @@ -128,7 +128,7 @@ LCOV_CAPTURE_OPTS = $(LCOV_OPTS) --no-recursion \ -d $(top_builddir)/src \ -d $(top_builddir)/utils \ # EOL -LCOV_INJECT = $(PERL) -i $(top_srcdir)/doc/lcov-inject.pl +LCOV_INJECT = $(PERL) -i $(top_srcdir)/build-aux/lcov-inject coverage: all : # Remove coverage data from any previous run @@ -201,7 +201,7 @@ TEST_ENV_VARS = \ DPKG_DATADIR=$(abs_top_srcdir)/data \ # EOL -include $(top_srcdir)/check.am +include $(top_srcdir)/build-aux/check.am .PHONY: update-po @@ -211,7 +211,7 @@ update-po: $(MAKE) -C dselect/po update-po $(MAKE) -C man update-po -include $(top_srcdir)/cpan.am +include $(top_srcdir)/build-aux/cpan.am # If we create the dist tarball from the git repository, make sure # that we're not forgetting some files, and we are not storing any symlink diff --git a/check.am b/build-aux/check.am similarity index 100% rename from check.am rename to build-aux/check.am diff --git a/cpan.am b/build-aux/cpan.am similarity index 100% rename from cpan.am rename to build-aux/cpan.am diff --git a/gen-changelog b/build-aux/gen-changelog similarity index 100% rename from gen-changelog rename to build-aux/gen-changelog diff --git a/get-version b/build-aux/get-version similarity index 100% rename from get-version rename to build-aux/get-version diff --git a/doc/lcov-inject.pl b/build-aux/lcov-inject similarity index 99% rename from doc/lcov-inject.pl rename to build-aux/lcov-inject index 12b78bd9a..da6bbe698 100755 --- a/doc/lcov-inject.pl +++ b/build-aux/lcov-inject @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# lcov-inject.pl +# lcov-inject # # Copyright © 2014 Guillem Jover <[email protected]> # diff --git a/run-script b/build-aux/run-script similarity index 92% rename from run-script rename to build-aux/run-script index 5f68a8749..1045a7a1f 100755 --- a/run-script +++ b/build-aux/run-script @@ -2,7 +2,7 @@ set -e -top_srcdir="$(dirname "$0")" +top_srcdir="$(dirname "$0")/.." # To avoid using «readlink -f» or «realpath» we just change into the # desired directory and work from there. diff --git a/configure.ac b/configure.ac index cfed39e86..68d17eb41 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,9 @@ m4_pattern_forbid([^_?DPKG_]) AC_PREREQ(2.60) -AC_INIT([dpkg], m4_esyscmd([./get-version]), [[email protected]], - [dpkg], [https://wiki.debian.org/Teams/Dpkg]) +AC_INIT([dpkg], m4_esyscmd([build-aux/get-version]), + [[email protected]], [dpkg], + [https://wiki.debian.org/Teams/Dpkg]) DPKG_DIST_IS_RELEASE AC_SUBST([PACKAGE_COPYRIGHT_HOLDER], ['Dpkg Developers']) AC_SUBST([PACKAGE_VCS_TYPE], [git]) diff --git a/debian/rules b/debian/rules index d5e998afa..249138767 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,7 @@ dpkg_buildflags = \ DEB_BUILD_MAINT_OPTIONS="hardening=+all" \ DEB_CFLAGS_MAINT_APPEND="$(WFLAGS)" \ DEB_CXXFLAGS_MAINT_APPEND="$(WFLAGS)" \ - $(CURDIR)/run-script scripts/dpkg-buildflags.pl + $(CURDIR)/build-aux/run-script scripts/dpkg-buildflags.pl DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am index 3335873f2..d19be5d7b 100644 --- a/lib/dpkg/t/Makefile.am +++ b/lib/dpkg/t/Makefile.am @@ -80,6 +80,6 @@ check_PROGRAMS = \ test_tmpdir = t.tmp -include $(top_srcdir)/check.am +include $(top_srcdir)/build-aux/check.am clean-local: check-clean diff --git a/m4/dpkg-arch.m4 b/m4/dpkg-arch.m4 index 2d9f1d310..87ffd0d56 100644 --- a/m4/dpkg-arch.m4 +++ b/m4/dpkg-arch.m4 @@ -9,7 +9,7 @@ AC_DEFUN([_DPKG_ARCHITECTURE], [ AC_REQUIRE([DPKG_PROG_PERL])dnl AC_REQUIRE([AC_CANONICAL_HOST])dnl - $2=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/run-script" scripts/dpkg-architecture.pl -t$host -q$1 2>/dev/null) + $2=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/build-aux/run-script" scripts/dpkg-architecture.pl -t$host -q$1 2>/dev/null) ])# _DPKG_ARCHITECTURE # DPKG_CPU_TYPE diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index 120b6cc55..51ec2731f 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -15,7 +15,7 @@ AC_DEFUN([DPKG_BUILD_SHARED_LIBS], [ # ----------------------- AC_DEFUN([DPKG_BUILD_RELEASE_DATE], [ AC_REQUIRE([DPKG_PROG_PERL]) - TIMESTAMP=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/run-script" scripts/dpkg-parsechangelog.pl -l"$srcdir/debian/changelog" -STimestamp) + TIMESTAMP=$(PERL=$PERL ${CONFIG_SHELL-/bin/sh} "$srcdir/build-aux/run-script" scripts/dpkg-parsechangelog.pl -l"$srcdir/debian/changelog" -STimestamp) PACKAGE_RELEASE_DATE=$($PERL -MPOSIX -e "print POSIX::strftime('%Y-%m-%d', gmtime('$TIMESTAMP'));") AC_SUBST([PACKAGE_RELEASE_DATE]) ])# DPKG_BUILD_RELEASE_DATE diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 96cfe2c7d..b8d792563 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -466,7 +466,7 @@ refresh-test-data: $(test_data_objects) >$(srcdir)/t/Dpkg_Shlibs/objdump.spacesyms $(OBJDUMP) `which ls` >$(srcdir)/t/Dpkg_Shlibs/objdump.ls -include $(top_srcdir)/check.am +include $(top_srcdir)/build-aux/check.am clean-local: check-clean coverage-clean rm -fr man diff --git a/src/Makefile.am b/src/Makefile.am index 580169582..bb585b977 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,6 +93,6 @@ test_scripts = \ t/dpkg_divert.t \ # EOL -include $(top_srcdir)/check.am +include $(top_srcdir)/build-aux/check.am clean-local: check-clean diff --git a/t/shellcheck.t b/t/shellcheck.t index a5ac5f26f..1e1932dfe 100644 --- a/t/shellcheck.t +++ b/t/shellcheck.t @@ -33,8 +33,8 @@ my @todofiles = qw( ); my @files = qw( autogen - get-version - run-script + build-aux/get-version + build-aux/run-script debian/dpkg.cron.daily debian/dpkg.postrm scripts/dpkg-db-backup.sh diff --git a/utils/Makefile.am b/utils/Makefile.am index 71ad9871e..ebd9e450a 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -96,6 +96,6 @@ test_scripts = \ t/update_alternatives.t \ # EOL -include $(top_srcdir)/check.am +include $(top_srcdir)/build-aux/check.am clean-local: check-clean -- Dpkg.Org's dpkg
