- Removed SetMenuBarWindow call. We do this in Form.cs

[mono.git] / mcs / Makefile

diff --git a/mcs/Makefile b/mcs/Makefile
index 6b76fee3f2937ad3b4ff76ad9916be7d81a6e6e2..cdc526c608c8c8e55121d5e487759b33c7cd310e 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -1,39 +1,63 @@
 thisdir := .
-SUBDIRS := build jay mcs class mbas nunit20 monoresgen ilasm tools tests errors docs gmcs
-OVERRIDE_BARE_TARGETS = hells yeah
-include build/rules.make
-
-# Define these ourselves to that the platform checks come first
 
-#all: platform-check profile-check all-recursive #all-local
+SUBDIRS := build jay mcs monoresgen class mbas nunit20 ilasm tools tests errors docs
+DIST_ONLY_SUBDIRS := gmcs
 
-all:
-       $(MAKE) PROFILE=default all-profile || exit 1; \
-       $(MAKE) PROFILE=net_2_0 all-profile || exit 1;
+bootstrap_dirs := class
+net_1_1_bootstrap_SUBDIRS := $(bootstrap_dirs)
+net_2_0_bootstrap_SUBDIRS := $(bootstrap_dirs)
+net_2_0_SUBDIRS := gmcs class tests errors tools
 
-all-profile: platform-check profile-check all-recursive
+ifdef TEST_SUBDIRS
+$(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
+endif
 
-install: platform-check profile-check install-recursive #install-local
+OVERRIDE_TARGET_ALL = yes
 
-uninstall: platform-check profile-check uninstall-recursive #uninstall-local
+include build/rules.make
 
-test: platform-check profile-check test-recursive #test-local
+all-recursive $(STD_TARGETS:=-recursive): platform-check profile-check
 
-run-test: run-test-recursive #run-test-local
+# Used when OVERRIDE_TARGET_ALL is defined
+all.override:
+ifndef NO_SIGN_ASSEMBLY
+       $(MAKE) NO_SIGN_ASSEMBLY=yes all.real
+endif
+       $(MAKE) all.real
 
-clean: clean-recursive #clean-local
+.PHONY: all-local $(STD_TARGETS:=-local)
+all-local $(STD_TARGETS:=-local):
+       @:
 
 # fun specialty targets
 
+PROFILES = default net_2_0
+
+.PHONY: all-profiles $(STD_TARGETS:=-profiles)
+all-profiles $(STD_TARGETS:=-profiles):
+       $(MAKE) $(PROFILES:%=profile-do--%--$(@:-profiles=))
+
+# 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
+
 testcorlib:
        @cd class/corlib && $(MAKE) test run-test
 
-# Disting. We need to override $(distdir) here.
+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)
-top_distdir = $(dots)/$(package)
-distdir = $(top_distdir)
-export package
 
 DISTFILES = \
        AUTHORS                 \
@@ -52,16 +76,16 @@ DISTFILES = \
        ScalableMonoIcon.svg    \
        winexe.in
 
+dist-local: dist-default
+
 dist-pre:
        rm -rf $(package)
+       mkdir $(package)
 
-dist-post:
+dist-tarball: dist-pre
+       $(MAKE) distdir='$(package)' dist-recursive
        tar cvzf $(package).tar.gz $(package)
 
-dist-local: dist-default
-
-dist-tarball: dist-pre dist-recursive dist-post
-
 dist: dist-tarball
        rm -rf $(package)
 
@@ -72,11 +96,10 @@ dist: dist-tarball
 # We need to set prefix on make so class/System/Makefile can find
 # the installed System.Xml to build properly
 
-distcheck:
+distcheck: dist-tarball
        rm -rf InstallTest Distcheck-MCS ; \
        mkdir InstallTest ; \
        destdir=`cd InstallTest && pwd` ; \
-       $(MAKE) dist-tarball || exit 1 ; \
        mv $(package) Distcheck-MCS ; \
        (cd Distcheck-MCS && \
            $(MAKE) prefix=$(prefix) && $(MAKE) test && $(MAKE) install DESTDIR="$$destdir" && \