From 6ac8c85dbbc7a424d6d86525bbb8082668d071dc Mon Sep 17 00:00:00 2001 From: gitlost Date: Tue, 24 May 2022 21:08:51 +0100 Subject: [PATCH] Update zint version to 2.11.0 --- CMakeLists.txt | 4 ++-- ChangeLog | 4 ++-- 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 | 4 ++-- docs/manual.pmd | 4 ++-- docs/manual.txt | 6 +++--- docs/zint.1 | 2 +- docs/zint.1.pmd | 2 +- frontend/Makefile.mingw | 2 +- frontend/zint.rc | 4 ++-- frontend_qt/res/qtZint.rc | 4 ++-- 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 +- 31 files changed, 70 insertions(+), 70 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6443559b..2b4cb668 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,9 @@ project(zint-package) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(ZINT_VERSION_MAJOR 2) -set(ZINT_VERSION_MINOR 10) +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_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 22e9d6b8..f826c8f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ -Version 2.10.0.9 (dev) not released yet -======================================= +Version 2.11.0 (2022-05-24) +=========================== **Incompatible changes** ------------------------ diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index bc208464..3ee7b471 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.10.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.11.0\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index 1955d5a6..d31471e4 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,10,0,9 -#define VER_FILEVERSION_STR "2.10.0.9\0" +#define VER_FILEVERSION 2,11,0,0 +#define VER_FILEVERSION_STR "2.11.0.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zintconfig.h b/backend/zintconfig.h index 12451aa6..24a61989 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -34,8 +34,8 @@ #define ZINTCONFIG_H #define ZINT_VERSION_MAJOR 2 -#define ZINT_VERSION_MINOR 10 +#define ZINT_VERSION_MINOR 11 #define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 9 +#define ZINT_VERSION_BUILD 0 #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index 109b4eff..ed6d8dc7 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.10.0.9\\\"" +DEFINES += ZINT_VERSION="\\\"2.11.0\\\"" !contains(DEFINES, NO_PNG) { INCLUDEPATH += ../../lpng @@ -119,7 +119,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.10.0.9 +VERSION = 2.11.0 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index 4f98e76f..74846d97 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.10.0.9 +VERSION = 2.11.0 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/configure b/backend_tcl/configure index 515a3642..af441d1a 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.10.0. +# Generated by GNU Autoconf 2.69 for zint 2.11.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.10.0' -PACKAGE_STRING='zint 2.10.0' +PACKAGE_VERSION='2.11.0' +PACKAGE_STRING='zint 2.11.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.10.0 to adapt to many kinds of systems. +\`configure' configures zint 2.11.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.10.0:";; + short | recursive ) echo "Configuration of zint 2.11.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.10.0 +zint configure 2.11.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.10.0, which was +It was created by zint $as_me 2.11.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.10.0, which was +This file was extended by zint $as_me 2.11.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.10.0 +zint config.status 2.11.0 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 ca1a1457..0fc28123 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.10.0]) +AC_INIT([zint], [2.11.0]) #-------------------------------------------------------------------- # 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 f5268d13..5e7ab36b 100644 --- a/backend_tcl/lib/zint/pkgIndex.tcl +++ b/backend_tcl/lib/zint/pkgIndex.tcl @@ -1,2 +1,2 @@ -package ifneeded zint 2.10.0\ +package ifneeded zint 2.11.0\ [list load [file join $dir zint[info sharedlibextension]]] diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp index 12049e08..fcd98bf6 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.10.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.0\"" /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.10.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.0\"" /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x407 /d "_DEBUG" diff --git a/docs/manual.pmd b/docs/manual.pmd index c4a48d03..9a21c402 100644 --- a/docs/manual.pmd +++ b/docs/manual.pmd @@ -1,5 +1,5 @@ % Zint Barcode Generator and Zint Barcode Studio User Manual -% Version 2.10.0.9 +% Version 2.11.0 % May 2022 # 1. Introduction @@ -4010,7 +4010,7 @@ those owners, companies or organisations. ## 7.3 Version Information -The current stable version of Zint is 2.10.0, released on 14th August 2021. +The current stable version of Zint is 2.11.0, released on 24th May 2022. See `"ChangeLog"` in the project root directory for information on all releases. diff --git a/docs/manual.txt b/docs/manual.txt index 21d0de4f..b4efeb59 100644 --- a/docs/manual.txt +++ b/docs/manual.txt @@ -1,5 +1,5 @@ Zint Barcode Generator and Zint Barcode Studio User Manual -Version 2.10.0.9 +Version 2.11.0 May 2022 ******************************************************************************* @@ -3903,7 +3903,7 @@ those owners, companies or organisations. 7.3 Version Information -The current stable version of Zint is 2.10.0, released on 14th August 2021. +The current stable version of Zint is 2.11.0, released on 24th May 2022. See "ChangeLog" in the project root directory for information on all releases. @@ -4057,7 +4057,7 @@ defined. B. zint(1) Man Page -% zint(1) Version 2.10.0.9 % % May 2022 +% zint(1) Version 2.11.0 % % May 2022 NAME diff --git a/docs/zint.1 b/docs/zint.1 index 2b3b47b7..3d1d15f1 100644 --- a/docs/zint.1 +++ b/docs/zint.1 @@ -14,7 +14,7 @@ . ftr VB CB . ftr VBI CBI .\} -.TH "zint" "1" "May 2022" "Version 2.10.0.9" "" +.TH "zint" "1" "May 2022" "Version 2.11.0" "" .hy .SH NAME .PP diff --git a/docs/zint.1.pmd b/docs/zint.1.pmd index 69c45b12..090b5ea9 100644 --- a/docs/zint.1.pmd +++ b/docs/zint.1.pmd @@ -1,4 +1,4 @@ -% zint(1) Version 2.10.0.9 +% zint(1) Version 2.11.0 % % May 2022 diff --git a/frontend/Makefile.mingw b/frontend/Makefile.mingw index a9920ee9..3942f2b3 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.10.0.9\" +ZINT_VERSION:=-DZINT_VERSION=\"2.11.0\" 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 fec3ee5a..6f37d4b4 100644 --- a/frontend/zint.rc +++ b/frontend/zint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,10,0,9 -#define VER_FILEVERSION_STR "2.10.0.9\0" +#define VER_FILEVERSION 2,11,0,0 +#define VER_FILEVERSION_STR "2.11.0.0\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/frontend_qt/res/qtZint.rc b/frontend_qt/res/qtZint.rc index 8471a880..baea4da5 100644 --- a/frontend_qt/res/qtZint.rc +++ b/frontend_qt/res/qtZint.rc @@ -5,8 +5,8 @@ #include -#define VER_FILEVERSION 2,10,0,9 -#define VER_FILEVERSION_STR "2.10.0.9\0" +#define VER_FILEVERSION 2,11,0,0 +#define VER_FILEVERSION_STR "2.11.0.0\0" #ifdef GCC_WINDRES diff --git a/win32/libzint.vcxproj b/win32/libzint.vcxproj index 440b4f0a..67a14286 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.10.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2008/libzint.vcproj b/win32/vs2008/libzint.vcproj index 15886067..073f3f2e 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.10.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.0\"";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.10.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.0\"";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.10.0.9\""" + PreprocessorDefinitions="WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2008/zint.vcproj b/win32/vs2008/zint.vcproj index dd791c7c..1b9e7042 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.10.0.9\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0\"";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.10.0.9\"";ZINT_DLL" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0\"";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.10.0.9\""" + PreprocessorDefinitions="WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="\"2.11.0\""" StringPooling="true" ExceptionHandling="0" RuntimeLibrary="2" diff --git a/win32/vs2015/libzint.vcxproj b/win32/vs2015/libzint.vcxproj index 33dd91f9..4764dcbf 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.10.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.0";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.10.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.0";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.10.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.0";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.10.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.0";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.10.0.9";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";%(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.10.0.9";%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";%(PreprocessorDefinitions) true diff --git a/win32/vs2015/vsx/libzintMD.vcxproj b/win32/vs2015/vsx/libzintMD.vcxproj index 1f78981d..666de937 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.10.0.9";NO_PNG;%(PreprocessorDefinitions) + WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";NO_PNG;%(PreprocessorDefinitions) true diff --git a/win32/vs2015/zint.vcxproj b/win32/vs2015/zint.vcxproj index 69a05161..651bb02f 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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";%(PreprocessorDefinitions) true MultiThreadedDLL @@ -205,7 +205,7 @@ MaxSpeed ..\..\backend;%(AdditionalIncludeDirectories) - WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.10.0.9";%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";%(PreprocessorDefinitions) true diff --git a/win32/vs2019/libzint.vcxproj b/win32/vs2019/libzint.vcxproj index 5daec566..49e26401 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.10.0.9";BUILD_ZINT_DLL;DEBUG;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";BUILD_ZINT_DLL;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";BUILD_ZINT_DLL;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/win32/vs2019/zint.vcxproj b/win32/vs2019/zint.vcxproj index 5b8528e3..2d4ab479 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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint.vcxproj b/win32/zint.vcxproj index 57d305b0..9e910b82 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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;_DEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";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.10.0.9";ZINT_DLL;%(PreprocessorDefinitions) + WIN32;_WIN32;NDEBUG;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;ZINT_VERSION="2.11.0";ZINT_DLL;%(PreprocessorDefinitions) true MultiThreaded diff --git a/win32/zint_cmdline_vc6/zint.rc b/win32/zint_cmdline_vc6/zint.rc index e41dea39..3e9e567a 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,10,0,9 -#define VER_FILEVERSION_STR "2.10.0.9\0" +#define VER_FILEVERSION 2,11,0,0 +#define VER_FILEVERSION_STR "2.11.0.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 5277e02e..8b5863c8 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.10.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.0\"" /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.10.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.0\"" /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 0005ccdf..a5798a1b 100644 --- a/zint.nsi +++ b/zint.nsi @@ -10,7 +10,7 @@ ;****************************************************************************** !define PRODUCT_NAME "Zint" !define PRODUCT_EXE "qtZint.exe" -!define PRODUCT_VERSION "2.10.0.9" +!define PRODUCT_VERSION "2.11.0" !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 7147e852..c4a8c804 100644 --- a/zint.spec +++ b/zint.spec @@ -1,5 +1,5 @@ Name: zint -Version: 2.10.0 +Version: 2.11.0 Release: 2%{?dist} Summary: A barcode generator and library License: GPLv3+