Author: raja
Date: 2005-12-22 04:17:33 -0500 (Thu, 22 Dec 2005)
New Revision: 54724
Added:
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources
trunk/mcs/class/compat/
trunk/mcs/class/compat/default/
trunk/mcs/class/compat/net_2_0/
Removed:
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources
Modified:
trunk/mcs/build/ChangeLog
trunk/mcs/build/library.make
trunk/mcs/class/ChangeLog
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
trunk/mcs/class/Makefile
Log:
In build:
* 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.
In class:
* Makefile (default_SUBDIRS): Add Compat.ICSharpCode.SharpZipLib.
* 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.
In class/Compat.ICSharpCode.SharpZipLib:
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.
Modified: trunk/mcs/build/ChangeLog
===================================================================
--- trunk/mcs/build/ChangeLog 2005-12-22 09:14:29 UTC (rev 54723)
+++ trunk/mcs/build/ChangeLog 2005-12-22 09:17:33 UTC (rev 54724)
@@ -1,3 +1,9 @@
+2005-12-22 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * 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.
+
2005-12-03 Kornél Pál <[EMAIL PROTECTED]>
* config-default.make: Corrected default CODEPAGE comment to ISO-8859-1
Modified: trunk/mcs/build/library.make
===================================================================
--- trunk/mcs/build/library.make 2005-12-22 09:14:29 UTC (rev 54723)
+++ trunk/mcs/build/library.make 2005-12-22 09:17:33 UTC (rev 54724)
@@ -38,8 +38,14 @@
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)
Modified: trunk/mcs/class/ChangeLog
===================================================================
--- trunk/mcs/class/ChangeLog 2005-12-22 09:14:29 UTC (rev 54723)
+++ trunk/mcs/class/ChangeLog 2005-12-22 09:17:33 UTC (rev 54724)
@@ -1,3 +1,10 @@
+2005-12-22 Raja R Harinath <[EMAIL PROTECTED]>
+
+ * Makefile (default_SUBDIRS): Add Compat.ICSharpCode.SharpZipLib.
+ * 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 <[EMAIL PROTECTED]>
* Makefile : seems like net_2_0_ONLY_SUBDIRS must precede.
Modified: trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog
===================================================================
--- trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog 2005-12-22
09:14:29 UTC (rev 54723)
+++ trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog 2005-12-22
09:17:33 UTC (rev 54724)
@@ -1,3 +1,12 @@
+2005-12-22 Raja R Harinath <[EMAIL PROTECTED]>
+
+ 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 <[EMAIL PROTECTED]>
* Makefile (EXTRA_DISTFILES): Add SharpZipLib.pub.
Copied:
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources
(from rev 54721,
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources)
Deleted:
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources
===================================================================
---
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources
2005-12-22 09:14:29 UTC (rev 54723)
+++
trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources
2005-12-22 09:17:33 UTC (rev 54724)
@@ -1,38 +0,0 @@
-./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
Modified: trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile
===================================================================
--- trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile 2005-12-22
09:14:29 UTC (rev 54723)
+++ trunk/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile 2005-12-22
09:17:33 UTC (rev 54724)
@@ -1,11 +1,13 @@
-thisdir = class/ICSharpCode.SharpZipLib
+thisdir = class/Compat.ICSharpCode.SharpZipLib
SUBDIRS =
include ../../build/rules.make
-LIBRARY = ICSharpCode.SharpZipLib.dll
+LIBRARY = Compat.ICSharpCode.SharpZipLib.dll
+LIBRARY_NAME = ICSharpCode.SharpZipLib.dll
+LIBRARY_COMPAT = yes
LIBRARY_SNK = SharpZipLib.key
-LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll
+LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll
NO_TEST = yes
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
Modified: trunk/mcs/class/Makefile
===================================================================
--- trunk/mcs/class/Makefile 2005-12-22 09:14:29 UTC (rev 54723)
+++ trunk/mcs/class/Makefile 2005-12-22 09:17:33 UTC (rev 54724)
@@ -66,6 +66,7 @@
PEAPI \
Npgsql \
ICSharpCode.SharpZipLib \
+ Compat.ICSharpCode.SharpZipLib \
ByteFX.Data \
Commons.Xml.Relaxng \
Novell.Directory.Ldap \
Property changes on: trunk/mcs/class/compat/default
___________________________________________________________________
Name: svn:ignore
+ *.dll
*.pdb
*.mdb
*.exe
Property changes on: trunk/mcs/class/compat/net_2_0
___________________________________________________________________
Name: svn:ignore
+ *.dll
*.mdb
*.pdb
*.exe
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
