kastet/zint
1
0
Fork 0
mirror of https://github.com/woo-j/zint.git synced 2024-12-23 13:33:55 +03:00
Code Issues Projects Releases Wiki Activity

Update version to 2.7.0

Browse Source
This commit is contained in:
Harald Oehlmann 2019-12-05 20:16:39 +01:00
parent 34c33b45b5
commit e03d03c877
12 changed files with 35 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/libzint.rc
View File

@ -25,12 +25,12 @@ BEGIN
//language ID = U.S. English, char set = Windows, Multilingual
BEGIN
VALUE "FileDescription", "libzint barcode library\0"
VALUE "FileVersion", "2.6.0.0\0"
VALUE "FileVersion", "2.7.0.0\0"
VALUE "InternalName", "zint.dll\0"
VALUE "LegalCopyright", "Copyright © 2017 Robin Stuart & BogDan Vatra\0"
VALUE "OriginalFilename", "zint.dll\0"
VALUE "ProductName", "libzint\0"
VALUE "ProductVersion", "2.6.0.0\0"
VALUE "ProductVersion", "2.7.0.0\0"
VALUE "License", "BSD License version 3\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint"
END

2
backend/tests/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/"
set(ZINT_DEBUG FALSE CACHE BOOL "Set debug compile flag")
set(ZINT_SANITIZE FALSE CACHE BOOL "Set sanitize compile/link flags")
find_package (LibZint 2.6.4 REQUIRED)
find_package (LibZint 2.7.0 REQUIRED)
find_package(PNG)
if (PNG_FOUND)

4
backend/zint.h
View File

@ -136,8 +136,8 @@ extern "C" {
};
#define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 6
#define ZINT_VERSION_RELEASE 7
#define ZINT_VERSION_MINOR 7
#define ZINT_VERSION_RELEASE 0
/* Tbarcode 7 codes */
#define BARCODE_CODE11 1

4
backend_qt/backend_qt.pro
View File

@ -19,7 +19,7 @@ TARGET = QtZint
INCLUDEPATH += ../backend
#EDIT THIS !!!!
DEFINES += ZINT_VERSION="\\\"2.6.7\\\""
DEFINES += ZINT_VERSION="\\\"2.7.0\\\""
!contains(DEFINES, NO_PNG) {
INCLUDEPATH += ../../lpng
@ -123,7 +123,7 @@ SOURCES += ../backend/2of5.c \
../backend/png.c \
qzint.cpp
VERSION = 2.6.7
VERSION = 2.7.0
#DESTDIR = .

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files.
#-----------------------------------------------------------------------
AC_INIT([zint], [2.6.7])
AC_INIT([zint], [2.7.0])
#--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars.

2
backend_tcl/lib/zint/pkgIndex.tcl
View File

@ -1,2 +1,2 @@
package ifneeded zint 2.6.7\
package ifneeded zint 2.7.0\
[list load [file join $dir zint[info sharedlibextension]]]

8
backend_tcl/zint.c
View File

@ -64,6 +64,9 @@
- Framework 2.6.6 update
2019-10-07 2.6.7 HaO
- Framework 2.6.7 update
2019-12-05 2.7.0 HaO
- Framework 2.7.0 update
- Add symbology rmqr
*/
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -103,7 +106,7 @@
/*----------------------------------------------------------------------------*/
/* > File option defines */
#define VERSION "2.6.7"
#define VERSION "2.7.0"
/*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */
@ -218,6 +221,7 @@ static char *s_code_list[] = {
"CodeOne",
"GridMatrix",
"UPNQR",
"rMQR",
NULL};
static int s_code_number[] = {
@ -313,6 +317,7 @@ static int s_code_number[] = {
BARCODE_CODEONE,
BARCODE_GRIDMATRIX,
BARCODE_UPNQR,
BARCODE_RMQR,
0};
/* ECI TCL encoding names.
@ -368,7 +373,6 @@ static int s_eci_unicode_input[] = {
static char version_string[] = VERSION;
/* Help text */
static char help_message[] = "zint tcl(stub,obj) dll\n"
"(c) 2018-11-02 Harald Oehlmann\n"
" Generate barcode in tk images\n"
"Usage:\n"
" zint encode data photo option value...\n"

4
backend_tcl/zint_tcl.dsp
View File

@ -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 /MT /W3 /GX /O2 /I "..\backend" /I "C:\myprograms\tcl8.5\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.6.1\"" /c
# ADD CPP /nologo /MT /W3 /GX /O2 /I "..\backend" /I "C:\myprograms\tcl8.5\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.7.0\"" /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG"
@ -69,7 +69,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 /MTd /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\myprograms\tcl8.5\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.6.1\"" /c
# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\backend" /I "C:\myprograms\tcl8.5\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.7.0\"" /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG"

14
docs/manual.txt
View File

@ -2649,7 +2649,19 @@ to API and GUI. Handle UTF BOM. Bugfix raster images of Maxicode.
v2.6.3 - New symbology Royal Mail 4-state Mailmark. Added North America VIN
verification. Bugfixes for TIF and EMF output and escape character handling.
15/02/2018
15/02/2018
v2.6.4 Datamatrix DMRE updated to the ISO/IEC29158 version. This is incompatible
in the way, that the old -vers numbers for DMRE are re-assigned.
The separator of GS1-datamatrix may be switched from FNC1 to GS.
GS1 field length check AI 8009 and 7230 to 7239 currected.
v2.6.5: minor bugfixes
v2.6.6: minor Bugfixes
v2.7.0 Allow to code ECI 3 if explicitly given for debug purposes.
New symbology rMQR.
7.4 Sources of Information
--------------------------

2
frontend_qt/mainWindow.ui
View File

@ -26,7 +26,7 @@
</size>
</property>
<property name="windowTitle">
<string>Zint Barcode Studio 2.6</string>
<string>Zint Barcode Studio 2.7</string>
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">

2
frontend_qt/mainwindow.cpp
View File

@ -264,7 +264,7 @@ bool MainWindow::save()
void MainWindow::about()
{
QMessageBox::about(this, tr("About Zint"),
tr("<h2>Zint Barcode Studio 2.6.7</h2>"
tr("<h2>Zint Barcode Studio 2.7.0</h2>"
"<p>A free barcode generator"
"<p>Instruction manual is available at the project homepage:<br>"
"<a href=\"http://www.zint.org.uk\">http://www.zint.org.uk</a>"

6
zint.spec
View File

@ -1,5 +1,5 @@
Name: zint
Version: 2.6.7
Version: 2.7.0
Release: 2%{?dist}
Summary: A barcode generator and library
License: GPLv3+
@ -138,8 +138,8 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Mon Oct 7 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.7
- Version -> 2.6.7
* Thu Dec 5 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.7.0
- Version -> 2.7.0
* Wed Sep 18 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.6
- Version -> 2.6.6