From 546114ed1e9b3011ec904f0884ea4a24f874aff3 Mon Sep 17 00:00:00 2001 From: gitlost Date: Wed, 11 Aug 2021 19:39:39 +0100 Subject: [PATCH] backend_tcl/lib/zint/pkgIndex.tcl: fix version, props HaO; run autoconf ChangeLog: fix version number/date, props HaO GUI: remove "Windows port by..." and place in thanks --- ChangeLog | 4 ++-- backend_tcl/configure | 18 +++++++++--------- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- frontend_qt/mainwindow.cpp | 15 +++++++-------- tools/update_version.php | 21 ++++++++++++++++----- 5 files changed, 35 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index e9757003..e744aa37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Version 2.9.1.9 (dev) (not released yet) -======================================== +Version 2.10.0 2021-08-14 +========================= **Incompatible changes** ------------------------ diff --git a/backend_tcl/configure b/backend_tcl/configure index 469354f0..515a3642 100755 --- a/backend_tcl/configure +++ b/backend_tcl/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for zint 2.9.1. +# Generated by GNU Autoconf 2.69 for zint 2.10.0. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zint' PACKAGE_TARNAME='zint' -PACKAGE_VERSION='2.9.1' -PACKAGE_STRING='zint 2.9.1' +PACKAGE_VERSION='2.10.0' +PACKAGE_STRING='zint 2.10.0' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1318,7 +1318,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zint 2.9.1 to adapt to many kinds of systems. +\`configure' configures zint 2.10.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1380,7 +1380,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zint 2.9.1:";; + short | recursive ) echo "Configuration of zint 2.10.0:";; esac cat <<\_ACEOF @@ -1482,7 +1482,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zint configure 2.9.1 +zint configure 2.10.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1847,7 +1847,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zint $as_me 2.9.1, which was +It was created by zint $as_me 2.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9595,7 +9595,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zint $as_me 2.9.1, which was +This file was extended by zint $as_me 2.10.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9648,7 +9648,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zint config.status 2.9.1 +zint config.status 2.10.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/backend_tcl/lib/zint/pkgIndex.tcl b/backend_tcl/lib/zint/pkgIndex.tcl index 6adb2bd1..f5268d13 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.9.1\ +package ifneeded zint 2.10.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/frontend_qt/mainwindow.cpp b/frontend_qt/mainwindow.cpp index 9e4e303e..267e71fb 100644 --- a/frontend_qt/mainwindow.cpp +++ b/frontend_qt/mainwindow.cpp @@ -384,18 +384,17 @@ void MainWindow::about() QMessageBox::about(this, tr("About Zint"), /*: %1 is Zint version, %2 is Qt version */ tr("

Zint Barcode Studio %1

" - "

A free barcode generator" + "

A free barcode generator

" "

Instruction manual is available at the project homepage:
" "http://www.zint.org.uk" "

Copyright © 2006-2021 Robin Stuart and others.
" - "Qt back end by BogDan Vatra
" - "Windows port by Harald Oehlmann

" - "

Qt version %2" - "

With thanks to Norbert Szabó, Robert Elliott, Milton Neal, " - "Git Lost, Alonso Schaich, Andre Maute and many others at Sourceforge." + "Qt backend by BogDan Vatra

" + "

Qt version %2

" + "

With thanks to Harald Oehlmann, Norbert Szabó, Robert Elliott, Milton Neal, " + "Git Lost, Alonso Schaich, Andre Maute and many others at Sourceforge.

" "

Released under the GNU General Public License ver. 3 or later.
" "\"QR Code\" is a Registered Trademark of Denso Corp.
" - "\"Telepen\" is a Registered Trademark of SB Electronics." + "\"Telepen\" is a Registered Trademark of SB Electronics.

" "

Currently supported standards include:
" "BS 797:1996, BS 798:1996, ISO/IEC 12323:2005, ISO/IEC 15417:2007,
" "ISO/IEC 15438:2015, ISO/IEC 16022:2006, ISO/IEC 16023:2000,
" @@ -403,7 +402,7 @@ void MainWindow::about() "ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,
" "ISO/IEC 21471:2019, ANSI-HIBC 2.6-2016, ANSI/AIM BC6-2000,
" "ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200" - "
").arg(zint_version).arg(QT_VERSION_STR)); + "

").arg(zint_version).arg(QT_VERSION_STR)); } int MainWindow::open_data_dialog() diff --git a/tools/update_version.php b/tools/update_version.php index 9e2a438a..635b9b6b 100644 --- a/tools/update_version.php +++ b/tools/update_version.php @@ -197,6 +197,14 @@ version_replace(1, $data_dirname . 'backend/Makefile.mingw', '/^ZINT_VERSION:=-D version_replace(1, $data_dirname . 'backend_tcl/configure.in', '/^AC_INIT\(\[zint\],[ \t]*\[/', '/[0-9.]+/', $v_base_str); +// backend_tcl/zint_tcl.dsp + +version_replace(2, $data_dirname . 'backend_tcl/zint_tcl.dsp', '/ZINT_VERSION="\\\\"/', '/ZINT_VERSION="\\\\"[0-9.]+\\\\""/', 'ZINT_VERSION="\\"' . $v_str . '\\""'); + +// backend_tcl/lib/zint/pkgIndex.tcl + +version_replace(1, $data_dirname . 'backend_tcl/lib/zint/pkgIndex.tcl', '/zint /', '/zint [0-9.]+/', 'zint ' . $v_base_str . ''); + // frontend/zint.rc rc_replace($data_dirname . 'frontend/zint.rc', $rc_str); @@ -238,7 +246,7 @@ version_replace(2, $data_dirname . 'win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp' version_replace(3, $data_dirname . 'win32/vs2008/libzint.vcproj', '/ZINT_VERSION="/', '/"[0-9.]+/', '"' . $v_str); -// win32/vs2008/zint.vcproj +// win32/vs2008/zint.vcproj version_replace(3, $data_dirname . 'win32/vs2008/zint.vcproj', '/ZINT_VERSION="/', '/"[0-9.]+/', '"' . $v_str); @@ -262,10 +270,13 @@ version_replace(2, $data_dirname . 'win32/vs2019/libzint.vcxproj', '/ZINT_VERSIO version_replace(2, $data_dirname . 'win32/vs2019/zint.vcxproj', '/ZINT_VERSION="/', '/ZINT_VERSION="[0-9.]+"/', 'ZINT_VERSION="' . $v_str . '"'); -// backend_tcl/zint_tcl.dsp - -version_replace(2, $data_dirname . 'backend_tcl/zint_tcl.dsp', '/ZINT_VERSION="\\\\"/', '/ZINT_VERSION="\\\\"[0-9.]+\\\\""/', 'ZINT_VERSION="\\"' . $v_str . '\\""'); - // Leaving auto-generated files: // backend_tcl/configure (PACKAGE_VERSION and PACKAGE_STRING) - generated by autoconf from configure.in // frontend_qt/Inno_Setup_qtzint.iss (MyAppVersion) + +print PHP_EOL; +print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL; +print '!!! REMEMBER: run "autoconf" and "./configure" in "backend_tcl/" !!!' . PHP_EOL; +print '!!! REMEMBER: update version and date in "ChangeLog" !!!' . PHP_EOL; +print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL; +print PHP_EOL;