Permalink
Browse files

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
  • Loading branch information...
2 parents 4eb53a4 + 30e9659 commit 681cc93f093363e7e28e0c80487340b85aae45e8 @harinath harinath committed Dec 22, 2005
View
@@ -1,3 +1,9 @@
+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.
+
2005-12-03 Kornél Pál <kornelpal@hotmail.com>
* config-default.make: Corrected default CODEPAGE comment to ISO-8859-1
@@ -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)
View
@@ -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.
@@ -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.
@@ -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)
View
@@ -66,6 +66,7 @@ default_SUBDIRS := \
PEAPI \
Npgsql \
ICSharpCode.SharpZipLib \
+ Compat.ICSharpCode.SharpZipLib \
ByteFX.Data \
Commons.Xml.Relaxng \
Novell.Directory.Ldap \

0 comments on commit 681cc93

Please sign in to comment.