X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2FMakefile;h=7ac1242c1e995ead9cdeda2c8485afd0a489665d;hb=20ede70ef00e2973495c0bfa765a0f59dd2afdb1;hp=2132785bc7a74d9dd7e00dd2f70b404dcf51310d;hpb=048773c45e8c5cddb6d0f86aea9e3911d274459a;p=mono.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 2132785bc7a..7ac1242c1e9 100644
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,37 +1,67 @@
 thisdir := .
 
-SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
-
-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
+SUBDIRS := build jay mcs class nunit24 ilasm tools tests errors docs
+
+basic_SUBDIRS := build jay mcs class tools
+net_2_0_bootstrap_SUBDIRS := build tools
+net_2_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
+net_2_1_bootstrap_SUBDIRS := build mcs class
+net_2_1_raw_SUBDIRS := build mcs class tools
+net_2_1_SUBDIRS := tools tests errors
+monotouch_SUBDIRS := build mcs class
+monotouch_bootstrap_SUBDIRS := build mcs class
+net_3_5_SUBDIRS := build class
+net_4_0_bootstrap_SUBDIRS := build mcs class tools
+net_4_0_SUBDIRS := build mcs class nunit24 ilasm tools tests errors
 
 # List of test subdirs that should pass 100%
 centum_tests := \
-	class/corlib \
-	class/System \
-	class/Commons.Xml.Relaxng \
-	class/Cscompmgd \
-	class/Microsoft.JScript \
-	class/Mono.Posix \
-	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 \
+	class/corlib						\
+	class/System						\
+	class/System.XML					\
+	class/Commons.Xml.Relaxng				\
+	class/Cscompmgd						\
+	class/Microsoft.JScript					\
+	class/Mono.Posix					\
+	class/Mono.Security					\
+	class/System.Design					\
+	class/System.DirectoryServices		\
+	class/System.Drawing				\
+	class/System.Runtime.Remoting				\
+	class/System.Runtime.Serialization.Formatters.Soap	\
+	class/System.Security					\
+	class/System.ServiceProcess				\
+	class/System.Web						\
+	class/System.Web.Services				\
+	tests							\
 	errors
 
-default_centum_tests :=		\
+default_centum_tests := \
 	$(centum_tests) 	\
-	class/System.XML	\
 	class/System.Data
 
-net_2_0_centum_tests := $(centum_tests) #class/Mono.C5
+net_2_0_centum_tests := \
+	$(centum_tests)				\
+	class/System.Core			\
+	class/System.Configuration		\
+	class/System.Data.DataSetExtensions	\
+	class/System.Xml.Linq			\
+	class/System.Transactions		\
+	class/Microsoft.Build.Framework		\
+	class/Microsoft.Build.Utilities		\
+	class/Microsoft.Build.Engine		\
+	class/System.Runtime.Serialization	\
+	class/System.IdentityModel		\
+	class/System.ServiceModel		\
+	class/System.ServiceModel.Web		\
+	class/Mono.C5
+
+#	class/System.Web.Extensions
+#	class/Microsoft.Build.Tasks	
+
+# note that System.Xml.Linq is here to prevent this from being empty
+net_3_5_centum_tests := \
+	class/System.Xml.Linq
 
 ifdef ONLY_CENTUM_TESTS
 TEST_SUBDIRS := $($(PROFILE)_centum_tests)
@@ -43,15 +73,18 @@ endif
 
 include build/rules.make
 
-all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
+all-recursive $(STD_TARGETS:=-recursive): dir-check platform-check profile-check
 
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
 	@:
 
+dir-check:
+	@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then echo "Running make from the mcs directory is not supported. Run make from the parent directory (if using a tarball), or from the directory where the runtime is checked out (if using an SVN checkout)."; exit 1; fi
+
 # fun specialty targets
 
-PROFILES = default net_2_0
+PROFILES = net_2_0 net_3_5 net_4_0
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -70,10 +103,16 @@ profiles-do--run-test:
 
 # Orchestrate the bootstrap here.
 _boot_ = all clean install
+$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--net_4_0_bootstrap--%
+$(_boot_:%=profile-do--net_4_0_bootstrap--%): profile-do--net_4_0_bootstrap--%: profile-do--net_2_0--%
+$(_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_1_raw--%
+$(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--monotouch_bootstrap--%
+$(_boot_:%=profile-do--monotouch_bootstrap--%): profile-do--monotouch_bootstrap--%: profile-do--net_2_0--%
+$(_boot_:%=profile-do--net_2_1_raw--%):       profile-do--net_2_1_raw--%:       profile-do--net_2_1_bootstrap--%
+$(_boot_:%=profile-do--net_2_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: 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--%
-$(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
+$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--basic--%
 
 testcorlib:
 	@cd class/corlib && $(MAKE) test run-test
@@ -81,10 +120,6 @@ testcorlib:
 compiler-tests:
 	$(MAKE) TEST_SUBDIRS="tests errors" run-test-profiles
 
-test-installed-compiler:
-	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=default TEST_RUNTIME=mono MCS=mcs run-test
-	$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_2_0 TEST_RUNTIME=mono MCS=gmcs run-test
-
 package := mcs-$(VERSION)
 
 DISTFILES = \
@@ -108,6 +143,8 @@ DISTFILES = \
 
 dist-local: dist-default
 
+csproj-local:
+
 dist-pre:
 	rm -rf $(package)
 	mkdir $(package)