2008-02-16 Ivan N. Zlatev <contact@i-nz.net>

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index a2dfd5d173660637ef82994358533d463da27cba..3b10a778a9b2cf7a4554f8f31bb4042f45678daa 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,17 +1,19 @@
 thisdir := .
 
-SUBDIRS := build jay mcs tools/culevel class nunit20 ilasm tools tests errors docs
-DIST_ONLY_SUBDIRS := gmcs
+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 class ilasm tools
-net_2_0_SUBDIRS := build jay gmcs class nunit20 ilasm tests errors 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 \
@@ -28,10 +30,21 @@ 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/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)
@@ -43,15 +56,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 = default net_2_0 net_3_5
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
 all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -70,6 +86,8 @@ 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--%