Fix for build breakage on cygwin-head-mono

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index 37f665ba64ad16e2637d7b4e9276380c55e546a9..eef787d1681f415641c97c1438b568d3184e46e5 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,30 +1,46 @@
 thisdir := .
 
-SUBDIRS := build jay mcs monoresgen class mbas nunit20 ilasm tools tests errors docs
+SUBDIRS := build jay mcs tools/resgen class mbas nunit20 ilasm tools tests errors docs
 DIST_ONLY_SUBDIRS := gmcs
 
 basic_SUBDIRS := jay mcs class
-net_1_1_bootstrap_SUBDIRS := jay mcs class
+net_1_1_bootstrap_SUBDIRS := jay mcs class tools
 net_2_0_bootstrap_SUBDIRS := class
-net_2_0_SUBDIRS := jay gmcs class tests errors tools
+net_2_0_SUBDIRS := jay gmcs class nunit20 tests errors tools
+
+# List of test subdirs that should pass 100%
+centum_tests := \
+       class/Commons.Xml.Relaxng \
+       class/Cscompmgd \
+       class/Microsoft.JScript \
+       class/Mono.Posix \
+       class/System.Configuration.Install \
+       class/System.Runtime.Serialization.Formatters.Soap \
+       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)
+
+ifdef ONLY_CENTUM_TESTS
+TEST_SUBDIRS := $($(PROFILE)_centum_tests)
+endif
 
 ifdef TEST_SUBDIRS
 $(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
 endif
 
-OVERRIDE_TARGET_ALL = yes
-
 include build/rules.make
 
 all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
 
-# Used when OVERRIDE_TARGET_ALL is defined
-all.override:
-ifndef NO_SIGN_ASSEMBLY
-       $(MAKE) NO_SIGN_ASSEMBLY=yes all.real
-endif
-       $(MAKE) all.real
-
 .PHONY: all-local $(STD_TARGETS:=-local)
 all-local $(STD_TARGETS:=-local):
        @:
@@ -34,18 +50,28 @@ all-local $(STD_TARGETS:=-local):
 PROFILES = default net_2_0
 
 .PHONY: all-profiles $(STD_TARGETS:=-profiles)
-all-profiles $(STD_TARGETS:=-profiles):
-       $(MAKE) $(PROFILES:%=profile-do--%--$(@:-profiles=))
+all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
+       @:
+
+profiles-do--%:
+       $(MAKE) $(PROFILES:%=profile-do--%--$*)
 
 # The % below looks like profile-name--target-name
 profile-do--%:
        $(MAKE) PROFILE=$(subst --, ,$*)
 
-# Ensure these don't run in parallel, for now.
-profile-do--net_2_0--run-test: profile-do--default--run-test
-
-profile-do--net_2_0--all: profile-do--net_2_0_bootstrap--all
-profile-do--net_2_0_bootstrap--all: profile-do--default--all
+# We don't want to run the tests in parallel.  We want behaviour like -k.
+profiles-do--run-test:
+       ret=:; $(foreach p,$(PROFILES), { $(MAKE) PROFILE=$(p) run-test || ret=false; }; ) $$ret
+
+# Orchestrate the bootstrap here.
+_boot_ = all clean install
+$(_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
@@ -74,7 +100,8 @@ DISTFILES = \
        MonoIcon.png            \
        README                  \
        ScalableMonoIcon.svg    \
-       winexe.in
+       winexe.in               \
+       nunit.key
 
 dist-local: dist-default