2004-09-14 Umadevi S (sumadevi@novell.com)

[mono.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d86ea5c6788ca450c1cc48f0796c98f108436a7d..da482b27e7b0d885dc889ab8d37ba2ce3c4bfd60 100644 (file)
--- 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
 
@@ -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
@@ -136,11 +142,14 @@ mcs-do-full-build:
 mcs-do-clean-profiles:
        cd $(mcs_topdir) && $(MAKE) clean-profiles
 
-mcs-do-run-test: tmpinst-dir
+mcs-do-run-test: tmpinst-dir $(tmpinst)/bin/mbas
        tmpinst=`cd $(tmpinst) && pwd` ; \
        PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
        cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
 
+mcs-do-compiler-tests:
+       cd $(mcs_topdir) && $(MAKE) test-compiler
+
 populate-runtime-subdir:
        test -n '$(populate_profiles)'
        @srcdir=`cd $(srcdir) && pwd`; tmpinst=`pwd`/$(tmpinst) ; \
@@ -151,7 +160,8 @@ 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
 
@@ -190,6 +200,12 @@ $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
        (t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
        chmod +x $@
 
+# 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/1.0 && $(LN_S) $$srcdir/data/net_1_1/machine.config machine.config