Mirrors/zint
1
0
Fork 0
mirror of https://git.code.sf.net/p/zint/code synced 2026-01-25 21:05:58 +00:00
Code Issues Projects Releases Wiki Activity

version strings updated to 2.4.3

Browse Source
This commit is contained in:
tgotic
2011-05-16 20:06:42 +02:00
parent 6ad0a0bd70
commit 1c40a1f11b
9 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/Makefile
View File

@@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # make clean cleans up a previous compilation and any object or editor files
# #
ZINT_VERSION:=-DZINT_VERSION=\"2.4.1\" ZINT_VERSION:=-DZINT_VERSION=\"2.4.3.0\"
CC := gcc CC := gcc
@@ -26,14 +26,14 @@ POSTAL:= postal.c auspost.c imail.c
POSTAL_OBJ:= postal.o auspost.o imail.o POSTAL_OBJ:= postal.o auspost.o imail.o
TWODIM:= code16k.c dmatrix.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c TWODIM:= code16k.c dmatrix.c pdf417.c qr.c maxicode.c composite.c aztec.c code49.c code1.c gridmtx.c
TWODIM_OBJ:= code16k.o dmatrix.o pdf417.o qr.o maxicode.o composite.o aztec.o code49.o code1.o gridmtx.o TWODIM_OBJ:= code16k.o dmatrix.o pdf417.o qr.o maxicode.o composite.o aztec.o code49.o code1.o gridmtx.o
LIBS:= `libpng12-config --I_opts --L_opts --ldflags` -lz -lm LIBS:= `libpng15-config --I_opts --L_opts --ldflags` -lz -lm
libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c auspost.c imail.c code16k.c dmatrix.c reedsol.c pdf417.c maxicode.c rss.c common.c render.c png.c library.c ps.c qr.c large.c composite.c aztec.c gs1.c svg.c code49.c code1.c gridmtx.c libzint: code.c code128.c 2of5.c upcean.c medical.c telepen.c plessey.c postal.c auspost.c imail.c code16k.c dmatrix.c reedsol.c pdf417.c maxicode.c rss.c common.c render.c png.c library.c ps.c qr.c large.c composite.c aztec.c gs1.c svg.c code49.c code1.c gridmtx.c
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(ONEDIM) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(ONEDIM)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(POSTAL)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(TWODIM)
$(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON) $(CC) -Wall -fPIC $(CFLAGS) $(ZINT_VERSION) -c $(COMMON)
$(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.3.2 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS) $(CC) $(CFLAGS) $(ZINT_VERSION) -shared -Wl,-soname,libzint.so -o libzint.so.2.4.3 $(INCLUDE) $(COMMON_OBJ) $(ONEDIM_OBJ) $(TWODIM_OBJ) $(POSTAL_OBJ) $(LIBS)
ln -s libzint.so.* libzint.so ln -s libzint.so.* libzint.so
.PHONY: install uninstall clean dist .PHONY: install uninstall clean dist

4
backend/Makefile.mingw
View File

@@ -6,7 +6,7 @@
# make clean cleans up a previous compilation and any object or editor files # make clean cleans up a previous compilation and any object or editor files
# #
ZINT_VERSION:=-DZINT_VERSION=\"2.4.2\" ZINT_VERSION:=-DZINT_VERSION=\"2.4.3.0\"
CC:= gcc -m32 CC:= gcc -m32
@@ -15,7 +15,7 @@ AR:= ar rc
RANLIB:= ranlib RANLIB:= ranlib
INCLUDE:= -I/mingw/include INCLUDE:= -I/mingw/include
CFLAGS:= -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall CFLAGS:= -O2 -fms-extensions -mms-bitfields -fno-exceptions -fomit-frame-pointer -Wall
LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=42 LDFLAGS = -Wl,--major-image-version=2 -Wl,--minor-image-version=43
RC:= windres RC:= windres
RCFLAGS:= -v -F pe-i386 --define GCC_WINDRES RCFLAGS:= -v -F pe-i386 --define GCC_WINDRES

8
backend/libzint.rc
View File

