Permalink
Browse files

Merged some changes from trunk:

Copied mono-1-1-9 tagged ziplib

Merged Raja's compat changes:
54724 54725 54726 


svn path=/branches/mono-1-1-12/mcs/; revision=54736
  • Loading branch information...
Wade Berrier
Wade Berrier committed Dec 22, 2005
3 parents 5c2e969 + 7d93a1c + 0c12971 commit 6f390f39ea3f3cad0fda558cb152ea2f0959ac2e
Showing with 15,021 additions and 4 deletions.
  1. +8 −0 mcs/build/ChangeLog
  2. +17 −3 mcs/build/library.make
  3. +9 −0 mcs/class/ChangeLog
  4. +26 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog
  5. +38 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources
  6. +58 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/AssemblyInfo.cs
  7. +89 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/BZip2/BZip2.cs
  8. +156 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/BZip2/BZip2Constants.cs
  9. +958 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/BZip2/BZip2InputStream.cs
  10. +1,776 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/BZip2/BZip2OutputStream.cs
  11. +10 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ChangeLog
  12. +200 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Checksums/Adler32.cs
  13. +211 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Checksums/Crc32.cs
  14. +93 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Checksums/IChecksum.cs
  15. +159 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Checksums/StrangeCrc.cs
  16. +68 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/GZip/GZipConstants.cs
  17. +336 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/GZip/GZipInputStream.cs
  18. +174 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/GZip/GZipOutputStream.cs
  19. +72 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/InvalidHeaderException.cs
  20. +696 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/TarArchive.cs
  21. +510 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/TarBuffer.cs
  22. +567 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/TarEntry.cs
  23. +753 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/TarHeader.cs
  24. +646 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/TarInputStream.cs
  25. +422 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs
  26. +542 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/Deflater.cs
  27. +85 −0 ...class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/DeflaterConstants.cs
  28. +653 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/DeflaterEngine.cs
  29. +780 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/DeflaterHuffman.cs
  30. +52 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/DeflaterPending.cs
  31. +782 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/Inflater.cs
  32. +207 −0 ...class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/InflaterDynHeader.cs
  33. +213 −0 ...ass/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/InflaterHuffmanTree.cs
  34. +210 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/PendingBuffer.cs
  35. +379 −0 ...t.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/Streams/DeflaterOutputStream.cs
  36. +386 −0 ...at.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs
  37. +176 −0 ...ss/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/Streams/OutputWindow.cs
  38. +245 −0 ...mpat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/Compression/Streams/StreamManipulator.cs
  39. +146 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/ZipConstants.cs
  40. +428 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/ZipEntry.cs
  41. +540 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/ZipFile.cs
  42. +488 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/ZipInputStream.cs
  43. +550 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/Zip/ZipOutputStream.cs
  44. +62 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib/ZipException.cs
  45. +14 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
  46. +28 −0 mcs/class/Compat.ICSharpCode.SharpZipLib/README
  47. BIN mcs/class/Compat.ICSharpCode.SharpZipLib/SharpZipLib.key
  48. BIN mcs/class/Compat.ICSharpCode.SharpZipLib/SharpZipLib.pub
  49. +3 −1 mcs/class/Makefile
