From 8310a4b93874a045ef7680465229ab3c90bf9fde Mon Sep 17 00:00:00 2001 From: gitlost Date: Mon, 22 Aug 2022 16:28:22 +0100 Subject: [PATCH] Release 2.11.1 --- CMakeLists.txt | 4 ++-- ChangeLog | 6 ++--- README.linux | 8 +++---- backend/Makefile.mingw | 2 +- backend/libzint.rc | 4 ++-- backend/zintconfig.h | 4 ++-- backend_qt/backend_qt.pro | 4 ++-- backend_qt/backend_vc8.pro | 2 +- backend_tcl/configure | 18 +++++++-------- backend_tcl/configure.in | 2 +- backend_tcl/lib/zint/pkgIndex.tcl | 2 +- backend_tcl/zint_tcl.dsp | 8 +++++-- docs/manual.pmd | 18 +++++++-------- docs/manual.txt | 23 +++++++++---------- docs/zint.1 | 4 ++-- docs/zint.1.pmd | 6 ++--- frontend/Makefile.mingw | 2 +- frontend/zint.rc | 4 ++-- frontend_qt/frontend_qt.pro | 3 +-- frontend_qt/frontend_qt_zintdll.pro | 1 + .../howto_build_qzint_using_msvs2015.txt | 3 +++ frontend_qt/res/qtZint.rc | 4 ++-- tools/update_version.php | 6 +++-- win32/libzint.vcxproj | 4 ++-- win32/vs2008/libzint.vcproj | 6 ++--- win32/vs2008/zint.vcproj | 6 ++--- win32/vs2015/libzint.vcxproj | 12 +++++----- win32/vs2015/vsx/libzintMD.vcxproj | 2 +- win32/vs2015/zint.vcxproj | 12 +++++----- win32/vs2019/libzint.vcxproj | 4 ++-- win32/vs2019/zint.vcxproj | 4 ++-- win32/zint.vcxproj | 4 ++-- win32/zint_cmdline_vc6/zint.rc | 4 ++-- win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp | 4 ++-- zint.nsi | 2 +- zint.spec | 2 +- 36 files changed, 106 insertions(+), 98 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4b674e27..dbe7ec1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(ZINT_VERSION_MAJOR 2) set(ZINT_VERSION_MINOR 11) -set(ZINT_VERSION_RELEASE 0) -set(ZINT_VERSION_BUILD 9) # Set to 0 before release, set to 9 after release +set(ZINT_VERSION_RELEASE 1) +set(ZINT_VERSION_BUILD 0) # Set to 0 before release, set to 9 after release set(ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}.${ZINT_VERSION_BUILD}") add_definitions(-DZINT_VERSION=\"${ZINT_VERSION}\") diff --git a/ChangeLog b/ChangeLog index b1d826f4..5e784ef9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,9 @@ -Version 2.11.0.9 (dev) not released yet -======================================= +Version 2.11.1 (2022-08-22) +=========================== **Incompatible changes** ------------------------ - - None yet + - None Changes ------- diff --git a/README.linux b/README.linux index aaad1c4e..b1f90ec0 100644 --- a/README.linux +++ b/README.linux @@ -21,10 +21,10 @@ or Fedora Then either download the source code tarball - wget -O zint-2.11.0-src.tar.gz \ - https://sourceforge.net/projects/zint/files/zint/2.11.0/zint-2.11.0-src.tar.gz/download - tar xf zint-2.11.0-src.tar.gz - cd zint-2.11.0-src + wget -O zint-2.11.1-src.tar.gz \ + https://sourceforge.net/projects/zint/files/zint/2.11.1/zint-2.11.1-src.tar.gz/download + tar xf zint-2.11.1-src.tar.gz + cd zint-2.11.1-src or clone the latest source diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index 91e496d9..088df9c1 100644 --- a/backend/Makefile.mingw +++ b/backend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.11.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.11.1\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index 2153c8bf..9151f342 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,11,0,9 -#define VER_FILEVERSION_STR "2.11.0.9\0" +#define VER_FILEVERSION 2,11,1,0 +#define VER_FILEVERSION_STR "2.11.1.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zintconfig.h b/backend/zintconfig.h index 9c0d74bd..ca7f98dd 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -35,7 +35,7 @@ #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 11 -#define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 9 +#define ZINT_VERSION_RELEASE 1 +#define ZINT_VERSION_BUILD 0 #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index ad9710a1..5ba7132b 100644 --- a/backend_qt/backend_qt.pro +++ b/backend_qt/backend_qt.pro @@ -17,7 +17,7 @@ TARGET = QtZint INCLUDEPATH += ../backend #EDIT THIS !!!! -DEFINES += ZINT_VERSION="\\\"2.11.0.9\\\"" +DEFINES += ZINT_VERSION="\\\"2.11.1\\\"" !contains(DEFINES, NO_PNG) { INCLUDEPATH += ../../lpng @@ -116,7 +116,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.11.0.9 +VERSION = 2.11.1 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 023123b8..36c539fc 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.11.0.9 +VERSION = 2.11.1 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/configure b/backend_tcl/configure index 4283ea12..ea571334 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.11.0. +# Generated by GNU Autoconf 2.69 for zint 2.11.1. # # # 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.11.0' -PACKAGE_STRING='zint 2.11.0' +PACKAGE_VERSION='2.11.1' +PACKAGE_STRING='zint 2.11.1' 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.11.0 to adapt to many kinds of systems. +\`configure' configures zint 2.11.1 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.11.0:";; + short | recursive ) echo "Configuration of zint 2.11.1:";; 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.11.0 +zint configure 2.11.1 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.11.0, which was +It was created by zint $as_me 2.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -9593,7 +9593,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.11.0, which was +This file was extended by zint $as_me 2.11.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9646,7 +9646,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.11.0 +zint config.status 2.11.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/backend_tcl/configure.in b/backend_tcl/configure.in index e3a3a448..dc7ca4d7 100644 --- a/backend_tcl/configure.in +++ b/backend_tcl/configure.in @@ -14,7 +14,7 @@ # so you can encode the package version directly into the source files. #----------------------------------------------------------------------- -AC_INIT([zint], [2.11.0]) +AC_INIT([zint], [2.11.1]) #-------------------------------------------------------------------- # Call TEA_INIT as the first TEA_ macro to set up initial vars. diff --git a/backend_tcl/lib/zint/pkgIndex.tcl b/backend_tcl/lib/zint/pkgIndex.tcl index 5e7ab36b..87561973 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.11.0\ +package ifneeded zint 2.11.1\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp index a98fe3be..61f653a4 100644 --- a/backend_tcl/zint_tcl.dsp +++ b/backend_tcl/zint_tcl.dsp @@ -43,7 +43,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.11.0.9\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.11.1\"" /c # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "NDEBUG" @@ -70,7 +70,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /YX /FD /GZ /c -# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.11.0.9\"" /c +# ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\Tcl\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZINT_TCL_EXPORTS" /D "NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.11.1\"" /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" @@ -105,6 +105,10 @@ SOURCE=..\backend\aztec.c # End Source File # Begin Source File +SOURCE=..\backend\bc412.c +# End Source File +# Begin Source File + SOURCE=..\backend\bmp.c # End Source File # Begin Source File diff --git a/docs/manual.pmd b/docs/manual.pmd index 7c24a863..3f833cf8 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -1,5 +1,5 @@ % Zint Barcode Generator and Zint Barcode Studio User Manual -% Version 2.11.0.9 +% Version 2.11.1 % August 2022 # 1. Introduction @@ -1280,7 +1280,7 @@ zint -b 84 --direct --filetype=pcx -d "Data to encode" ``` This command will output the symbol as a PCX file to stdout. The currently -supported output file formats are shown in the following table: +supported output file formats are shown in the following table. Abbreviation File format ------------ --------------------------- @@ -3175,7 +3175,7 @@ information on mail items. Valid data characters are 0-9, A-Z, a-z, space and hash (#). A Format Control Code (FCC) is added by Zint and should not be included in the input data. Reed-Solomon error correction data is generated by Zint. Encoding behaviour is determined by the length of the input data according -to the formula shown in the following table: +to the formula shown in the following table. ------------------------------------------------------------- Input Required Input Format Symbol FCC Encoding @@ -3590,7 +3590,7 @@ MaxiCode symbols are composed of two parts named the primary and secondary messages. The primary message consists of a Structured Carrier Message which includes various data about the package being sent and the secondary message usually consists of address data in a data structure. The format of the primary -message required by Zint is given in the following table: +message required by Zint is given in the following table. Characters Meaning ---------- ----------------------------------------------------------------- @@ -3716,7 +3716,7 @@ is dependent on the length of the data input and Zint will allow error correction capacities as low as 3 codewords. Alternatively the amount of error correction data can be specified by setting -the `--secure` option (API `option_1`) to a value from the following table: +the `--secure` option (API `option_1`) to a value from the following table. Mode Error Correction Capacity ---- ------------------------- @@ -3810,7 +3810,7 @@ The size of the symbol and the error correction capacity can be specified. If you specify both of these values then Zint will make a 'best-fit' attempt to satisfy both conditions. The symbol size can be specified using the `--vers` option (API `option_2`), and the error correction capacity can be specified by -using the `--secure` option (API `option_1`), according to the following tables: +using the `--secure` option (API `option_1`), according to the following tables. Input Symbol Size Input Symbol Size ----- ----------- - ----- ----------- @@ -3915,7 +3915,7 @@ Table: {#tbl:hanxin_sizes tag=": Han Xin Sizes"} There are four levels of error correction capacity available for Han Xin Code which can be set by using the `--secure` option (API `option_1`) to a value from -the following table: +the following table. Mode Recovery Capacity ---- ----------------- @@ -3944,7 +3944,7 @@ option_3 = ZINT_FULL_MULTIBYTE | (N + 1) << 8 This symbology uses a grid of coloured elements to encode data. ECI and GS1 modes are supported. The amount of error correction can be set using the -`--secure` option (API `option_1`) to a value as shown in the following table: +`--secure` option (API `option_1`) to a value as shown in the following table. Value EC Level Amount of symbol holding error correction data ----- -------- ---------------------------------------------- @@ -4054,7 +4054,7 @@ those owners, companies or organisations. ## 7.3 Version Information -The current stable version of Zint is 2.11.0, released on 24th May 2022. +The current stable version of Zint is 2.11.1, released on 22nd August 2022. See `"ChangeLog"` in the project root directory for information on all releases. diff --git a/docs/manual.txt b/docs/manual.txt index 1b0ad9ca..a446e107 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -1,5 +1,5 @@ Zint Barcode Generator and Zint Barcode Studio User Manual -Version 2.11.0.9 +Version 2.11.1 August 2022 ******************************************************************************* @@ -1356,7 +1356,7 @@ suffix of the file type required. For example: zint -b 84 --direct --filetype=pcx -d "Data to encode" This command will output the symbol as a PCX file to stdout. The currently -supported output file formats are shown in the following table: +supported output file formats are shown in the following table. Abbreviation File format -------------- ------------------------------------------- @@ -3110,7 +3110,7 @@ on mail items. Valid data characters are 0-9, A-Z, a-z, space and hash (#). A Format Control Code (FCC) is added by Zint and should not be included in the input data. Reed-Solomon error correction data is generated by Zint. Encoding behaviour is determined by the length of the input data according to the formula -shown in the following table: +shown in the following table. --------------------------------------------------------------- Input Required Input Format Symbol FCC Encoding @@ -3505,7 +3505,7 @@ MaxiCode symbols are composed of two parts named the primary and secondary messages. The primary message consists of a Structured Carrier Message which includes various data about the package being sent and the secondary message usually consists of address data in a data structure. The format of the primary -message required by Zint is given in the following table: +message required by Zint is given in the following table. Characters Meaning ------------ ------------------------------------------------------------------- @@ -3624,7 +3624,7 @@ is dependent on the length of the data input and Zint will allow error correction capacities as low as 3 codewords. Alternatively the amount of error correction data can be specified by setting -the --secure option (API option_1) to a value from the following table: +the --secure option (API option_1) to a value from the following table. Mode Error Correction Capacity ------ --------------------------- @@ -3717,7 +3717,7 @@ The size of the symbol and the error correction capacity can be specified. If you specify both of these values then Zint will make a ‘best-fit’ attempt to satisfy both conditions. The symbol size can be specified using the --vers option (API option_2), and the error correction capacity can be specified by -using the --secure option (API option_1), according to the following tables: +using the --secure option (API option_1), according to the following tables. Input Symbol Size Input Symbol Size ------- ------------- -- ------- ------------- @@ -3821,7 +3821,7 @@ to a value between 1 and 84 according to the following table. There are four levels of error correction capacity available for Han Xin Code which can be set by using the --secure option (API option_1) to a value from the -following table: +following table. Mode Recovery Capacity ------ ------------------- @@ -3849,7 +3849,7 @@ option_3 = (N + 1) << 8 where N is 0-3. To use with ZINT_FULL_MULTIBYTE set This symbology uses a grid of coloured elements to encode data. ECI and GS1 modes are supported. The amount of error correction can be set using the ---secure option (API option_1) to a value as shown in the following table: +--secure option (API option_1) to a value as shown in the following table. Value EC Level Amount of symbol holding error correction data ------- ---------- ------------------------------------------------ @@ -3954,7 +3954,7 @@ those owners, companies or organisations. 7.3 Version Information -The current stable version of Zint is 2.11.0, released on 24th May 2022. +The current stable version of Zint is 2.11.1, released on 22nd August 2022. See "ChangeLog" in the project root directory for information on all releases. @@ -4120,7 +4120,7 @@ defined. Annex B. Man Page ZINT(1) -% ZINT(1) Version 2.11.0.9 % % June 2022 +% ZINT(1) Version 2.11.1 % % August 2022 NAME @@ -4502,8 +4502,7 @@ OPTIONS rMQR 1 to 38 (33 to 38 automatic width) For a number of linear symbols, it specifies check character options (“hide” - or “hidden” means don’t show in HRT, “show” or “visible” means do display in - HRT): + or “hidden” means don’t show in HRT, “visible” means do display in HRT): C25IATA 1 or 2 (add visible or hidden check digit) C25IND ditto diff --git a/docs/zint.1 b/docs/zint.1 index 30a03547..e60c8cba 100644 --- a/docs/zint.1 +++ b/docs/zint.1 @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "ZINT" "1" "June 2022" "Version 2.11.0.9" "" +.TH "ZINT" "1" "August 2022" "Version 2.11.1" "" .hy .SH NAME .PP @@ -431,7 +431,7 @@ rMQR 1 to 38 (33 to 38 automatic width) .PP For a number of linear symbols, it specifies check character options (\[lq]hide\[rq] or \[lq]hidden\[rq] means don\[cq]t show in HRT, -\[lq]show\[rq] or \[lq]visible\[rq] means do display in HRT): +\[lq]visible\[rq] means do display in HRT): .IP .nf \f[C] diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd index 8ecaf6b4..6c85d97b 100644 --- a/docs/zint.1.pmd +++ b/docs/zint.1.pmd @@ -1,6 +1,6 @@ -% ZINT(1) Version 2.11.0.9 +% ZINT(1) Version 2.11.1 % -% June 2022 +% August 2022 # NAME @@ -343,7 +343,7 @@ Paintbrush (`PCX`), Portable Network Format (`PNG`), Scalable Vector Graphic (`S rMQR 1 to 38 (33 to 38 automatic width) For a number of linear symbols, it specifies check character options ("hide" or "hidden" means don't show in HRT, - "show" or "visible" means do display in HRT): + "visible" means do display in HRT): C25IATA 1 or 2 (add visible or hidden check digit) C25IND ditto diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw index 53f3ee86..cc933499 100644 --- a/frontend/Makefile.mingw +++ b/frontend/Makefile.mingw @@ -6,7 +6,7 @@ # make clean cleans up a previous compilation and any object or editor files # -ZINT_VERSION:=-DZINT_VERSION=\"2.11.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.11.1\" CC := gcc CFLAGS := -D_WIN32 -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall -I../backend diff --git a/frontend/zint.rc b/frontend/zint.rc index 633b3550..ef0d6830 100644 --- a/frontend/zint.rc +++ b/frontend/zint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,11,0,9 -#define VER_FILEVERSION_STR "2.11.0.9\0" +#define VER_FILEVERSION 2,11,1,0 +#define VER_FILEVERSION_STR "2.11.1.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/frontend_qt/frontend_qt.pro b/frontend_qt/frontend_qt.pro index 394ca338..fde6aa20 100644 --- a/frontend_qt/frontend_qt.pro +++ b/frontend_qt/frontend_qt.pro @@ -8,10 +8,9 @@ INCLUDEPATH += ../backend_qt INCLUDEPATH += ../../lpng INCLUDEPATH += ../../zlib } -QT += gui QT += uitools QT += widgets -QT += uitools +QT += svg # Input HEADERS += barcodeitem.h \ diff --git a/frontend_qt/frontend_qt_zintdll.pro b/frontend_qt/frontend_qt_zintdll.pro index 457bb56a..8d613d5b 100644 --- a/frontend_qt/frontend_qt_zintdll.pro +++ b/frontend_qt/frontend_qt_zintdll.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = qtZint QT += uitools QT += widgets +QT += svg # Input HEADERS += barcodeitem.h \ diff --git a/frontend_qt/howto_build_qzint_using_msvs2015.txt b/frontend_qt/howto_build_qzint_using_msvs2015.txt index 4b8d6f1a..cd071986 100644 --- a/frontend_qt/howto_build_qzint_using_msvs2015.txt +++ b/frontend_qt/howto_build_qzint_using_msvs2015.txt @@ -17,6 +17,9 @@ Build static Qt: Visual Studio 2015\Visual Studio Tools\Windows Desktop Command Prompts\VS2015 x86 Native Tools-Eingabeaufforderung ("Eingabeaufforderung" = "Command Prompt") +Note: if "rc.exe" not available, install a Windows Kit and update PATH (e.g.): +- set "PATH=C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86;%PATH%" + - cd C:\qt\qt-everywhere-src-5.15.2 - configure.bat -static -release -prefix c:\qt\5.15.2static -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -qt-freetype -opengl desktop -no-openssl -opensource -confirm-license -make libs -nomake tools -nomake examples -nomake tests -mp One may set another destination folder after the -prefix option. diff --git a/frontend_qt/res/qtZint.rc b/frontend_qt/res/qtZint.rc index 923acdc7..84a2949c 100644 --- a/frontend_qt/res/qtZint.rc +++ b/frontend_qt/res/qtZint.rc @@ -5,8 +5,8 @@ #include -#define VER_FILEVERSION 2,11,0,9 -#define VER_FILEVERSION_STR "2.11.0.9\0" +#define VER_FILEVERSION 2,11,1,0 +#define VER_FILEVERSION_STR "2.11.1.0\0" #ifdef GCC_WINDRES diff --git a/tools/update_version.php b/tools/update_version.php index 1238ec41..f72ea7ac 100644 --- a/tools/update_version.php +++ b/tools/update_version.php @@ -5,6 +5,7 @@ Copyright (C) 2020-2022 Robin Stuart */ /* SPDX-License-Identifier: BSD-3-Clause */ + /* Run from project directory * * php tools/update_version.php ZINT_VERSION_MAJOR ZINT_VERSION_MINOR ZINT_VERSION_RELEASE [ZINT_VERSION_BUILD] @@ -64,7 +65,7 @@ function version_replace($to_do, $file, $match_pattern, $replace_pattern, $repla foreach ($lines as $li => $line) { if (preg_match($match_pattern, $line)) { $cnt = 0; - $lines[$li] = preg_replace($replace_pattern, $replace_str, $line, 1, $cnt); + $lines[$li] = preg_replace($replace_pattern, $replace_str, $line, -1, $cnt); if ($cnt === 0 || $lines[$li] === NULL) { exit("$basename: ERROR: Could not replace \"$match_pattern\" in file \"$file\"" . PHP_EOL); } @@ -154,7 +155,7 @@ if (!file_put_contents($file, implode("\n", $lines))) { // README.linux -version_replace(3, $data_dirname . 'README.linux', '/zint-[0-9]/', '/[0-9][0-9.]+/', $v_base_str); +version_replace(4, $data_dirname . 'README.linux', '/zint-[0-9]/', '/[0-9][0-9.]+/', $v_base_str); // zint.spec @@ -304,6 +305,7 @@ version_replace(2, $data_dirname . 'win32/vs2019/zint.vcxproj', '/ZINT_VERSION=" print PHP_EOL; print '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!' . PHP_EOL; +print '!!! REMEMBER: update release date in manual and man page !!!' . PHP_EOL; print '!!! REMEMBER: cd docs; make !!!' . PHP_EOL; print '!!! REMEMBER: run "autoconf" and "./configure" in "backend_tcl/" !!!' . PHP_EOL; print '!!! REMEMBER: update version and date in "ChangeLog" !!!' . PHP_EOL; diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index e959ecde..251a6943 100644 --- a/win32/libzint.vcxproj +++ b/win32/libzint.vcxproj @@ -57,7 +57,7 @@ Disabled ..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -92,7 +92,7 @@ MaxSpeed false ..\..\zlib\;..\..\lpng\;..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2008/libzint.vcproj b/win32/vs2008/libzint.vcproj index 2aac9793..ba03ac31 100644 --- a/win32/vs2008/libzint.vcproj +++ b/win32/vs2008/libzint.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\support\lpng169;"..\..\zlib128-dll\include"" - PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0.9\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG" + PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -127,7 +127,7 @@ Optimization="2" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="..\..\..\support\lpng169;"..\..\zlib128-dll\include"" - PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0.9\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL" + PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1\"";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" @@ -212,7 +212,7 @@ Optimization="2" EnableIntrinsicFunctions="false" AdditionalIncludeDirectories="d:\opt\include" - PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0.9\""" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2008/zint.vcproj b/win32/vs2008/zint.vcproj index 8a327d0b..d794e15a 100644 --- a/win32/vs2008/zint.vcproj +++ b/win32/vs2008/zint.vcproj @@ -42,7 +42,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\backend" - PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0.9\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1\"";ZINT_DLL" MinimalRebuild="true" ExceptionHandling="0" BasicRuntimeChecks="3" @@ -115,7 +115,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\backend" - PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0.9\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1\"";ZINT_DLL" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="0" @@ -187,7 +187,7 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="..\backend" - PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0.9\""" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.1\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj index 5a49e0b5..45fb63f4 100644 --- a/win32/vs2015/libzint.vcxproj +++ b/win32/vs2015/libzint.vcxproj @@ -117,7 +117,7 @@ Disabled ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";NO_PNG;BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -150,7 +150,7 @@ Disabled ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) + NO_PNG;WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;DEBUG;%(PreprocessorDefinitions) EnableFastChecks @@ -184,7 +184,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;NO_PNG;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;ZLIB_DLL;PNG_DLL;NO_PNG;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -218,7 +218,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;NO_PNG;ZLIB_DLL;PNG_DLL;%(PreprocessorDefinitions) true @@ -254,7 +254,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -278,7 +278,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";%(PreprocessorDefinitions) true diff --git a/win32/vs2015/vsx/libzintMD.vcxproj b/win32/vs2015/vsx/libzintMD.vcxproj index ccd12187..f3b9d831 100644 --- a/win32/vs2015/vsx/libzintMD.vcxproj +++ b/win32/vs2015/vsx/libzintMD.vcxproj @@ -39,7 +39,7 @@ MaxSpeed true d:\opt1\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";NO_PNG;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";NO_PNG;%(PreprocessorDefinitions) true diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj index 988def15..732168ad 100644 --- a/win32/vs2015/zint.vcxproj +++ b/win32/vs2015/zint.vcxproj @@ -108,7 +108,7 @@ Disabled ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -127,7 +127,7 @@ Disabled ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) EnableFastChecks @@ -147,7 +147,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded @@ -165,7 +165,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true @@ -186,7 +186,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";%(PreprocessorDefinitions) true diff --git a/win32/vs2019/libzint.vcxproj b/win32/vs2019/libzint.vcxproj index b279ce72..40300baf 100644 --- a/win32/vs2019/libzint.vcxproj +++ b/win32/vs2019/libzint.vcxproj @@ -57,7 +57,7 @@ Disabled ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) true EnableFastChecks @@ -92,7 +92,7 @@ MaxSpeed false ..\..\..\zlib\;..\..\..\lpng\;..\..\..\lpng\build;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2019/zint.vcxproj b/win32/vs2019/zint.vcxproj index 257cb5b8..fccee7a9 100644 --- a/win32/vs2019/zint.vcxproj +++ b/win32/vs2019/zint.vcxproj @@ -53,7 +53,7 @@ Disabled ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index 8223a824..95232f78 100644 --- a/win32/zint.vcxproj +++ b/win32/zint.vcxproj @@ -53,7 +53,7 @@ Disabled ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true EnableFastChecks @@ -72,7 +72,7 @@ MaxSpeed ..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.1";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index 11ececf1..0ec80a09 100644 --- a/win32/zint_cmdline_vc6/zint.rc +++ b/win32/zint_cmdline_vc6/zint.rc @@ -30,8 +30,8 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN // Version // -#define VER_FILEVERSION 2,11,0,9 -#define VER_FILEVERSION_STR "2.11.0.9\0" +#define VER_FILEVERSION 2,11,1,0 +#define VER_FILEVERSION_STR "2.11.1.0\0" VS_VERSION_INFO VERSIONINFO FILEVERSION VER_FILEVERSION diff --git a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp index 1301a233..1cf48d8e 100644 --- a/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp +++ b/win32/zint_cmdline_vc6/zint_cmdline_vc6.dsp @@ -42,7 +42,7 @@ RSC=rc.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.11.0.9\"" /c +# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\backend" /I "..\..\..\zlib" /I "..\..\..\lpng" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /D ZINT_VERSION="\"2.11.1\"" /c # ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD RSC /l 0x407 /d "NDEBUG" BSC32=bscmake.exe @@ -66,7 +66,7 @@ LINK32=link.exe # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\lpng" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.11.0.9\"" /c +# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\backend" /I "..\..\..\lpng" /I "..\..\..\zlib" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "NO_PNG" /D "DEBUG" /YX /FD /GZ /D ZINT_VERSION="\"2.11.1\"" /c # ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD RSC /l 0x407 /d "_DEBUG" BSC32=bscmake.exe diff --git a/zint.nsi b/zint.nsi index cdf1821c..1995e994 100644 --- a/zint.nsi +++ b/zint.nsi @@ -10,7 +10,7 @@ ;****************************************************************************** !define PRODUCT_NAME "Zint" !define PRODUCT_EXE "qtZint.exe" -!define PRODUCT_VERSION "2.11.0.9" +!define PRODUCT_VERSION "2.11.1" !define PRODUCT_WEB_SITE "http://www.zint.org.uk" !define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}" diff --git a/zint.spec b/zint.spec index 7a93b856..6fb1a181 100644 --- a/zint.spec +++ b/zint.spec @@ -1,5 +1,5 @@ Name: zint -Version: 2.11.0 +Version: 2.11.1 Release: 2%{?dist} Summary: A barcode generator and library License: GPLv3+