@@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
#else #else
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#endif #endif
FILEVERSION 2,4,1,0 FILEVERSION 2,4,3,0
PRODUCTVERSION 2,4,1,0 PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
@@ -23,12 +23,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.4.1.0\0" VALUE "FileVersion", "2.4.3.0\0"
VALUE "InternalName", "zint.dll\0" VALUE "InternalName", "zint.dll\0"
VALUE "LegalCopyright", "Copyright © 2009-2011 Robin Stuart & BogDan Vatra\0" VALUE "LegalCopyright", "Copyright © 2009-2011 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.4.1.0\0" VALUE "ProductVersion", "2.4.3.0\0"
VALUE "License", "GNU General Public License version 3\0" VALUE "License", "GNU General Public License version 3\0"
VALUE "WWW", "http://www.sourceforge.net/projects/zint\0" VALUE "WWW", "http://www.sourceforge.net/projects/zint\0"
END END

2
backend/zint.def
View File

@@ -5,7 +5,7 @@
LIBRARY LIBRARY
EXPORTS EXPORTS
;Version 2.4.0 ;Version 2.4.3
DllGetVersion DllGetVersion
ZBarcode_Create ZBarcode_Create

2
backend_qt4/backend_dll.pro
View File

@@ -8,7 +8,7 @@ macx{
} }
TARGET = QtZint2 TARGET = QtZint2
VERSION = 2.4.1 VERSION = 2.4.3
INCLUDEPATH += ../backend INCLUDEPATH += ../backend

2
backend_qt4/backend_vcx.pro
View File

@@ -4,7 +4,7 @@ win32 {
} }
TARGET = QtZint2 TARGET = QtZint2
VERSION = 2.4.2 VERSION = 2.4.3
QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CFLAGS += /TP /wd4018 /wd4244 /wd4305
QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305 QMAKE_CXXFLAGS += /TP /wd4018 /wd4244 /wd4305

2
frontend_qt4/mainwindow.cpp
View File

@@ -163,7 +163,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.4.2</h2>" tr("<h2>Zint Barcode Studio 2.4.3</h2>"
"<p>A free barcode generator" "<p>A free barcode generator"
"<p>Instruction manual is available from Sourceforge:" "<p>Instruction manual is available from Sourceforge:"
"<p>http://www.sourceforge.net/projects/zint" "<p>http://www.sourceforge.net/projects/zint"

12
frontend_qt4/res/qtZint.rc
View File

@@ -5,8 +5,8 @@ VS_VERSION_INFO VERSIONINFO
#else #else
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
#endif #endif
FILEVERSION 2,4,1,0 FILEVERSION 2,4,3,0
PRODUCTVERSION 2,4,1,0 PRODUCTVERSION 2,4,3,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG FILEFLAGS VS_FF_DEBUG
@@ -23,13 +23,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Robin Stuart & BogDan Vatra" VALUE "CompanyName", "Robin Stuart & BogDan Vatra"
VALUE "FileDescription", "qtZint barcode generator" VALUE "FileDescription", "qtZint barcode generator"
VALUE "FileVersion", "2.4.1.0" VALUE "FileVersion", "2.4.3.0"
VALUE "InternalName", "qtZint" VALUE "InternalName", "qtZint"
VALUE "LegalCopyright", "Copyright © 2010 Robin Stuart & BogDan Vatra" VALUE "LegalCopyright", "Copyright © 2011 Robin Stuart & BogDan Vatra"
VALUE "License", "GNU General Public License version 3" VALUE "License", "GNU General Public License version 3"
VALUE "OriginalFilename", "qtZint" VALUE "OriginalFilename", "qtZint"
VALUE "ProductName", "Zint Barcode Studio" VALUE "ProductName", "Zint Barcode Studio"
VALUE "ProductVersion", "2.4.1.0" VALUE "ProductVersion", "2.4.3.0"
VALUE "WWW", "http://www.zint.org.uk" VALUE "WWW", "http://www.zint.org.uk"
END END
END END
@@ -38,4 +38,4 @@ BEGIN
VALUE "Translation", 0x9, 1200 VALUE "Translation", 0x9, 1200
END END
END END
100 ICON MOVEABLE PURE LOADONCALL DISCARDABLE "zint.ico" IDI_ICON1 ICON DISCARDABLE "zint.ico"

2
zint.nsi
View File

@@ -5,7 +5,7 @@
;****************************************************************************** ;******************************************************************************
!define PRODUCT_NAME "Zint" !define PRODUCT_NAME "Zint"
!define PRODUCT_EXE "qtZint.exe" !define PRODUCT_EXE "qtZint.exe"
!define PRODUCT_VERSION "2.4.2.2" !define PRODUCT_VERSION "2.4.3.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}"