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

Set version to 2.7.1

Browse Source
This commit is contained in:
Harald Oehlmann 2020-02-01 19:36:50 +01:00
parent dd6de21008
commit 0c5dc4d030
13 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README
View File

@ -109,11 +109,10 @@ Fixed bugs:
- GS1-128 and RSS may only be used with GS1 contents - GS1-128 and RSS may only be used with GS1 contents
- Han Xin chinese character handling - Han Xin chinese character handling
Version 2.7.1 not released jet: Version 2.7.1 2020-02-01:
Changes: Changes:
- Ultracode and colour code support
- QR encoding optimized to get smaller code matrix results - QR encoding optimized to get smaller code matrix results
- PDF417: do not use option_1 to give the maximum number of codewords (928). - PDF417: remove obsolete codeword number option in qzint.
Option removed in qtzint. Option removed in qtzint.
- Removed annex B (3 digit country codes) and annex C (GS1 General Specification) - Removed annex B (3 digit country codes) and annex C (GS1 General Specification)
from the manual. This material may be found elsewhere. from the manual. This material may be found elsewhere.

8
backend/libzint.rc
View File

@ -7,8 +7,8 @@ VS_VERSION_INFO VERSIONINFO
#else #else
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#endif #endif
FILEVERSION 2,6,0,0 FILEVERSION 2,7,1,0
PRODUCTVERSION 2,6,0,0 PRODUCTVERSION 2,7,1,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
@ -25,12 +25,12 @@ BEGIN
//language ID = U.S. English, char set = Windows, Multilingual //language ID = U.S. English, char set = Windows, Multilingual
BEGIN BEGIN
VALUE "FileDescription", "libzint barcode library\0" VALUE "FileDescription", "libzint barcode library\0"
VALUE "FileVersion", "2.7.0.0\0" VALUE "FileVersion", "2.7.1.0\0"
VALUE "InternalName", "zint.dll\0" VALUE "InternalName", "zint.dll\0"
VALUE "LegalCopyright", "Copyright © 2017 Robin Stuart & BogDan Vatra\0" VALUE "LegalCopyright", "Copyright © 2017 Robin Stuart & BogDan Vatra\0"
VALUE "OriginalFilename", "zint.dll\0" VALUE "OriginalFilename", "zint.dll\0"
VALUE "ProductName", "libzint\0" VALUE "ProductName", "libzint\0"
VALUE "ProductVersion", "2.7.0.0\0" VALUE "ProductVersion", "2.7.1.0\0"
VALUE "License", "BSD License version 3\0" VALUE "License", "BSD License version 3\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint" VALUE "WWW", "http://www.sourceforge.net/projects/zint"
END END

2
backend/tests/CMakeLists.txt
View File

@ -12,7 +12,7 @@ set(ZINT_DEBUG FALSE CACHE BOOL "Set debug compile flag")
set(ZINT_SANITIZE FALSE CACHE BOOL "Set sanitize compile/link flags") set(ZINT_SANITIZE FALSE CACHE BOOL "Set sanitize compile/link flags")
set(ZINT_TEST FALSE CACHE BOOL "Set test compile flag") set(ZINT_TEST FALSE CACHE BOOL "Set test compile flag")
find_package (LibZint 2.7.0 REQUIRED) find_package (LibZint 2.7.1 REQUIRED)
find_package(PNG) find_package(PNG)
if (PNG_FOUND) if (PNG_FOUND)

2
backend/zint.h
View File

