diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/BUILD.gn b/BUILD.gn index 23a406e433e40d6555c8221e68822236911a3856..7314fb9e0f40ddb4476cc3a7a477ee01a96d81f7 100755 --- a/BUILD.gn +++ b/BUILD.gn @@ -1,29 +1,26 @@ -# -# Copyright (c) 2020 Huawei Device Co., Ltd. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# +# Copyright (c) Huawei Technologies Co., Ltd. 2019-2019. All rights reserved. -import("//build/lite/config/component/lite_component.gni") +import("//build/ohos.gni") +import("//build/ohos/ndk/ndk.gni") config("zlib_config") { - include_dirs = [ - ".", - ] + cflags = [ + "-Wno-incompatible-pointer-types", + "-Werror", + "-Wimplicit-function-declaration", + ] } -zlib_source = [ +config("zlib_public_config") { + include_dirs = [ "." ] +} + +ohos_static_library("libz") { + sources = [ "adler32.c", "compress.c", + "contrib/minizip/ioapi.c", + "contrib/minizip/unzip.c", "crc32.c", "crc32.h", "deflate.c", @@ -37,8 +34,8 @@ zlib_source = [ "inffast.c", "inffast.h", "inffixed.h", - "inflate.h", "inflate.c", + "inflate.h", "inftrees.c", "inftrees.h", "trees.c", @@ -48,25 +45,20 @@ zlib_source = [ "zlib.h", "zutil.c", "zutil.h", - "contrib/minizip/ioapi.c", - "contrib/minizip/unzip.c", - "contrib/minizip/zip.c", -] - -shared_library("zlib_shared") { - sources = zlib_source - - public_configs = [ - ":zlib_config", - ] - output_name = "zlib_shared" + ] + configs = [ ":zlib_config" ] + public_configs = [ ":zlib_public_config" ] } -static_library("zlib_static") { - sources = zlib_source +ohos_ndk_headers("zlib_header") { + sources = [ + "./zconf.h", + "./zlib.h", + ] +} - public_configs = [ - ":zlib_config", - ] - output_name = "z" +ohos_ndk_library("libz_ndk") { + output_name = "z" + ndk_description_file = "./zlib.ndk.json" + output_extension = "so" } diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 diff --git a/COPYRIGHT.OpenSource b/COPYRIGHT.OpenSource new file mode 100755 index 0000000000000000000000000000000000000000..739ab2e9e9b73b62da7c7dee7e49b6cde998897f --- /dev/null +++ b/COPYRIGHT.OpenSource @@ -0,0 +1,48 @@ +Copyright (C) 1995-2006, 2011, 2016 Jean-loup Gailly +Copyright (C) 2011, 2016 Mark Adler +Copyright (C) 1995-2006, 2010, 2011, 2016 Jean-loup Gailly +Copyright (C) 1995-2003 Mark Adler +Copyright (C) 2003 Chris Anderson +2005 - Adaptation to Microsoft C Compiler for AMD64 by Gilles Vollant +Copyright (C) 1995-2003 Jean-loup Gailly and Mark Adler. +Copyright (C) 1998 by Bob Dellaca. +Copyright (C) 2003 by Cosmin Truta. +Copyright (C) 1995-2003 by Jean-loup Gailly. +Copyright (C) 1998,1999,2000 by Jacques Nomssi Nzali. +Copyright (C) 1995-2011, 2016 Mark Adler +Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler +Copyright (C) 1995-2006, 2010, 2011, 2012, 2016 Mark Adler +Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler +Copyright (C) 1995-2016 Jean-loup Gailly +Copyright (C) 2004, 2010 Mark Adler +Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013, 2016 Mark Adler +Copyright (C) 2004-2017 Mark Adler +Copyright (C) 1995-2016 Mark Adler +Copyright (C) 1995-2017 Mark Adler +Copyright (C) 1995-2003, 2010 Mark Adler +Copyright (C) 1995-2005, 2010 Mark Adler +(C) 1995-2017 Jean-loup Gailly and Mark Adler +Copyright (C) 1995-2017 Jean-loup Gailly +Copyright (C) 1995-2003, 2010, 2014, 2016 Jean-loup Gailly, Mark Adler +Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler +Copyright (C) 1995-2008 Mark Adler +Copyright (C) 2003 Mark Adler +Copyright (C) 1998-2005 Gilles Vollant +Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http:www.winimage.com/zLibDll/minizip.html ) +Copyright (C) 2009-2010 Mathias Svensson ( http:result42.com ) +Copyright (C) 2007-2008 Even Rouault +Copyright (c) 1990-2000 Info-ZIP. All rights reserved. +Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson +Copyright (c) 1997 +Copyright (C) 2002-2013 Mark Adler +Copyright (C) 2002-2013 Mark Adler, all rights reserved +Copyright (C) 2003, 2012, 2013 Mark Adler +Copyright (c) Henrik Ravn 2004 +Copyright (C) 2007, 2008, 2012 Mark Adler +Copyright (C) 2003, 2005, 2008, 2010, 2012 Mark Adler +Copyright (C) 2003, 2012 Mark Adler, all rights reserved +Copyright (C) 2004, 2005, 2012 Mark Adler, all rights reserved +Copyright (C) 2004, 2008, 2012, 2016 Mark Adler, all rights reserved +Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved +Copyright (C) 2005, 2012 Mark Adler +(C) Copyright Henrik Ravn 2004 \ No newline at end of file diff --git a/ChangeLog b/ChangeLog old mode 100755 new mode 100644 diff --git a/FAQ b/FAQ old mode 100755 new mode 100644 diff --git a/INDEX b/INDEX old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..9f056865b5719d4559a7773ca69382b942cb2b02 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +version 1.2.11, January 15th, 2017 + +Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. +2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. +3. This notice may not be removed or altered from any source distribution. diff --git a/Makefile b/Makefile old mode 100755 new mode 100644 diff --git a/Makefile.in b/Makefile.in old mode 100755 new mode 100644 diff --git a/README b/README old mode 100755 new mode 100644 diff --git a/README.OpenSource b/README.OpenSource new file mode 100755 index 0000000000000000000000000000000000000000..7ca8cf61c94ec5920e300ccc2eaec9886205087c --- /dev/null +++ b/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name" : "zlib", + "License" : "zlib/libpng License", + "License File" : "LICENSE", + "Version Number" : "1.2.11", + "Owner" : "gongjunsong@huawei.com", + "Upstream URL" : "https://github.com/madler/zlib/archive/v1.2.11.zip", + "Description" : "zlib 1.2.11 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files" + } +] diff --git a/adler32.c b/adler32.c old mode 100755 new mode 100644 diff --git a/amiga/Makefile.pup b/amiga/Makefile.pup old mode 100755 new mode 100644 diff --git a/amiga/Makefile.sas b/amiga/Makefile.sas old mode 100755 new mode 100644 diff --git a/compress.c b/compress.c old mode 100755 new mode 100644 diff --git a/contrib/README.contrib b/contrib/README.contrib old mode 100755 new mode 100644 diff --git a/contrib/ada/buffer_demo.adb b/contrib/ada/buffer_demo.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/mtest.adb b/contrib/ada/mtest.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/read.adb b/contrib/ada/read.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/readme.txt b/contrib/ada/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/ada/test.adb b/contrib/ada/test.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib-streams.adb b/contrib/ada/zlib-streams.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib-streams.ads b/contrib/ada/zlib-streams.ads old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib-thin.adb b/contrib/ada/zlib-thin.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib-thin.ads b/contrib/ada/zlib-thin.ads old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib.adb b/contrib/ada/zlib.adb old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib.ads b/contrib/ada/zlib.ads old mode 100755 new mode 100644 diff --git a/contrib/ada/zlib.gpr b/contrib/ada/zlib.gpr old mode 100755 new mode 100644 diff --git a/contrib/amd64/amd64-match.S b/contrib/amd64/amd64-match.S old mode 100755 new mode 100644 diff --git a/contrib/asm686/README.686 b/contrib/asm686/README.686 old mode 100755 new mode 100644 diff --git a/contrib/asm686/match.S b/contrib/asm686/match.S old mode 100755 new mode 100644 diff --git a/contrib/blast/Makefile b/contrib/blast/Makefile old mode 100755 new mode 100644 diff --git a/contrib/blast/README b/contrib/blast/README old mode 100755 new mode 100644 diff --git a/contrib/blast/blast.c b/contrib/blast/blast.c old mode 100755 new mode 100644 diff --git a/contrib/blast/blast.h b/contrib/blast/blast.h old mode 100755 new mode 100644 diff --git a/contrib/blast/test.pk b/contrib/blast/test.pk old mode 100755 new mode 100644 diff --git a/contrib/blast/test.txt b/contrib/blast/test.txt old mode 100755 new mode 100644 diff --git a/contrib/delphi/ZLib.pas b/contrib/delphi/ZLib.pas old mode 100755 new mode 100644 diff --git a/contrib/delphi/ZLibConst.pas b/contrib/delphi/ZLibConst.pas old mode 100755 new mode 100644 diff --git a/contrib/delphi/readme.txt b/contrib/delphi/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/delphi/zlibd32.mak b/contrib/delphi/zlibd32.mak old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib.build b/contrib/dotzlib/DotZLib.build old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib.chm b/contrib/dotzlib/DotZLib.chm old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib.sln b/contrib/dotzlib/DotZLib.sln old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/contrib/dotzlib/DotZLib/AssemblyInfo.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/contrib/dotzlib/DotZLib/ChecksumImpl.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/CircularBuffer.cs b/contrib/dotzlib/DotZLib/CircularBuffer.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/CodecBase.cs b/contrib/dotzlib/DotZLib/CodecBase.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/Deflater.cs b/contrib/dotzlib/DotZLib/Deflater.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/DotZLib.cs b/contrib/dotzlib/DotZLib/DotZLib.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/DotZLib.csproj b/contrib/dotzlib/DotZLib/DotZLib.csproj old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/GZipStream.cs b/contrib/dotzlib/DotZLib/GZipStream.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/Inflater.cs b/contrib/dotzlib/DotZLib/Inflater.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/DotZLib/UnitTests.cs b/contrib/dotzlib/DotZLib/UnitTests.cs old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/LICENSE_1_0.txt b/contrib/dotzlib/LICENSE_1_0.txt old mode 100755 new mode 100644 diff --git a/contrib/dotzlib/readme.txt b/contrib/dotzlib/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/gcc_gvmat64/gvmat64.S b/contrib/gcc_gvmat64/gvmat64.S old mode 100755 new mode 100644 diff --git a/contrib/infback9/README b/contrib/infback9/README old mode 100755 new mode 100644 diff --git a/contrib/infback9/infback9.c b/contrib/infback9/infback9.c old mode 100755 new mode 100644 diff --git a/contrib/infback9/infback9.h b/contrib/infback9/infback9.h old mode 100755 new mode 100644 diff --git a/contrib/infback9/inffix9.h b/contrib/infback9/inffix9.h old mode 100755 new mode 100644 diff --git a/contrib/infback9/inflate9.h b/contrib/infback9/inflate9.h old mode 100755 new mode 100644 diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c old mode 100755 new mode 100644 diff --git a/contrib/infback9/inftree9.h b/contrib/infback9/inftree9.h old mode 100755 new mode 100644 diff --git a/contrib/inflate86/inffas86.c b/contrib/inflate86/inffas86.c old mode 100755 new mode 100644 diff --git a/contrib/inflate86/inffast.S b/contrib/inflate86/inffast.S old mode 100755 new mode 100644 diff --git a/contrib/iostream/test.cpp b/contrib/iostream/test.cpp old mode 100755 new mode 100644 diff --git a/contrib/iostream/zfstream.cpp b/contrib/iostream/zfstream.cpp old mode 100755 new mode 100644 diff --git a/contrib/iostream/zfstream.h b/contrib/iostream/zfstream.h old mode 100755 new mode 100644 diff --git a/contrib/iostream2/zstream.h b/contrib/iostream2/zstream.h old mode 100755 new mode 100644 diff --git a/contrib/iostream2/zstream_test.cpp b/contrib/iostream2/zstream_test.cpp old mode 100755 new mode 100644 diff --git a/contrib/iostream3/README b/contrib/iostream3/README old mode 100755 new mode 100644 diff --git a/contrib/iostream3/TODO b/contrib/iostream3/TODO old mode 100755 new mode 100644 diff --git a/contrib/iostream3/test.cc b/contrib/iostream3/test.cc old mode 100755 new mode 100644 diff --git a/contrib/iostream3/zfstream.cc b/contrib/iostream3/zfstream.cc old mode 100755 new mode 100644 diff --git a/contrib/iostream3/zfstream.h b/contrib/iostream3/zfstream.h old mode 100755 new mode 100644 diff --git a/contrib/masmx64/bld_ml64.bat b/contrib/masmx64/bld_ml64.bat old mode 100755 new mode 100644 diff --git a/contrib/masmx64/gvmat64.asm b/contrib/masmx64/gvmat64.asm old mode 100755 new mode 100644 diff --git a/contrib/masmx64/inffas8664.c b/contrib/masmx64/inffas8664.c old mode 100755 new mode 100644 diff --git a/contrib/masmx64/inffasx64.asm b/contrib/masmx64/inffasx64.asm old mode 100755 new mode 100644 diff --git a/contrib/masmx64/readme.txt b/contrib/masmx64/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/masmx86/bld_ml32.bat b/contrib/masmx86/bld_ml32.bat old mode 100755 new mode 100644 diff --git a/contrib/masmx86/inffas32.asm b/contrib/masmx86/inffas32.asm old mode 100755 new mode 100644 diff --git a/contrib/masmx86/match686.asm b/contrib/masmx86/match686.asm old mode 100755 new mode 100644 diff --git a/contrib/masmx86/readme.txt b/contrib/masmx86/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile old mode 100755 new mode 100644 diff --git a/contrib/minizip/Makefile.am b/contrib/minizip/Makefile.am old mode 100755 new mode 100644 diff --git a/contrib/minizip/MiniZip64_Changes.txt b/contrib/minizip/MiniZip64_Changes.txt old mode 100755 new mode 100644 diff --git a/contrib/minizip/MiniZip64_info.txt b/contrib/minizip/MiniZip64_info.txt old mode 100755 new mode 100644 diff --git a/contrib/minizip/configure.ac b/contrib/minizip/configure.ac old mode 100755 new mode 100644 diff --git a/contrib/minizip/crypt.h b/contrib/minizip/crypt.h old mode 100755 new mode 100644 diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h old mode 100755 new mode 100644 diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h old mode 100755 new mode 100644 diff --git a/contrib/minizip/make_vms.com b/contrib/minizip/make_vms.com old mode 100755 new mode 100644 diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/miniunzip.1 b/contrib/minizip/miniunzip.1 old mode 100755 new mode 100644 diff --git a/contrib/minizip/minizip.1 b/contrib/minizip/minizip.1 old mode 100755 new mode 100644 diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/minizip.pc.in b/contrib/minizip/minizip.pc.in old mode 100755 new mode 100644 diff --git a/contrib/minizip/mztools.c b/contrib/minizip/mztools.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/mztools.h b/contrib/minizip/mztools.h old mode 100755 new mode 100644 diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h old mode 100755 new mode 100644 diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c old mode 100755 new mode 100644 diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h old mode 100755 new mode 100644 diff --git a/contrib/pascal/example.pas b/contrib/pascal/example.pas old mode 100755 new mode 100644 diff --git a/contrib/pascal/readme.txt b/contrib/pascal/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/pascal/zlibd32.mak b/contrib/pascal/zlibd32.mak old mode 100755 new mode 100644 diff --git a/contrib/pascal/zlibpas.pas b/contrib/pascal/zlibpas.pas old mode 100755 new mode 100644 diff --git a/contrib/puff/Makefile b/contrib/puff/Makefile old mode 100755 new mode 100644 diff --git a/contrib/puff/README b/contrib/puff/README old mode 100755 new mode 100644 diff --git a/contrib/puff/puff.c b/contrib/puff/puff.c old mode 100755 new mode 100644 diff --git a/contrib/puff/puff.h b/contrib/puff/puff.h old mode 100755 new mode 100644 diff --git a/contrib/puff/pufftest.c b/contrib/puff/pufftest.c old mode 100755 new mode 100644 diff --git a/contrib/puff/zeros.raw b/contrib/puff/zeros.raw old mode 100755 new mode 100644 diff --git a/contrib/testzlib/testzlib.c b/contrib/testzlib/testzlib.c old mode 100755 new mode 100644 diff --git a/contrib/testzlib/testzlib.txt b/contrib/testzlib/testzlib.txt old mode 100755 new mode 100644 diff --git a/contrib/untgz/Makefile b/contrib/untgz/Makefile old mode 100755 new mode 100644 diff --git a/contrib/untgz/Makefile.msc b/contrib/untgz/Makefile.msc old mode 100755 new mode 100644 diff --git a/contrib/untgz/untgz.c b/contrib/untgz/untgz.c old mode 100755 new mode 100644 diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/miniunz.vcxproj b/contrib/vstudio/vc10/miniunz.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.filters b/contrib/vstudio/vc10/miniunz.vcxproj.filters old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/minizip.vcxproj b/contrib/vstudio/vc10/minizip.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/minizip.vcxproj.filters b/contrib/vstudio/vc10/minizip.vcxproj.filters old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/testzlib.vcxproj b/contrib/vstudio/vc10/testzlib.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.filters b/contrib/vstudio/vc10/testzlib.vcxproj.filters old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj b/contrib/vstudio/vc10/testzlibdll.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlib.rc b/contrib/vstudio/vc10/zlib.rc old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/contrib/vstudio/vc10/zlibstat.vcxproj.filters old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlibvc.sln b/contrib/vstudio/vc10/zlibvc.sln old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/contrib/vstudio/vc10/zlibvc.vcxproj.filters old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/miniunz.vcxproj b/contrib/vstudio/vc11/miniunz.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/minizip.vcxproj b/contrib/vstudio/vc11/minizip.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/testzlib.vcxproj b/contrib/vstudio/vc11/testzlib.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/testzlibdll.vcxproj b/contrib/vstudio/vc11/testzlibdll.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/zlib.rc b/contrib/vstudio/vc11/zlib.rc old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/zlibstat.vcxproj b/contrib/vstudio/vc11/zlibstat.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/zlibvc.def b/contrib/vstudio/vc11/zlibvc.def old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/zlibvc.sln b/contrib/vstudio/vc11/zlibvc.sln old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc11/zlibvc.vcxproj b/contrib/vstudio/vc11/zlibvc.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/miniunz.vcxproj b/contrib/vstudio/vc12/miniunz.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/minizip.vcxproj b/contrib/vstudio/vc12/minizip.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/testzlib.vcxproj b/contrib/vstudio/vc12/testzlib.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/testzlibdll.vcxproj b/contrib/vstudio/vc12/testzlibdll.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/zlib.rc b/contrib/vstudio/vc12/zlib.rc old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/zlibstat.vcxproj b/contrib/vstudio/vc12/zlibstat.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/zlibvc.sln b/contrib/vstudio/vc12/zlibvc.sln old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc12/zlibvc.vcxproj b/contrib/vstudio/vc12/zlibvc.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/miniunz.vcxproj b/contrib/vstudio/vc14/miniunz.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/minizip.vcxproj b/contrib/vstudio/vc14/minizip.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/testzlib.vcxproj b/contrib/vstudio/vc14/testzlib.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/testzlibdll.vcxproj b/contrib/vstudio/vc14/testzlibdll.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/zlib.rc b/contrib/vstudio/vc14/zlib.rc old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/zlibstat.vcxproj b/contrib/vstudio/vc14/zlibstat.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/zlibvc.def b/contrib/vstudio/vc14/zlibvc.def old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/zlibvc.sln b/contrib/vstudio/vc14/zlibvc.sln old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc14/zlibvc.vcxproj b/contrib/vstudio/vc14/zlibvc.vcxproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/zlib.rc b/contrib/vstudio/vc9/zlib.rc old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/zlibvc.sln b/contrib/vstudio/vc9/zlibvc.sln old mode 100755 new mode 100644 diff --git a/contrib/vstudio/vc9/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj old mode 100755 new mode 100644 diff --git a/crc32.c b/crc32.c old mode 100755 new mode 100644 diff --git a/crc32.h b/crc32.h old mode 100755 new mode 100644 diff --git a/deflate.c b/deflate.c old mode 100755 new mode 100644 diff --git a/deflate.h b/deflate.h old mode 100755 new mode 100644 diff --git a/doc/algorithm.txt b/doc/algorithm.txt old mode 100755 new mode 100644 diff --git a/doc/rfc1950.txt b/doc/rfc1950.txt old mode 100755 new mode 100644 diff --git a/doc/rfc1951.txt b/doc/rfc1951.txt old mode 100755 new mode 100644 diff --git a/doc/rfc1952.txt b/doc/rfc1952.txt old mode 100755 new mode 100644 diff --git a/doc/txtvsbin.txt b/doc/txtvsbin.txt old mode 100755 new mode 100644 diff --git a/examples/README.examples b/examples/README.examples old mode 100755 new mode 100644 diff --git a/examples/enough.c b/examples/enough.c old mode 100755 new mode 100644 diff --git a/examples/fitblk.c b/examples/fitblk.c old mode 100755 new mode 100644 diff --git a/examples/gun.c b/examples/gun.c old mode 100755 new mode 100644 diff --git a/examples/gzappend.c b/examples/gzappend.c old mode 100755 new mode 100644 diff --git a/examples/gzjoin.c b/examples/gzjoin.c old mode 100755 new mode 100644 diff --git a/examples/gzlog.c b/examples/gzlog.c old mode 100755 new mode 100644 diff --git a/examples/gzlog.h b/examples/gzlog.h old mode 100755 new mode 100644 diff --git a/examples/zlib_how.html b/examples/zlib_how.html old mode 100755 new mode 100644 diff --git a/examples/zpipe.c b/examples/zpipe.c old mode 100755 new mode 100644 diff --git a/examples/zran.c b/examples/zran.c old mode 100755 new mode 100644 diff --git a/gzclose.c b/gzclose.c old mode 100755 new mode 100644 diff --git a/gzguts.h b/gzguts.h old mode 100755 new mode 100644 diff --git a/gzlib.c b/gzlib.c old mode 100755 new mode 100644 diff --git a/gzread.c b/gzread.c old mode 100755 new mode 100644 diff --git a/gzwrite.c b/gzwrite.c old mode 100755 new mode 100644 diff --git a/huawei_zlib_CMakeList.patch b/huawei_zlib_CMakeList.patch new file mode 100755 index 0000000000000000000000000000000000000000..17a94fc5841de38053aeb8544e3cf3043b71702f --- /dev/null +++ b/huawei_zlib_CMakeList.patch @@ -0,0 +1,75 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0fe939d..34b6472 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -167,21 +167,21 @@ file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) + string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" + "\\1" ZLIB_FULL_VERSION ${_zlib_h_contents}) + +-if(MINGW) ++#if(MINGW) + # This gets us DLL resource information when compiling on MinGW. +- if(NOT CMAKE_RC_COMPILER) +- set(CMAKE_RC_COMPILER windres.exe) +- endif() +- +- add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj +- COMMAND ${CMAKE_RC_COMPILER} +- -D GCC_WINDRES +- -I ${CMAKE_CURRENT_SOURCE_DIR} +- -I ${CMAKE_CURRENT_BINARY_DIR} +- -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj +- -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) +- set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) +-endif(MINGW) ++# if(NOT CMAKE_RC_COMPILER) ++# set(CMAKE_RC_COMPILER windres.exe) ++# endif() ++ ++# add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj ++# COMMAND ${CMAKE_RC_COMPILER} ++# -D GCC_WINDRES ++# -I ${CMAKE_CURRENT_SOURCE_DIR} ++# -I ${CMAKE_CURRENT_BINARY_DIR} ++# -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj ++# -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) ++# set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) ++#endif(MINGW) + + add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) + add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +@@ -230,20 +230,20 @@ endif() + # Example binaries + #============================================================================ + +-add_executable(example test/example.c) +-target_link_libraries(example zlib) +-add_test(example example) ++#add_executable(example test/example.c) ++#target_link_libraries(example zlib) ++#add_test(example example) + +-add_executable(minigzip test/minigzip.c) +-target_link_libraries(minigzip zlib) ++#add_executable(minigzip test/minigzip.c) ++#target_link_libraries(minigzip zlib) + +-if(HAVE_OFF64_T) +- add_executable(example64 test/example.c) +- target_link_libraries(example64 zlib) +- set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +- add_test(example64 example64) ++#if(HAVE_OFF64_T) ++# add_executable(example64 test/example.c) ++# target_link_libraries(example64 zlib) ++# set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") ++# add_test(example64 example64) + +- add_executable(minigzip64 test/minigzip.c) +- target_link_libraries(minigzip64 zlib) +- set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +-endif() ++# add_executable(minigzip64 test/minigzip.c) ++# target_link_libraries(minigzip64 zlib) ++# set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") ++#endif() diff --git a/infback.c b/infback.c old mode 100755 new mode 100644 diff --git a/inffast.c b/inffast.c old mode 100755 new mode 100644 diff --git a/inffast.h b/inffast.h old mode 100755 new mode 100644 diff --git a/inffixed.h b/inffixed.h old mode 100755 new mode 100644 diff --git a/inflate.c b/inflate.c old mode 100755 new mode 100644 diff --git a/inflate.h b/inflate.h old mode 100755 new mode 100644 diff --git a/inftrees.c b/inftrees.c old mode 100755 new mode 100644 diff --git a/inftrees.h b/inftrees.h old mode 100755 new mode 100644 diff --git a/make_vms.com b/make_vms.com old mode 100755 new mode 100644 diff --git a/msdos/Makefile.bor b/msdos/Makefile.bor old mode 100755 new mode 100644 diff --git a/msdos/Makefile.dj2 b/msdos/Makefile.dj2 old mode 100755 new mode 100644 diff --git a/msdos/Makefile.emx b/msdos/Makefile.emx old mode 100755 new mode 100644 diff --git a/msdos/Makefile.msc b/msdos/Makefile.msc old mode 100755 new mode 100644 diff --git a/msdos/Makefile.tc b/msdos/Makefile.tc old mode 100755 new mode 100644 diff --git a/nintendods/Makefile b/nintendods/Makefile old mode 100755 new mode 100644 diff --git a/nintendods/README b/nintendods/README old mode 100755 new mode 100644 diff --git a/old/Makefile.emx b/old/Makefile.emx old mode 100755 new mode 100644 diff --git a/old/Makefile.riscos b/old/Makefile.riscos old mode 100755 new mode 100644 diff --git a/old/README b/old/README old mode 100755 new mode 100644 diff --git a/old/descrip.mms b/old/descrip.mms old mode 100755 new mode 100644 diff --git a/old/os2/Makefile.os2 b/old/os2/Makefile.os2 old mode 100755 new mode 100644 diff --git a/old/os2/zlib.def b/old/os2/zlib.def old mode 100755 new mode 100644 diff --git a/old/visual-basic.txt b/old/visual-basic.txt old mode 100755 new mode 100644 diff --git a/os400/README400 b/os400/README400 old mode 100755 new mode 100644 diff --git a/os400/bndsrc b/os400/bndsrc old mode 100755 new mode 100644 diff --git a/os400/make.sh b/os400/make.sh old mode 100755 new mode 100644 diff --git a/os400/zlib.inc b/os400/zlib.inc old mode 100755 new mode 100644 diff --git a/prepare.sh b/prepare.sh new file mode 100644 index 0000000000000000000000000000000000000000..eb4357b9554507e3547703bcb2970cf31454d78a --- /dev/null +++ b/prepare.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. + +git checkout CMakeLists.txt +git apply huawei_zlib_CMakeList.patch diff --git a/qnx/package.qpg b/qnx/package.qpg old mode 100755 new mode 100644 diff --git a/test/example.c b/test/example.c old mode 100755 new mode 100644 diff --git a/test/infcover.c b/test/infcover.c old mode 100755 new mode 100644 diff --git a/test/minigzip.c b/test/minigzip.c old mode 100755 new mode 100644 diff --git a/treebuild.xml b/treebuild.xml old mode 100755 new mode 100644 diff --git a/trees.c b/trees.c old mode 100755 new mode 100644 diff --git a/trees.h b/trees.h old mode 100755 new mode 100644 diff --git a/uncompr.c b/uncompr.c old mode 100755 new mode 100644 diff --git a/watcom/watcom_f.mak b/watcom/watcom_f.mak old mode 100755 new mode 100644 diff --git a/watcom/watcom_l.mak b/watcom/watcom_l.mak old mode 100755 new mode 100644 diff --git a/win32/DLL_FAQ.txt b/win32/DLL_FAQ.txt old mode 100755 new mode 100644 diff --git a/win32/Makefile.bor b/win32/Makefile.bor old mode 100755 new mode 100644 diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc old mode 100755 new mode 100644 diff --git a/win32/Makefile.msc b/win32/Makefile.msc old mode 100755 new mode 100644 diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt old mode 100755 new mode 100644 diff --git a/win32/VisualC.txt b/win32/VisualC.txt old mode 100755 new mode 100644 diff --git a/win32/zlib.def b/win32/zlib.def old mode 100755 new mode 100644 diff --git a/win32/zlib1.rc b/win32/zlib1.rc old mode 100755 new mode 100644 diff --git a/zconf.h b/zconf.h old mode 100755 new mode 100644 diff --git a/zconf.h.cmakein b/zconf.h.cmakein old mode 100755 new mode 100644 diff --git a/zconf.h.in b/zconf.h.in old mode 100755 new mode 100644 diff --git a/zlib.3 b/zlib.3 old mode 100755 new mode 100644 diff --git a/zlib.3.pdf b/zlib.3.pdf old mode 100755 new mode 100644 diff --git a/zlib.h b/zlib.h old mode 100755 new mode 100644 diff --git a/zlib.map b/zlib.map old mode 100755 new mode 100644 diff --git a/zlib.pc.cmakein b/zlib.pc.cmakein old mode 100755 new mode 100644 diff --git a/zlib.pc.in b/zlib.pc.in old mode 100755 new mode 100644 diff --git a/zutil.c b/zutil.c old mode 100755 new mode 100644 diff --git a/zutil.h b/zutil.h old mode 100755 new mode 100644