mirror of
https://git.code.sf.net/p/zint/code
synced 2024-09-18 14:58:55 -04:00
2018-08-30 2.6.4 HaO Set version to 2.6.4
This commit is contained in:
Harald Oehlmann
parent
202acd9d3e
commit
6949143419
9 changed files with 147 additions and 136 deletions
|
|
@ -10,7 +10,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
|||
|
||||
set (ZINT_VERSION_MAJOR 2)
|
||||
set (ZINT_VERSION_MINOR 6)
|
||||
set (ZINT_VERSION_RELEASE 3)
|
||||
set (ZINT_VERSION_RELEASE 4)
|
||||
set (ZINT_VERSION "${ZINT_VERSION_MAJOR}.${ZINT_VERSION_MINOR}.${ZINT_VERSION_RELEASE}" )
|
||||
|
||||
add_definitions (-DZINT_VERSION=\"${ZINT_VERSION}\" -Wall)
|
||||
|
|
|
|||
7
README
7
README
|
|
@ -54,6 +54,13 @@ Version 2.6.3:
|
|||
New symbology Royal Mail 4-state Mailmark. Added North America VIN verification.
|
||||
Bugfixes for TIF and EMF output and escape character handling.
|
||||
|
||||
Version 2.6.4:
|
||||
Fixed bugs: EMF output, maxicode plot/content
|
||||
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.
|
||||
|
||||
CONTACT US
|
||||
----------
|
||||
The home of Zint is:
|
||||
|
|
|
|||
|
|
@ -136,7 +136,7 @@ extern "C" {
|
|||
|
||||
#define ZINT_VERSION_MAJOR 2
|
||||
#define ZINT_VERSION_MINOR 6
|
||||
#define ZINT_VERSION_RELEASE 3
|
||||
#define ZINT_VERSION_RELEASE 4
|
||||
|
||||
/* Tbarcode 7 codes */
|
||||
#define BARCODE_CODE11 1
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ TARGET = QtZint
|
|||
INCLUDEPATH += ../backend
|
||||
|
||||
#EDIT THIS !!!!
|
||||
DEFINES += ZINT_VERSION="\\\"2.6.3\\\""
|
||||
DEFINES += ZINT_VERSION="\\\"2.6.4\\\""
|
||||
|
||||
!contains(DEFINES, NO_PNG) {
|
||||
INCLUDEPATH += ../../lpng
|
||||
|
|
@ -120,7 +120,7 @@ SOURCES += ../backend/2of5.c \
|
|||
../backend/png.c \
|
||||
qzint.cpp
|
||||
|
||||
VERSION = 2.6.3
|
||||
VERSION = 2.6.4
|
||||
|
||||
#DESTDIR = .
|
||||
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ bool MainWindow::save()
|
|||
void MainWindow::about()
|
||||
{
|
||||
QMessageBox::about(this, tr("About Zint"),
|
||||
tr("<h2>Zint Barcode Studio 2.6.3</h2>"
|
||||
tr("<h2>Zint Barcode Studio 2.6.4</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>"
|
||||
|
|
@ -283,8 +283,9 @@ void MainWindow::about()
|
|||
"ISO/IEC 15438:2015, ISO/IEC 16022:2006, ISO/IEC 16023:2000,<br>"
|
||||
"ISO/IEC 16388:2007, ISO/IEC 18004:2015, ISO/IEC 24723:2010,<br>"
|
||||
"ISO/IEC 24724:2011, ISO/IEC 24728:2006, ISO/IEC 24778:2008,<br>"
|
||||
"ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000, ANSI/AIM BC12-1998,<br>"
|
||||
"AIMD014 (v 1.63), USPS-B-3200</small></td></tr></table>"
|
||||
"ISO/IEC 29158:2019, ANSI-HIBC 2.3-2009, ANSI/AIM BC6-2000,<br>"
|
||||
"ANSI/AIM BC12-1998, AIMD014 (v 1.63), USPS-B-3200"
|
||||
"</small></td></tr></table>"
|
||||
|
||||
));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,126 +1,126 @@
|
|||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#define APSTUDIO_HIDDEN_SYMBOLS
|
||||
#include "windows.h"
|
||||
#undef APSTUDIO_HIDDEN_SYMBOLS
|
||||
#include "winver.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// German (Germany) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifndef _MAC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,6,3,0
|
||||
PRODUCTVERSION 2,6,3,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904e4"
|
||||
BEGIN
|
||||
VALUE "Comments", "\0"
|
||||
VALUE "CompanyName", "\0"
|
||||
VALUE "FileDescription", "zint barcode generator\0"
|
||||
VALUE "FileVersion", "2.6.3.0\0"
|
||||
VALUE "InternalName", "zint.exe\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2018 Robin Stuart\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "License", "GNU General Public License version 3\0"
|
||||
VALUE "OriginalFilename", "zint.exe\0"
|
||||
VALUE "PrivateBuild", "\0"
|
||||
VALUE "ProductName", "zint\0"
|
||||
VALUE "ProductVersion", "2.6.3.0\0"
|
||||
VALUE "SpecialBuild", "\0"
|
||||
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1252
|
||||
END
|
||||
END
|
||||
|
||||
#endif // !_MAC
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
100 ICON DISCARDABLE "zint_black_vc6.ico"
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
|
||||
"#include ""windows.h""\r\n"
|
||||
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
|
||||
"#include ""winver.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
#endif // German (Germany) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
//Microsoft Developer Studio generated resource script.
|
||||
//
|
||||
#include "resource.h"
|
||||
|
||||
#define APSTUDIO_READONLY_SYMBOLS
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 2 resource.
|
||||
//
|
||||
#define APSTUDIO_HIDDEN_SYMBOLS
|
||||
#include "windows.h"
|
||||
#undef APSTUDIO_HIDDEN_SYMBOLS
|
||||
#include "winver.h"
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#undef APSTUDIO_READONLY_SYMBOLS
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// German (Germany) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifndef _MAC
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Version
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 2,6,3,0
|
||||
PRODUCTVERSION 2,6,3,0
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
#else
|
||||
FILEFLAGS 0x0L
|
||||
#endif
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "040904e4"
|
||||
BEGIN
|
||||
VALUE "Comments", "\0"
|
||||
VALUE "CompanyName", "\0"
|
||||
VALUE "FileDescription", "zint barcode generator\0"
|
||||
VALUE "FileVersion", "2.6.4.0\0"
|
||||
VALUE "InternalName", "zint.exe\0"
|
||||
VALUE "LegalCopyright", "Copyright © 2018 Robin Stuart\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "License", "GNU General Public License version 3\0"
|
||||
VALUE "OriginalFilename", "zint.exe\0"
|
||||
VALUE "PrivateBuild", "\0"
|
||||
VALUE "ProductName", "zint\0"
|
||||
VALUE "ProductVersion", "2.6.4.0\0"
|
||||
VALUE "SpecialBuild", "\0"
|
||||
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x409, 1252
|
||||
END
|
||||
END
|
||||
|
||||
#endif // !_MAC
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Icon
|
||||
//
|
||||
|
||||
// Icon with lowest ID value placed first to ensure application icon
|
||||
// remains consistent on all systems.
|
||||
100 ICON DISCARDABLE "zint_black_vc6.ico"
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// TEXTINCLUDE
|
||||
//
|
||||
|
||||
1 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"resource.h\0"
|
||||
END
|
||||
|
||||
2 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
|
||||
"#include ""windows.h""\r\n"
|
||||
"#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
|
||||
"#include ""winver.h""\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
3 TEXTINCLUDE DISCARDABLE
|
||||
BEGIN
|
||||
"\r\n"
|
||||
"\0"
|
||||
END
|
||||
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
#endif // German (Germany) resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
||||
|
||||
#ifndef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Generated from the TEXTINCLUDE 3 resource.
|
||||
//
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
#endif // not APSTUDIO_INVOKED
|
||||
|
||||
|
|
|
|||
|
|
@ -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.6.3\"" /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.6.4\"" /c
|
||||
# ADD BASE RSC /l 0x407 /d "NDEBUG"
|
||||
# ADD RSC /l 0x407 /d "NDEBUG"
|
||||
BSC32=bscmake.exe
|
||||
|
|
|
|||
2
zint.nsi
2
zint.nsi
|
|
@ -10,7 +10,7 @@
|
|||
;******************************************************************************
|
||||
!define PRODUCT_NAME "Zint"
|
||||
!define PRODUCT_EXE "qtZint.exe"
|
||||
!define PRODUCT_VERSION "2.5.0.0"
|
||||
!define PRODUCT_VERSION "2.6.3.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}"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
Name: zint
|
||||
Version: 2.6.3
|
||||
Version: 2.6.4
|
||||
Release: 2%{?dist}
|
||||
Summary: A barcode generator and library
|
||||
License: GPLv3+
|
||||
|
|
@ -138,6 +138,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
%changelog
|
||||
|
||||
* Fri Aug 30 2019 Harald Oehlmann <oehhar@sourceforge.net> - 2.6.4
|
||||
- Version -> 2.6.4
|
||||
|
||||
* Thu Feb 15 2018 Robin Stuart <rstuart114@gmail.com> - 2.6.3
|
||||
- Version -> 2.6.3
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue