diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:11:17 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:11:17 +0000 |
commit | 28f0f60a6dfee43965e54f4c03d6c4440c5f729e (patch) | |
tree | 6fabeb0ece20aa7b39bbbce01822fb39bad7466b | |
parent | Import from zlib-1.2.4 (diff) | |
download | rtems-28f0f60a6dfee43965e54f4c03d6c4440c5f729e.tar.bz2 |
Import from zlib-1.2.4
-rw-r--r-- | cpukit/zlib/contrib/delphi/ZLib.pas | 2 | ||||
-rw-r--r-- | cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs | 6 | ||||
-rw-r--r-- | cpukit/zlib/contrib/pascal/zlibpas.pas | 2 | ||||
-rw-r--r-- | cpukit/zlib/qnx/package.qpg | 10 | ||||
-rw-r--r-- | cpukit/zlib/treebuild.xml | 116 |
5 files changed, 126 insertions, 10 deletions
diff --git a/cpukit/zlib/contrib/delphi/ZLib.pas b/cpukit/zlib/contrib/delphi/ZLib.pas index 3f2b8b4a5c..179f9a90cc 100644 --- a/cpukit/zlib/contrib/delphi/ZLib.pas +++ b/cpukit/zlib/contrib/delphi/ZLib.pas @@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; const OutBuf: Pointer; BufSize: Integer); const - zlib_version = '1.2.3'; + zlib_version = '1.2.4'; type EZlibError = class(Exception); diff --git a/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs index 8dc00db92d..42c45884bb 100644 --- a/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs @@ -1,7 +1,7 @@ //
// © Copyright Henrik Ravn 2004
//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
//
@@ -156,7 +156,7 @@ namespace DotZLibTests public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.3", Info.Version);
+ Assert.AreEqual("1.2.4", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
@@ -225,7 +225,7 @@ namespace DotZLibTests [Test]
public void Inflate_Expand()
- {
+ {
uncompressedData.Clear();
using (Inflater inf = new Inflater())
diff --git a/cpukit/zlib/contrib/pascal/zlibpas.pas b/cpukit/zlib/contrib/pascal/zlibpas.pas index 836848c2b7..dc7d37dae0 100644 --- a/cpukit/zlib/contrib/pascal/zlibpas.pas +++ b/cpukit/zlib/contrib/pascal/zlibpas.pas @@ -10,7 +10,7 @@ unit zlibpas; interface const - ZLIB_VERSION = '1.2.3'; + ZLIB_VERSION = '1.2.4'; type alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; diff --git a/cpukit/zlib/qnx/package.qpg b/cpukit/zlib/qnx/package.qpg index 8a4a47c723..470d2d5315 100644 --- a/cpukit/zlib/qnx/package.qpg +++ b/cpukit/zlib/qnx/package.qpg @@ -25,10 +25,10 @@ <QPG:Files> <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> - <QPG:Add file="../libz.so.1.2.3" install="/opt/lib/" user="root:bin" permission="644"/> - <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.3"/> - <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.3"/> - <QPG:Add file="../libz.so.1.2.3" install="/opt/lib/" component="slib"/> + <QPG:Add file="../libz.so.1.2.4" install="/opt/lib/" user="root:bin" permission="644"/> + <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.4"/> + <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.4"/> + <QPG:Add file="../libz.so.1.2.4" install="/opt/lib/" component="slib"/> </QPG:Files> <QPG:PackageFilter> @@ -63,7 +63,7 @@ </QPM:ProductDescription> <QPM:ReleaseDescription> - <QPM:ReleaseVersion>1.2.3</QPM:ReleaseVersion> + <QPM:ReleaseVersion>1.2.4</QPM:ReleaseVersion> <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> <QPM:ReleaseStability>Stable</QPM:ReleaseStability> <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> diff --git a/cpukit/zlib/treebuild.xml b/cpukit/zlib/treebuild.xml new file mode 100644 index 0000000000..91ee8912ef --- /dev/null +++ b/cpukit/zlib/treebuild.xml @@ -0,0 +1,116 @@ +<?xml version="1.0" ?> +<package name="zlib" version="1.2.4"> + <library name="zlib" dlversion="1.2.4" dlname="z"> + <property name="description"> zip compression library </property> + <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> + + <!-- fixme: not implemented yet --> + <property name="compiler/c/inline" value="yes" /> + + <include-file name="zlib.h" scope="public" mode="644" /> + <include-file name="zconf.h" scope="public" mode="644" /> + + <source name="adler32.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + </source> + <source name="compress.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + </source> + <source name="crc32.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="crc32.h" /> + </source> + <source name="gzclose.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="gzguts.h" /> + </source> + <source name="gzlib.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="gzguts.h" /> + </source> + <source name="gzread.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="gzguts.h" /> + </source> + <source name="gzwrite.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="gzguts.h" /> + </source> + <source name="uncompr.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + </source> + <source name="deflate.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + <depend name="deflate.h" /> + </source> + <source name="trees.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + <depend name="deflate.h" /> + <depend name="trees.h" /> + </source> + <source name="zutil.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + </source> + <source name="inflate.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + <depend name="inftrees.h" /> + <depend name="inflate.h" /> + <depend name="inffast.h" /> + </source> + <source name="infback.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + <depend name="inftrees.h" /> + <depend name="inflate.h" /> + <depend name="inffast.h" /> + </source> + <source name="inftrees.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + <depend name="inftrees.h" /> + </source> + <source name="inffast.c"> + <depend name="zlib.h" /> + <depend name="zconf.h" /> + <depend name="zutil.h" /> + <depend name="inftrees.h" /> + <depend name="inflate.h" /> + <depend name="inffast.h" /> + </source> + </library> +</package> + +<!-- +CFLAGS=-O +#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 +#CFLAGS=-g -DDEBUG +#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ +# -Wstrict-prototypes -Wmissing-prototypes + +# OBJA = +# to use the asm code: make OBJA=match.o +# +match.o: match.S + $(CPP) match.S > _match.s + $(CC) -c _match.s + mv _match.o match.o + rm -f _match.s +--> |