@ -137,7 +137,7 @@ extern "C" {
#define ZINT_VERSION_MAJOR 2 #define ZINT_VERSION_MAJOR 2
#define ZINT_VERSION_MINOR 7 #define ZINT_VERSION_MINOR 7
#define ZINT_VERSION_RELEASE 0 #define ZINT_VERSION_RELEASE 1
/* Tbarcode 7 codes */ /* Tbarcode 7 codes */
#define BARCODE_CODE11 1 #define BARCODE_CODE11 1

4
backend_qt/backend_qt.pro
View File

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

2
backend_tcl/configure.in
View File

@ -14,7 +14,7 @@
# so you can encode the package version directly into the source files. # so you can encode the package version directly into the source files.
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
AC_INIT([zint], [2.7.0]) AC_INIT([zint], [2.7.1])
#-------------------------------------------------------------------- #--------------------------------------------------------------------
# Call TEA_INIT as the first TEA_ macro to set up initial vars. # 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.7.0\ package ifneeded zint 2.7.1\
[list load [file join $dir zint[info sharedlibextension]]] [list load [file join $dir zint[info sharedlibextension]]]

4
backend_tcl/zint.c
View File

@ -67,6 +67,8 @@
2019-12-05 2.7.0 HaO 2019-12-05 2.7.0 HaO
- Framework 2.7.0 update - Framework 2.7.0 update
- Add symbology rmqr - Add symbology rmqr
2020-02-01 2.7.1 HaO
- Framework 2.7.1 update
*/ */
#if defined(__WIN32__) || defined(_WIN32) || defined(WIN32) #if defined(__WIN32__) || defined(_WIN32) || defined(WIN32)
@ -106,7 +108,7 @@
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* > File option defines */ /* > File option defines */
#define VERSION "2.7.0" #define VERSION "2.7.1"
/*----------------------------------------------------------------------------*/ /*----------------------------------------------------------------------------*/
/* >>>>> Hepler defines */ /* >>>>> Hepler defines */

4
backend_tcl/zint_tcl.dsp
View File

@ -43,7 +43,7 @@ RSC=rc.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 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.7.0\"" /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.1\"" /c
# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "NDEBUG" # ADD BASE RSC /l 0x407 /d "NDEBUG"
@ -69,7 +69,7 @@ LINK32=link.exe
# PROP Ignore_Export_Lib 0 # PROP Ignore_Export_Lib 0
# PROP Target_Dir "" # 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 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.7.0\"" /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.1\"" /c
# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x407 /d "_DEBUG" # ADD BASE RSC /l 0x407 /d "_DEBUG"

2
frontend_qt/Inno_Setup_qtzint.iss
View File

@ -2,7 +2,7 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
#define MyAppName "qtZint" #define MyAppName "qtZint"
#define MyAppVersion "2.7.0" #define MyAppVersion "2.7.1"
#define MyAppPublisher "Robin Stuart" #define MyAppPublisher "Robin Stuart"
#define MyAppURL "http://zint.org.uk/" #define MyAppURL "http://zint.org.uk/"
#define MyAppExeName "qtZint.exe" #define MyAppExeName "qtZint.exe"

2
frontend_qt/mainwindow.cpp
View File

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

2
zint.nsi
View File

@ -10,7 +10,7 @@
;****************************************************************************** ;******************************************************************************
!define PRODUCT_NAME "Zint" !define PRODUCT_NAME "Zint"
!define PRODUCT_EXE "qtZint.exe" !define PRODUCT_EXE "qtZint.exe"
!define PRODUCT_VERSION "2.6.7.0" !define PRODUCT_VERSION "2.7.1.0"
!define PRODUCT_WEB_SITE "http://www.zint.org.uk" !define PRODUCT_WEB_SITE "http://www.zint.org.uk"
!define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra" !define PRODUCT_PUBLISHER "Robin Stuart & BogDan Vatra"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}" !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_EXE}"

5
zint.spec
View File

@ -1,5 +1,5 @@
Name: zint Name: zint
Version: 2.7.0 Version: 2.7.1
Release: 2%{?dist} Release: 2%{?dist}
Summary: A barcode generator and library Summary: A barcode generator and library
License: GPLv3+ License: GPLv3+
@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Sat Feb 1 2020 Harald Oehlmann <oehhar@sourceforge.net> - 2.7.1
- Version -> 2.7.1
* Thu Dec 5 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.7.0 * Thu Dec 5 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.7.0
- Version -> 2.7.0 - Version -> 2.7.0