Skip to content

Commit

Permalink
Merge branch 'dev-3.1.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
dvorka committed Jan 26, 2025
2 parents 4e02bd8 + 151aaac commit d8dae7e
Show file tree
Hide file tree
Showing 62 changed files with 94 additions and 91 deletions.
2 changes: 1 addition & 1 deletion build/anigif-build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/anigif-create.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/anigif-rename.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/arch/update-pkgconfig-sha256-on-repo-change.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions build/debian/aptly-add-deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2016-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions build/debian/make-deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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"`
Expand Down Expand Up @@ -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
#
Expand All @@ -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
Expand All @@ -113,7 +113,7 @@ function buildDebPackage() {
echo "OK: GPG agent running."
else
gpg-agent --daemon
fi
fi

DEBEMAIL="[email protected]"
DEBFULLNAME="Martin Dvorak"
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/debian/upload-to-mentors.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
8 changes: 4 additions & 4 deletions build/fedora/rpm-from-deb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions build/tarball/tarball-automake.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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() {
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/tarball/tarball-build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/tarball/tarball-uninstall.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions build/test-clean.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -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
2 changes: 1 addition & 1 deletion build/test-gdb.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/test-generate-unity-test-runner.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions build/test-memleaks.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/test-set-env-monster-history.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/test-set-env-utf8-history.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions build/test-units.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions build/travis-ci/.travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# .travis.yml Travis CI configuration file for HSTR
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion build/ubuntu/launchpad-add-hstr-ppa.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
21 changes: 12 additions & 9 deletions build/ubuntu/launchpad-make-all-releases.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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`
Expand All @@ -116,15 +116,15 @@ 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)
#bzr builddeb -- -us -uc
# 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
Expand Down Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion build/ubuntu/pbuilder-add-new-distro.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build/ubuntu/pbuilder-refresh-all-distros.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# configure.ac Autoconf configuration file
#
# Copyright (C) 2014-2023 Martin Dvorak <[email protected]>
# Copyright (C) 2014-2025 Martin Dvorak <[email protected]>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -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])
Expand Down
Loading

0 comments on commit d8dae7e

Please sign in to comment.