X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=8e44d109161d63055e3d9a37798f9520f31d9d34;hb=61cce9e3d8f40081a6522abb21dec65a2009ae28;hp=46ebdc7a791d7754ad96b037fbfbb2fa87d5f24a;hpb=1fc13eeeeaf4469fe116fd084f335697096a38aa;p=mono.git diff --git a/Makefile.am b/Makefile.am index 46ebdc7a791..8e44d109161 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 $(tmpinst)/bin/mbas +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,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