X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8e44d109161d63055e3d9a37798f9520f31d9d34;hb=9a75ce9b22cdb38846f7343790eb33f630dd5acd;hp=4a0d5a4c42eccbdb4d608c3d864870b2a95e594b;hpb=8feefe364c32b7a820a96ae237883e816c52ee84;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 4a0d5a4c42e..8e44d109161 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ MCS_BASIC_FILES = \
 MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System class/Mono.CSharp.Debugger
 MCS_FILES = $(MCS_BASIC_FILES) \
 	$(mcs_topdir)/class/lib/default/System.Xml.dll \
-	$(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
+	$(mcs_topdir)/class/lib/default/Mono.CompilerServices.SymbolWriter.dll
 
 tmpinst = _tmpinst
 
@@ -79,7 +79,7 @@ fasterstrap: tmpinst-mcs-full-build
 	$(MAKE)
 
 bootstrap-clean: clean mcs-do-clean-profiles
-bootstrap-check: check mcs-do-run-test
+bootstrap-check: check mcs-do-run-test-profiles
 
 # building with monolite
 
@@ -91,6 +91,12 @@ monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
 	$(MAKE) tmpinst-mcs-short-build
 	$(MAKE) fasterstrap
 
+bootstrap-world:
+	$(MAKE) bootstrap-clean
+	$(MAKE) bootstrap
+	$(MAKE) install
+	$(MAKE) mcs-do-compiler-tests
+
 # internal targets
 
 tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir
@@ -131,15 +137,18 @@ mcs-do-short-build:
 mcs-do-full-build:
 	tmpinst=`cd $(tmpinst) && pwd` ; \
 	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-	cd $(mcs_topdir) && $(MAKE) all-profiles
+	cd $(mcs_topdir) && $(MAKE) NO_SIGN_ASSEMBLY=yes all-profiles
 
 mcs-do-clean-profiles:
 	cd $(mcs_topdir) && $(MAKE) clean-profiles
 
-mcs-do-run-test: tmpinst-dir
+mcs-do-run-test-profiles: tmpinst-dir $(tmpinst)/bin/mbas
 	tmpinst=`cd $(tmpinst) && pwd` ; \
 	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-	cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
+	cd $(mcs_topdir) && $(MAKE) run-test-profiles
+
+mcs-do-compiler-tests:
+	cd $(mcs_topdir) && $(MAKE) compiler-tests
 
 populate-runtime-subdir:
 	test -n '$(populate_profiles)'
@@ -151,15 +160,16 @@ populate-runtime-subdir:
 	    cd $(mcs_topdir) && \
 	    $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install ) || exit 1 ; \
 	done
-	find $(tmpinst)/prefix -type f -path '*/jay*' -exec rm -f '{}' ';'
+	find $(tmpinst)/prefix -type f -name '*jay*' -exec rm -f '{}' ';'
+	for i in `find $(tmpinst)/prefix -type d -name '*jay*' -print`; do rm -f $$i/*; done
 	test -z "`find $(tmpinst)/prefix -type f -print`"
 	rm -rf $(tmpinst)/prefix
 
 tmpinst-dir: 
-	mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono
+	mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono/1.0
 	$(MAKE) tmpinst-dir-contents
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config
 
 if PLATFORM_WIN32
 
@@ -190,9 +200,15 @@ $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
 	(t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
 	chmod +x $@
 
-$(tmpinst)/etc/mono/machine.config: $(srcdir)/data/machine.config
+# Used only by 'bootstrap-check' -- so, can safely use runtime/mbas.exe.
+$(tmpinst)/bin/mbas: $(srcdir)/Makefile.am
+	t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \
+	( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/mbas.exe"'" "$$@"' ) > $@
+	chmod +x $@
+
+$(tmpinst)/etc/mono/1.0/machine.config: $(srcdir)/data/net_1_1/machine.config
 	rm -f $@
-	srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono && $(LN_S) $$srcdir/data/machine.config machine.config
+	srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config
 
 # Obsolete target -- don't use.
 .PHONY: fullbuild