View
@@ -1,3 +1,11 @@
+2005-12-22 Raja R Harinath <rharinath@novell.com>
+
+ * library.make (lib_dir): Define to 'compat' if LIBRARY_COMPAT is
+ defined, 'lib' otherwise.
+ (the_lib): Use it to decide where to place the output library.
+ (LIBRARY_PACKAGE): New define. Install development symlinks for
+ compat libraries in a different directory.
+
2005-12-03 Kornél Pál <kornelpal@hotmail.com>
* config-default.make: Corrected default CODEPAGE comment to ISO-8859-1
View
@@ -38,8 +38,14 @@ ifndef LIBRARY_NAME
LIBRARY_NAME = $(LIBRARY)
endif
+ifdef LIBRARY_COMPAT
+lib_dir = compat
+else
+lib_dir = lib
+endif
+
makefrag = $(depsdir)/$(PROFILE)_$(LIBRARY).makefrag
-the_lib = $(topdir)/class/lib/$(PROFILE)/$(LIBRARY_NAME)
+the_lib = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_NAME)
the_pdb = $(the_lib:.dll=.pdb)
the_mdb = $(the_lib).mdb
library_CLEAN_FILES += $(makefrag) $(the_lib) $(the_pdb) $(the_mdb)
@@ -155,11 +161,19 @@ ifndef RUNTIME_HAS_CONSISTENT_GACDIR
gacdir_flag = /gacdir $(GACDIR)
endif
+ifndef LIBRARY_PACKAGE
+ifdef LIBRARY_COMPAT
+LIBRARY_PACKAGE = compat-$(FRAMEWORK_VERSION)
+else
+LIBRARY_PACKAGE = $(FRAMEWORK_VERSION)
+endif
+endif
+
install-local: $(gacutil)
- $(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION)
+ $(GACUTIL) /i $(the_lib) /f $(gacdir_flag) /root $(GACROOT) /package $(LIBRARY_PACKAGE)
uninstall-local: $(gacutil)
- -$(GACUTIL) /u $(LIBRARY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) /package $(FRAMEWORK_VERSION)
+ -$(GACUTIL) /u $(LIBRARY_NAME:.dll=) $(gacdir_flag) /root $(GACROOT) /package $(LIBRARY_PACKAGE)
endif
endif
View
@@ -1,3 +1,12 @@
+2005-12-22 Raja R Harinath <rharinath@novell.com>
+
+ * Makefile (default_SUBDIRS): Add Compat.ICSharpCode.SharpZipLib.
+ (COMPAT_PROFILE_DIRS): New.
+ (dist-local): Use it.
+ * compat/default, compat/net_2_0: New directories for holding
+ backwards-compatibility libraries. These will not be used inside
+ the tree, but will be installed into the GAC.
+
2005-12-12 Atsushi Enomoto <atsushi@ximian.com>
* Makefile : seems like net_2_0_ONLY_SUBDIRS must precede.
@@ -0,0 +1,26 @@
+2005-12-22 Raja R Harinath <rharinath@novell.com>
+
+ Mark this as a backwards-compatibility library.
+ * Makefile (thisdir): Update to new location.
+ (LIBRARY): Rename to be unique.
+ (LIBRARY_NAME, LIBRARY_COMPAT): Define.
+ * Compat.ICSharpCode.SharpZipLib.dll.sources: Rename from
+ ICSharpCode.SharpZipLib.dll.sources to reflect changes.
+
+2004-11-25 Raja R Harinath <rharinath@novell.com>
+
+ * Makefile (EXTRA_DISTFILES): Add SharpZipLib.pub.
+
+2004-06-21 Raja R Harinath <rharinath@novell.com>
+
+ * Makefile (LIBRARY_SNK): Sign with SharpZipLib.key. The library
+ is delay-signed according to ICSharpCode.SharpZipLib/AssemblyInfo.cs.
+
+2004-06-09 Sebastien Pouliot <sebastien@ximian.com>
+
+ * Makefile: Don't sign this assembly as it is fully signed during
+ compilation (we have the original private key). Thanks to Jackson.
+
+2004-05-28 Duncan Mak <duncan@ximian.com>
+
+ * SharpZipLib.pub: Added public key.
@@ -0,0 +1,38 @@
+./ICSharpCode.SharpZipLib/BZip2/BZip2.cs
+./ICSharpCode.SharpZipLib/BZip2/BZip2Constants.cs
+./ICSharpCode.SharpZipLib/BZip2/BZip2InputStream.cs
+./ICSharpCode.SharpZipLib/BZip2/BZip2OutputStream.cs
+./ICSharpCode.SharpZipLib/Checksums/Adler32.cs
+./ICSharpCode.SharpZipLib/Checksums/Crc32.cs
+./ICSharpCode.SharpZipLib/Checksums/IChecksum.cs
+./ICSharpCode.SharpZipLib/Checksums/StrangeCrc.cs
+./ICSharpCode.SharpZipLib/GZip/GZipConstants.cs
+./ICSharpCode.SharpZipLib/GZip/GZipInputStream.cs
+./ICSharpCode.SharpZipLib/GZip/GZipOutputStream.cs
+./ICSharpCode.SharpZipLib/Tar/InvalidHeaderException.cs
+./ICSharpCode.SharpZipLib/Tar/TarArchive.cs
+./ICSharpCode.SharpZipLib/Tar/TarBuffer.cs
+./ICSharpCode.SharpZipLib/Tar/TarEntry.cs
+./ICSharpCode.SharpZipLib/Tar/TarHeader.cs
+./ICSharpCode.SharpZipLib/Tar/TarInputStream.cs
+./ICSharpCode.SharpZipLib/Tar/TarOutputStream.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/Deflater.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/DeflaterConstants.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/DeflaterEngine.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/DeflaterHuffman.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/DeflaterPending.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/Inflater.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/InflaterDynHeader.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/InflaterHuffmanTree.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/PendingBuffer.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/Streams/DeflaterOutputStream.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/Streams/InflaterInputStream.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/Streams/OutputWindow.cs
+./ICSharpCode.SharpZipLib/Zip/Compression/Streams/StreamManipulator.cs
+./ICSharpCode.SharpZipLib/Zip/ZipConstants.cs
+./ICSharpCode.SharpZipLib/Zip/ZipEntry.cs
+./ICSharpCode.SharpZipLib/Zip/ZipFile.cs
+./ICSharpCode.SharpZipLib/Zip/ZipInputStream.cs
+./ICSharpCode.SharpZipLib/Zip/ZipOutputStream.cs
+./ICSharpCode.SharpZipLib/AssemblyInfo.cs
+./ICSharpCode.SharpZipLib/ZipException.cs
@@ -0,0 +1,58 @@
+// AssemblyInfo.cs
+// Copyright (C) 2001 Mike Krueger
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// Linking this library statically or dynamically with other modules is
+// making a combined work based on this library. Thus, the terms and
+// conditions of the GNU General Public License cover the whole
+// combination.
+//
+// As a special exception, the copyright holders of this library give you
+// permission to link this library with independent modules to produce an
+// executable, regardless of the license terms of these independent
+// modules, and to copy and distribute the resulting executable under
+// terms of your choice, provided that you also meet, for each linked
+// independent module, the terms and conditions of the license of that
+// module. An independent module is a module which is not derived from
+// or based on this library. If you modify this library, you may extend
+// this exception to your version of the library, but you are not
+// obligated to do so. If you do not wish to do so, delete this
+// exception statement from your version.
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+[assembly: CLSCompliant(true)]
+
+[assembly: AssemblyTitle("ICSharpCode.SharpZipLibrary")]
+[assembly: AssemblyDescription("free C# zlib implementation")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("#ZipLibrary")]
+[assembly: AssemblyCopyright("(c) Mike Krueger 2001-2004")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+#if NET_2_0
+[assembly: AssemblyVersion("2.6.0.0")]
+#else
+// not worrying about the NET_1_0 profile for now.
+[assembly: AssemblyVersion("0.6.0.0")]
+#endif
+
+[assembly: AssemblyDelaySign(true)]
+[assembly: AssemblyKeyFile ("SharpZipLib.pub")]
@@ -0,0 +1,89 @@
+// BZip2.cs
+// Copyright (C) 2001 Mike Krueger
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+//
+// Linking this library statically or dynamically with other modules is
+// making a combined work based on this library. Thus, the terms and
+// conditions of the GNU General Public License cover the whole
+// combination.
+//
+// As a special exception, the copyright holders of this library give you
+// permission to link this library with independent modules to produce an
+// executable, regardless of the license terms of these independent
+// modules, and to copy and distribute the resulting executable under
+// terms of your choice, provided that you also meet, for each linked
+// independent module, the terms and conditions of the license of that
+// module. An independent module is a module which is not derived from
+// or based on this library. If you modify this library, you may extend
+// this exception to your version of the library, but you are not
+// obligated to do so. If you do not wish to do so, delete this
+// exception statement from your version.
+
+using System;
+using System.IO;
+
+namespace ICSharpCode.SharpZipLib.BZip2
+{
+
+ /// <summary>
+ /// Does all the compress and decompress pre-operation stuff.
+ /// Sets up the streams and file header characters.
+ /// Uses multiply overloaded methods to call for the compress/decompress.
+ /// </summary>
+ public sealed class BZip2
+ {
+ public static void Decompress(Stream instream, Stream outstream)
+ {
+ System.IO.Stream bos = outstream;
+ System.IO.Stream bis = instream;
+ BZip2InputStream bzis = new BZip2InputStream(bis);
+ int ch = bzis.ReadByte();
+ while (ch != -1) {
+ bos.WriteByte((byte)ch);
+ ch = bzis.ReadByte();
+ }
+ bos.Flush();
+ }
+
+ public static void Compress(Stream instream, Stream outstream, int blockSize)
+ {
+ System.IO.Stream bos = outstream;
+ System.IO.Stream bis = instream;
+ int ch = bis.ReadByte();
+ BZip2OutputStream bzos = new BZip2OutputStream(bos, blockSize);
+ while(ch != -1) {
+ bzos.WriteByte((byte)ch);
+ ch = bis.ReadByte();
+ }
+ bis.Close();
+ bzos.Close();
+ }
+ }
+}
+/* derived from a file which contained this license :
+ * Copyright (c) 1999-2001 Keiron Liddle, Aftex Software
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+*/
Oops, something went wrong.

0 comments on commit 6f390f3

Please sign in to comment.