diff --git a/CMakeLists.txt b/CMakeLists.txt index 7551a865..5daebe64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(ZINT_VERSION_MAJOR 2) set(ZINT_VERSION_MINOR 13) set(ZINT_VERSION_RELEASE 0) -set(ZINT_VERSION_BUILD 0) # Set to 0 before release, set to 9 after release +set(ZINT_VERSION_BUILD 9) # 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 c2112f06..b01380d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Version 2.13.0.9 (dev) not released yet +======================================= + + Version 2.13.0 (2023-12-18) =========================== diff --git a/backend/Makefile.mingw b/backend/Makefile.mingw index 4f7da3bc..8aa750c1 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.13.0\" +ZINT_VERSION:=-DZINT_VERSION=\"2.13.0.9\" CC:= gcc diff --git a/backend/libzint.rc b/backend/libzint.rc index b0dd6e36..15136b85 100644 --- a/backend/libzint.rc +++ b/backend/libzint.rc @@ -2,8 +2,8 @@ #include #include -#define VER_FILEVERSION 2,13,0,0 -#define VER_FILEVERSION_STR "2.13.0.0\0" +#define VER_FILEVERSION 2,13,0,9 +#define VER_FILEVERSION_STR "2.13.0.9\0" #ifdef GCC_WINDRES VS_VERSION_INFO VERSIONINFO diff --git a/backend/zintconfig.h b/backend/zintconfig.h index dfa1d2b5..1ac0e302 100644 --- a/backend/zintconfig.h +++ b/backend/zintconfig.h @@ -37,7 +37,7 @@ #define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MINOR 13 #define ZINT_VERSION_RELEASE 0 -#define ZINT_VERSION_BUILD 0 +#define ZINT_VERSION_BUILD 9 /* vim: set ts=4 sw=4 et : */ #endif /* ZINTCONFIG_H */ diff --git a/backend_qt/backend_qt.pro b/backend_qt/backend_qt.pro index 2f4e4f67..bba1e6e7 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.13.0\\\"" +DEFINES += ZINT_VERSION="\\\"2.13.0.9\\\"" !contains(DEFINES, ZINT_NO_PNG) { INCLUDEPATH += ../../lpng @@ -117,7 +117,7 @@ SOURCES += ../backend/2of5.c \ ../backend/dllversion.c \ qzint.cpp -VERSION = 2.13.0 +VERSION = 2.13.0.9 #DESTDIR = . diff --git a/backend_qt/backend_vc8.pro b/backend_qt/backend_vc8.pro index c8383507..7a13213a 100644 --- a/backend_qt/backend_vc8.pro +++ b/backend_qt/backend_vc8.pro @@ -4,7 +4,7 @@ win32 { } TARGET = QtZint2 -VERSION = 2.13.0 +VERSION = 2.13.0.9 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 diff --git a/backend_tcl/zint_tcl.dsp b/backend_tcl/zint_tcl.dsp index 0db3d4fb..7addf506 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 "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.13.0\"" /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 "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /D ZINT_VERSION="\"2.13.0.9\"" /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 "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.13.0\"" /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 "USE_TCL_STUBS" /D "USE_TK_STUBS" /D "ZINT_NO_PNG" /FR /YX /FD /GZ /D ZINT_VERSION="\"2.13.0.9\"" /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.html b/docs/manual.html index 1cf1ca73..d6aa0fa8 100644 --- a/docs/manual.html +++ b/docs/manual.html @@ -4,7 +4,7 @@ - + Zint Barcode Generator and Zint Barcode Studio User Manual