X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=4202be7f8b7f3ad98a6c3b8ad7d225a8fcd1f998;hb=59934c943c067c7920e9d0f98c9cc3840f6e2328;hp=8e2280adc90c4e0f5a14a63bafddef06415b63e4;hpb=6b6435d1b3206b0162c37e5ecce8d9a699fe6467;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 8e2280adc90..4202be7f8b7 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,33 +1,50 @@
 thisdir := .
 
-SUBDIRS := build jay mcs tools/resgen class mbas nunit20 ilasm tools tests errors docs
-DIST_ONLY_SUBDIRS := gmcs
+SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
 
-basic_SUBDIRS := jay mcs class
-net_1_1_bootstrap_SUBDIRS := jay mcs class ilasm tools
-net_2_0_bootstrap_SUBDIRS := class
-net_2_0_SUBDIRS := jay gmcs class nunit20 tests errors tools
+basic_SUBDIRS := build jay mcs class
+net_1_1_bootstrap_SUBDIRS := build jay mcs class ilasm tools
+net_2_0_bootstrap_SUBDIRS := build jay mcs class ilasm tools
+net_2_0_SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors
+net_2_1_SUBDIRS := build mcs class tools
+net_3_5_SUBDIRS := build class
 
 # List of test subdirs that should pass 100%
 centum_tests := \
+	class/corlib \
+	class/System \
+	class/System.XML	\
 	class/Commons.Xml.Relaxng \
 	class/Cscompmgd \
 	class/Microsoft.JScript \
 	class/Mono.Posix \
-	class/System.Configuration.Install \
+	class/Mono.Security \
+	class/System.Messaging \
+	class/System.Runtime.Remoting \
 	class/System.Runtime.Serialization.Formatters.Soap \
+	class/System.Security \
+	class/System.ServiceProcess \
 	class/System.Web.Services \
 	tests \
 	errors
-#	class/System
-
-default_centum_tests := \
-	class/corlib \
-	class/Mono.Security \
-	class/System.Runtime.Remoting \
-	$(centum_tests)
 
-net_2_0_centum_tests := $(centum_tests)
+default_centum_tests :=		\
+	$(centum_tests) 	\
+	class/System.Data
+
+net_2_0_centum_tests := \
+	$(centum_tests) 	\
+	class/System.Core			\
+	class/System.Configuration	\
+	class/Microsoft.Build.Framework	\
+	class/Microsoft.Build.Utilities	\
+	class/Microsoft.Build.Engine
+	#class/Microsoft.Build.Tasks	
+	#class/Mono.C5
+	
+net_3_5_centum_tests := \
+	class/System.Xml.Linq
+	#class/System.Web.Extensions		
 
 ifdef ONLY_CENTUM_TESTS
 TEST_SUBDIRS := $($(PROFILE)_centum_tests)
@@ -47,7 +64,7 @@ all-local $(STD_TARGETS:=-local):
 
 # fun specialty targets
 
-PROFILES = default net_2_0
+PROFILES = default net_2_0 net_3_5
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -66,12 +83,12 @@ profiles-do--run-test:
 
 # Orchestrate the bootstrap here.
 _boot_ = all clean install
+$(_boot_:%=profile-do--net_3_5--%):           profile-do--net_3_5--%:           profile-do--net_2_0--%
+$(_boot_:%=profile-do--net_2_1--%):           profile-do--net_2_1--%:           profile-do--net_2_0--%
 $(_boot_:%=profile-do--net_2_0--%):           profile-do--net_2_0--%:           profile-do--net_2_0_bootstrap--%
 $(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--default--%
 $(_boot_:%=profile-do--default--%):           profile-do--default--%:           profile-do--net_1_1_bootstrap--%
-ifeq (linux, $(PLATFORM))
 $(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
-endif
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
@@ -94,6 +111,7 @@ DISTFILES = \
 	LICENSE			\
 	LICENSE.GPL		\
 	LICENSE.LGPL		\
+	LICENSE.MPL		\
 	Makefile		\
 	mkinstalldirs		\
 	MIT.X11			\
@@ -111,7 +129,7 @@ dist-pre:
 
 dist-tarball: dist-pre
 	$(MAKE) distdir='$(package)' dist-recursive
-	tar cvzf $(package).tar.gz $(package)
+	tar cvjf $(package).tar.bz2 $(package)
 
 dist: dist-tarball
 	rm -rf $(package)
@@ -132,9 +150,9 @@ distcheck: dist-tarball
 	    $(MAKE) prefix=$(prefix) && $(MAKE) test && $(MAKE) install DESTDIR="$$destdir" && \
 	    $(MAKE) clean && $(MAKE) dist || exit 1) || exit 1 ; \
 	mv Distcheck-MCS $(package) ; \
-	tar tzf $(package)/$(package).tar.gz |sed -e 's,/$$,,' |sort >distdist.list ; \
-	rm $(package)/$(package).tar.gz ; \
-	tar tzf $(package).tar.gz |sed -e 's,/$$,,' |sort >before.list ; \
+	tar tjf $(package)/$(package).tar.bz2 |sed -e 's,/$$,,' |sort >distdist.list ; \
+	rm $(package)/$(package).tar.bz2 ; \
+	tar tjf $(package).tar.bz2 |sed -e 's,/$$,,' |sort >before.list ; \
 	find $(package) |egrep -v '(makefrag|response)' |sed -e 's,/$$,,' |sort >after.list ; \
 	cmp before.list after.list || exit 1 ; \
 	cmp before.list distdist.list || exit 1 ; \
@@ -146,7 +164,7 @@ monocharge:
 	mkdir "$$chargedir" ; \
 	DESTDIR=`cd "$$chargedir" && pwd` ; \
 	$(MAKE) install DESTDIR="$$DESTDIR" || exit 1 ; \
-	tar cvzf "$$chargedir".tgz "$$chargedir" ; \
+	tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
 	rm -rf "$$chargedir"
 
 # A bare-bones monocharge.
@@ -160,5 +178,5 @@ monocharge-lite:
 	$(MAKE) -C class/System install DESTDIR="$$DESTDIR" || exit 1; \
 	$(MAKE) -C class/System.XML install DESTDIR="$$DESTDIR" || exit 1; \
 	$(MAKE) -C class/Mono.CSharp.Debugger install DESTDIR="$$DESTDIR" || exit 1; \
-	tar cvzf "$$chargedir".tgz "$$chargedir" ; \
+	tar cvjf "$$chargedir".tar.bz2 "$$chargedir" ; \
 	rm -rf "$$chargedir"