diff options
| author | Raja R Harinath <harinath@hurrynot.org> | 2005-12-22 12:17:33 +0300 |
|---|---|---|
| committer | Raja R Harinath <harinath@hurrynot.org> | 2005-12-22 12:17:33 +0300 |
| commit | 681cc93f093363e7e28e0c80487340b85aae45e8 (patch) | |
| tree | f705b7d2a8a9139491e36eca07788dbe0c97a05c /mcs/class | |
| parent | 4eb53a487774fd2bb41b3d2b0760a75d320b12b4 (diff) | |
| parent | 30e9659a14e6a7628be631a89091b8613a63f055 (diff) | |
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.
svn path=/trunk/mcs/; revision=54724
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/ChangeLog | 7 | ||||
| -rw-r--r-- | mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog | 9 | ||||
| -rw-r--r-- | mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources (renamed from mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources) | 0 | ||||
| -rw-r--r-- | mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile | 8 | ||||
| -rw-r--r-- | mcs/class/Makefile | 1 |
5 files changed, 22 insertions, 3 deletions
diff --git a/mcs/class/ChangeLog b/mcs/class/ChangeLog index ea81afa7487..3ee3e21c45f 100644 --- a/mcs/class/ChangeLog +++ b/mcs/class/ChangeLog @@ -1,3 +1,10 @@ +2005-12-22 Raja R Harinath <rharinath@novell.com> + + * 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 <atsushi@ximian.com> * Makefile : seems like net_2_0_ONLY_SUBDIRS must precede. diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog b/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog index 8e91e21a4c4..693d2174efe 100644 --- a/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog +++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/ChangeLog @@ -1,3 +1,12 @@ +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. diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources b/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources index 98de302206b..98de302206b 100644 --- a/mcs/class/Compat.ICSharpCode.SharpZipLib/ICSharpCode.SharpZipLib.dll.sources +++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/Compat.ICSharpCode.SharpZipLib.dll.sources diff --git a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile index fe5ae55972c..fc5c44de7f1 100644 --- a/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile +++ b/mcs/class/Compat.ICSharpCode.SharpZipLib/Makefile @@ -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) diff --git a/mcs/class/Makefile b/mcs/class/Makefile index b880b3359fa..f4a21f3605c 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -66,6 +66,7 @@ default_SUBDIRS := \ PEAPI \ Npgsql \ ICSharpCode.SharpZipLib \ + Compat.ICSharpCode.SharpZipLib \ ByteFX.Data \ Commons.Xml.Relaxng \ Novell.Directory.Ldap \ |