diff --git a/build/anigif-build.sh b/build/anigif-build.sh index d6ee7957..4de18296 100755 --- a/build/anigif-build.sh +++ b/build/anigif-build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/anigif-create.sh b/build/anigif-create.sh index f14083fd..6187080e 100755 --- a/build/anigif-create.sh +++ b/build/anigif-create.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/anigif-rename.sh b/build/anigif-rename.sh index 3eb0fe9d..f06bb9f0 100755 --- a/build/anigif-rename.sh +++ b/build/anigif-rename.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/arch/update-pkgconfig-sha256-on-repo-change.sh b/build/arch/update-pkgconfig-sha256-on-repo-change.sh index 2a742838..a23ed8d0 100755 --- a/build/arch/update-pkgconfig-sha256-on-repo-change.sh +++ b/build/arch/update-pkgconfig-sha256-on-repo-change.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/debian/aptly-add-deb.sh b/build/debian/aptly-add-deb.sh index 3c5c97e3..25008a62 100755 --- a/build/debian/aptly-add-deb.sh +++ b/build/debian/aptly-add-deb.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2016-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -34,16 +34,16 @@ echo "See 'MindForger Release Guide#Debian and my PPA' notebook for detailed ste #aptly repo show -with-packages mindforger-com-ppa # show snapshots -#aptly snapshot list +#aptly snapshot list # delete snapshot(s) ONLY if needed - publish must be deleted first! #aptly snapshot drop hstr-2.0.0-snapshot -# create snapshot in the time of release - note release NAME +# create snapshot in the time of release - note release NAME #aptly snapshot create hstr-2.0.0-snapshot from repo mindforger-com-ppa # show published snapshots -#aptly publish list +#aptly publish list # delete published snapshot(s) ONLY if needed #aptly publish drop stretch diff --git a/build/debian/make-deb.sh b/build/debian/make-deb.sh index d32351bd..29bd9375 100755 --- a/build/debian/make-deb.sh +++ b/build/debian/make-deb.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -33,9 +33,9 @@ # ############################################################################ function createChangelog() { - # Debian tooling changelog hints: + # Debian tooling changelog hints: # - signature line MUST have one whitespace prefix - # - signature line MUST have double space between email and timestamp + # - signature line MUST have double space between email and timestamp # - traling lines must have exactly one space export MYTS=`date "+%a, %d %b %Y %H:%M:%S"` @@ -78,7 +78,7 @@ function buildDebPackage() { export NOW=`date +%Y-%m-%d--%H-%M-%S` export HSTRBUILD=hstr-${NOW} export DEBIANVERSION=unstable - + # # 1) create upstream tarball # @@ -91,18 +91,18 @@ function buildDebPackage() { # 1.x) generate makefiles cd build/tarball && ./tarball-automake.sh && cd ../.. && ./configure - + # 1.2) prune HSTR project source: tests, *.o/... build files, ... echo -e "\n# HSTR project cleanup ########################################" rm -vrf ./.git ./hstr ./build ./test ./hstr.pro ./doc ./pad.xml ./snap find . -type f \( -name "*.a" -or -name "*.o" -or -name "*.*~" -or -name ".gitignore" -or -name ".git" \) | while read F; do rm -vf $F; done - + # 1.4) create tar archive createTarball # # 2) create source deb - # + # # 2.a) add Debian control files cp -rvf ${HSTRSRC}/build/debian/debian . createChangelog ./debian/changelog @@ -113,7 +113,7 @@ function buildDebPackage() { echo "OK: GPG agent running." else gpg-agent --daemon - fi + fi DEBEMAIL="martin.dvorak@mindforger.com" DEBFULLNAME="Martin Dvorak" @@ -126,7 +126,7 @@ function buildDebPackage() { pushd .. && mkdir -v deb-binary && cp -vf *.dsc *.changes *.deb deb-binary && popd # 3) create source deb - # + # # 3.a) build deb # build SOURCE deb package #debuild -S diff --git a/build/debian/upload-to-mentors.sh b/build/debian/upload-to-mentors.sh index 39030467..b2656a7d 100755 --- a/build/debian/upload-to-mentors.sh +++ b/build/debian/upload-to-mentors.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/fedora/rpm-from-deb.sh b/build/fedora/rpm-from-deb.sh index 297a3d60..4efc5f2c 100755 --- a/build/fedora/rpm-from-deb.sh +++ b/build/fedora/rpm-from-deb.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -50,10 +50,10 @@ function decompose() { function compose() { # recreate RPM cd ${MFPRJNAME} - export MFRPMROOT=`pwd` - + export MFRPMROOT=`pwd` + # bin build - # --target=x86_64 + # --target=x86_64 # --target=i386 rpmbuild --target=x86_64 --buildroot ${MFRPMROOT}/ -bb ${MFPRJNAME}-2.spec # noarch would be for SOURCE deb diff --git a/build/tarball/tarball-automake.sh b/build/tarball/tarball-automake.sh index cd5d613e..f326cba7 100755 --- a/build/tarball/tarball-automake.sh +++ b/build/tarball/tarball-automake.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ function tarballClean() { rm -rvf atom5te.cache src/.deps rm -vf Makefile Makefile.in aclocal.m4 config.log config.status configure depcomp install-sh missing rm -vf man/Makefile man/Makefile.in - rm -vf src/Makefile src/Makefile.in src/hstr src/hh *.o src/*.o + rm -vf src/Makefile src/Makefile.in src/hstr src/hh *.o src/*.o } function tarballBuildUsingAutomake() { @@ -52,7 +52,7 @@ function tarballBuildUsingAutomake() { # platform specific detection in configure.ac cp -vf ${AUTOMAKE_LIB}/config.sub . cp -vf ${AUTOMAKE_LIB}/config.guess . - else + else echo "ERROR: automake ${AUTOMAKE_LIB} not found!" exit 1 fi diff --git a/build/tarball/tarball-build.sh b/build/tarball/tarball-build.sh index b1e0efa2..04f4f8d0 100755 --- a/build/tarball/tarball-build.sh +++ b/build/tarball/tarball-build.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/tarball/tarball-uninstall.sh b/build/tarball/tarball-uninstall.sh index a4e248be..d5f19120 100755 --- a/build/tarball/tarball-uninstall.sh +++ b/build/tarball/tarball-uninstall.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/test-clean.sh b/build/test-clean.sh index 16d9a691..25a24ebe 100755 --- a/build/test-clean.sh +++ b/build/test-clean.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -cd ../test && make clean && rm -vf _* hstr-unit-tests Makefile +cd ../test && make clean && rm -vf _* hstr-unit-tests Makefile # eof diff --git a/build/test-gdb.sh b/build/test-gdb.sh index fffe7f64..8010c238 100755 --- a/build/test-gdb.sh +++ b/build/test-gdb.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/test-generate-unity-test-runner.sh b/build/test-generate-unity-test-runner.sh index bc380a83..3b0f5b1b 100755 --- a/build/test-generate-unity-test-runner.sh +++ b/build/test-generate-unity-test-runner.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/test-memleaks.sh b/build/test-memleaks.sh index f2a2518b..99d2cd2c 100755 --- a/build/test-memleaks.sh +++ b/build/test-memleaks.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ then echo "./hstr -n log" >> ${FILE_SCENARIOS} else echo "./hstr -k" > ${FILE_SCENARIOS} -fi +fi # ELSE following scenarios must be run MANUALLY from CLI # valgrind --track-origins=yes --tool=memcheck --leak-check=full --show-leak-kinds=all ./hstr # ENTER diff --git a/build/test-set-env-monster-history.sh b/build/test-set-env-monster-history.sh index 1fc7dcde..5a39ae4a 100755 --- a/build/test-set-env-monster-history.sh +++ b/build/test-set-env-monster-history.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/test-set-env-utf8-history.sh b/build/test-set-env-utf8-history.sh index 6fd020b6..c36df868 100755 --- a/build/test-set-env-utf8-history.sh +++ b/build/test-set-env-utf8-history.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/test-units.sh b/build/test-units.sh index d9180a2e..981a02fd 100755 --- a/build/test-units.sh +++ b/build/test-units.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ then fi # run -if [ ${OPTION_RUN_VALGRIND} ] +if [ ${OPTION_RUN_VALGRIND} ] then valgrind --track-origins=yes --tool=memcheck --leak-check=full --show-leak-kinds=all ./hstr-unit-tests # Valgrind's GDB diff --git a/build/travis-ci/.travis.yml b/build/travis-ci/.travis.yml index 58c2307e..b1f68ac6 100644 --- a/build/travis-ci/.travis.yml +++ b/build/travis-ci/.travis.yml @@ -1,6 +1,6 @@ # .travis.yml Travis CI configuration file for HSTR # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,7 +31,7 @@ dist: trusty # Travis CI provides Precise and Trusty only before_install: - sudo apt-get update -qq - "export DISPLAY=:99.0" - - "sh -e /etc/init.d/xvfb start" + - "sh -e /etc/init.d/xvfb start" - sudo add-apt-repository --yes ppa:ubuntu-sdk-team/ppa - sudo apt-get update -qq - eval "${MATRIX_EVAL}" diff --git a/build/ubuntu/launchpad-add-hstr-ppa.sh b/build/ubuntu/launchpad-add-hstr-ppa.sh index ccbe1866..62f08281 100755 --- a/build/ubuntu/launchpad-add-hstr-ppa.sh +++ b/build/ubuntu/launchpad-add-hstr-ppa.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/ubuntu/launchpad-make-all-releases.sh b/build/ubuntu/launchpad-make-all-releases.sh index 5955c514..bbe699c8 100755 --- a/build/ubuntu/launchpad-make-all-releases.sh +++ b/build/ubuntu/launchpad-make-all-releases.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -94,7 +94,7 @@ function releaseForParticularUbuntuVersion() { export HSTRRELEASE=hstr_${HSTRFULLVERSION} export NOW=`date +%Y-%m-%d--%H-%M-%S` export HSTRBUILD=hstr-${NOW} - + # checkout HSTR from Bazaar and prepare *configure using Autotools mkdir ${HSTRBUILD} && cd ${HSTRBUILD} checkoutHstr `pwd` @@ -116,7 +116,7 @@ function releaseForParticularUbuntuVersion() { echo "OK: GPG agent running." else gpg-agent --daemon - fi + fi # build .debs # OPTIONAL test build w/o signing: build UNSIGNED .deb package (us uc tells that no GPG signing is needed) @@ -124,7 +124,7 @@ function releaseForParticularUbuntuVersion() { # build SIGNED source .deb package bzr builddeb -S cd ../build-area - + # build binary from source deb on CLEAN system - no deps installed echo -e "\n_ hstr pbuilder-dist build _______________________________________________\n" # BEGIN: bug workaround - pbuilder's caches in /var and /home must be on same physical drive @@ -165,13 +165,16 @@ fi export ARG_BAZAAR_MSG="Release 3.1" export ARG_MAJOR_VERSION=3.1. -export ARG_MINOR_VERSION=1 # minor version is incremented for every Ubuntu version +export ARG_MINOR_VERSION=8 # minor version is incremented for every Ubuntu version # https://wiki.ubuntu.com/Releases -# obsolete: precise quantal saucy precise utopic vivid wily yakkety artful cosmic -# current : (trusty) xenial bionic (cosmic disco eoan) focal (groovy) (hirsute) (impish) jammy kinetic -# command : trusty xenial bionic focal jammy kinetic -for UBUNTU_VERSION in trusty xenial bionic focal jammy kinetic +# obsolete: +# precise quantal saucy precise utopic vivid wily yakkety xenial artful cosmic disco eoan groovy hirsute impish +# current : +# trusty xenial bionic focal jammy noble +# command : +# trusty xenial bionic focal jammy noble +for UBUNTU_VERSION in noble do echo "Releasing HSTR for Ubuntu version: ${UBUNTU_VERSION}" releaseForParticularUbuntuVersion ${UBUNTU_VERSION} ${ARG_MAJOR_VERSION}${ARG_MINOR_VERSION} "${ARG_BAZAAR_MSG}" diff --git a/build/ubuntu/pbuilder-add-new-distro.sh b/build/ubuntu/pbuilder-add-new-distro.sh index dde64428..6f7f0e60 100755 --- a/build/ubuntu/pbuilder-add-new-distro.sh +++ b/build/ubuntu/pbuilder-add-new-distro.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/build/ubuntu/pbuilder-refresh-all-distros.sh b/build/ubuntu/pbuilder-refresh-all-distros.sh index 74162980..723d9d66 100755 --- a/build/ubuntu/pbuilder-refresh-all-distros.sh +++ b/build/ubuntu/pbuilder-refresh-all-distros.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/configure.ac b/configure.ac index 16d12849..9241d980 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # configure.ac Autoconf configuration file # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ fi # PKG_CHECK_MODULES macro is NOT used to avoid confusing syntax errors in case that pkg-config is NOT installed AC_CHECK_LIB(ncursesw, killwchar, [], [ - AC_CHECK_LIB(ncurses, killwchar, [], + AC_CHECK_LIB(ncurses, killwchar, [], [ AC_SUBST([NCURSESW_CFLAGS]) AC_SUBST([NCURSESW_LIBS]) diff --git a/etc/bash-completion.d/hstr b/etc/bash-completion.d/hstr index 44ed31d1..e9351536 100755 --- a/etc/bash-completion.d/hstr +++ b/etc/bash-completion.d/hstr @@ -1,6 +1,6 @@ #!/bin/bash # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/hstr.pro b/hstr.pro index 199d5077..00024e05 100644 --- a/hstr.pro +++ b/hstr.pro @@ -1,6 +1,6 @@ # hstr.pro Qt project file for HSTR shell history completion utility # -# Copyright (C) 2014-2023 Martin Dvorak +# Copyright (C) 2014-2025 Martin Dvorak # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/pad.xml b/pad.xml index 2b7c3fd7..9e7d99ad 100644 --- a/pad.xml +++ b/pad.xml @@ -2,7 +2,7 @@