* Makefile: Added new make target 'consolidate-test-results'.
[mono.git] / Makefile.am
index 46ebdc7a791d7754ad96b037fbfbb2fa87d5f24a..e3be0d94cf6fbfbbe7d2b9643179bed6e0a64dee 100644 (file)
@@ -1,7 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
+SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs data runtime scripts man samples support web 
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
@@ -9,6 +9,11 @@ DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 
+# Distribute the 'mcs' tree too
+dist-hook:
+       test -d $(distdir)/mcs || mkdir $(distdir)/mcs
+       d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
+
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
 pkgconfig_DATA= mono.pc mint.pc
@@ -17,149 +22,82 @@ pkgconfig_DATA= mint.pc
 endif
 DISTCLEANFILES= mono.pc mint.pc
 
-#
-# The following targets are used to compile and install
-# mono and mcs without running into the out-of-sync
-# problems by doing the compilation in the right order.
-#
-
-mcs_topdir=$(top_srcdir)/../mcs
-
-.PHONY: bootstrap faststrap fasterstrap bootstrap-clean bootstrap-check get-monolite-latest monolite-bootstrap
-.PHONY: tmpinst-dir tmpinst-mcs-basic-build tmpinst-mcs-short-build tmpinst-mcs-full-build tmpinst-monolite
-.PHONY: mono-do-runtime-only mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test
-.PHONY: populate-runtime-subdir
-
 if USE_JIT
 mono_runtime = mono/mini/mono
 else
 mono_runtime = mono/interpreter/mint
 endif
 
-# Minimal set of directories to build, and files used to run the 'mcs' compiler
-MCS_BASIC_DIRS = jay mcs class/corlib class/System
-MCS_BASIC_FILES = \
-       $(mcs_topdir)/mcs/mcs.exe \
-       $(mcs_topdir)/class/lib/default/mscorlib.dll \
-       $(mcs_topdir)/class/lib/default/System.dll
+all-local: mcs-do-full-build
+       $(MAKE) populate-runtime-subdir
 
-# Set of directories and files the 'mcs' compiler can use
-## We build class/System twice to resolve the cyclic dependency of class/System.XML
-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.CompilerServices.SymbolWriter.dll
+.PHONY: get-monolite-latest tmpinst-dir mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test populate-runtime-subdir
 
-tmpinst = _tmpinst
+tmpinst = runtime/_tmpinst
 
 if PLATFORM_WIN32
 
 populate_profiles = default:net_1_1
 
-# bootstraps using the .NET C# compiler
-bootstrap: tmpinst-dir mono-do-runtime-only
-       $(MAKE) fasterstrap
-
 else
 
 populate_profiles = default:net_1_1 net_2_0:net_2_0
 
-bootstrap: tmpinst-mcs-basic-build mono-do-runtime-only
-       $(MAKE) tmpinst-mcs-short-build
-       $(MAKE) fasterstrap
-
 endif
 
-faststrap: tmpinst-mcs-short-build
-       $(MAKE) mono-do-runtime-only
-       $(MAKE) fasterstrap
+clean-local:
+       cd $(mcs_topdir) && $(MAKE) PROFILES="basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0" clean-profiles
+       -rm -fr $(tmpinst)
 
-fasterstrap: tmpinst-mcs-full-build
-       $(MAKE) populate-runtime-subdir
-       $(MAKE)
+check-local: mcs-do-run-test-profiles mono-do-testjit
 
-bootstrap-clean: clean mcs-do-clean-profiles
-bootstrap-check: check mcs-do-run-test
+mono-do-testjit:
+       cd mono/tests && $(MAKE) test
 
 # building with monolite
 
-get-monolite-latest:
+monolitedir = $(mcs_topdir)/class/lib/basic
+get-monolite-latest: tmpinst-dir
        wget -O $(srcdir)/../monolite-latest.tar.gz http://www.go-mono.com/daily/monolite-latest.tar.gz
-
-monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
-       rm -f $(MCS_FILES)
-       $(MAKE) tmpinst-mcs-short-build
-       $(MAKE) fasterstrap
-
-# internal targets
-
-tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir
-       mv -f $(MCS_BASIC_FILES) $(tmpinst)/lib
-
-tmpinst-mcs-short-build: mcs-do-short-build tmpinst-dir
-       mv -f $(MCS_FILES) $(tmpinst)/lib
-
-tmpinst-mcs-full-build: mcs-do-full-build tmpinst-dir
-       cp -f $(MCS_FILES) $(tmpinst)/lib
-
-tmpinst-monolite: tmpinst-dir
-       -rm -f $(tmpinst)/lib/mcs.exe $(tmpinst)/lib/*.dll
+       -rm -f $(monolitedir)/mcs.exe $(monolitedir)/*.dll
        -rm -fr $(tmpinst)/monolite-*
        srcdir=`cd $(srcdir) && pwd` && cd $(tmpinst) && ( gzip -d -c $$srcdir/../monolite-latest.tar.gz | tar xf - )
-       mv -f $(tmpinst)/monolite-*/mcs.exe $(tmpinst)/monolite-*/*.dll $(tmpinst)/lib
+       mv -f $(tmpinst)/monolite-*/mcs.exe $(tmpinst)/monolite-*/*.dll $(monolitedir)
        rm -fr $(tmpinst)/monolite-*
 
-# Build enough of 'mono' to run the stage1 mcs.exe
-mono-do-runtime-only: $(CONFIG_HEADER)
-       for dir in $(libgc_dir) mono data; do \
-         (cd $$dir && $(MAKE)) || exit 1 ; \
-       done
-
-mcs-do-basic-build:
-       rm -f $(MCS_FILES)
-       for dir in $(MCS_BASIC_DIRS); do \
-         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
-       done
-
-mcs-do-short-build:
-       tmpinst=`cd $(tmpinst) && pwd` ; \
-       PATH=$$tmpinst/bin:$$PATH; export PATH ; \
-       for dir in $(MCS_DIRS); do \
-         (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes) || exit 1 ; \
-       done
+compiler-tests:
+       $(MAKE) mcs-do-clean-profiles
+       $(MAKE)
+       $(MAKE) mcs-do-compiler-tests
 
-mcs-do-full-build:
-       tmpinst=`cd $(tmpinst) && pwd` ; \
-       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-       cd $(mcs_topdir) && $(MAKE) all-profiles
+bootstrap-world: compiler-tests
+       $(MAKE) install
 
-mcs-do-clean-profiles:
-       cd $(mcs_topdir) && $(MAKE) clean-profiles
+# internal targets
 
-mcs-do-run-test: tmpinst-dir $(tmpinst)/bin/mbas
+mcs-do-full-build: tmpinst-dir
        tmpinst=`cd $(tmpinst) && pwd` ; \
-       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-       cd $(mcs_topdir) && $(MAKE) PROFILE=default run-test
+       cd $(mcs_topdir) && $(MAKE) RUNTIME=$$tmpinst/bin/mono all-profiles
 
 populate-runtime-subdir:
        test -n '$(populate_profiles)'
        @srcdir=`cd $(srcdir) && pwd`; tmpinst=`pwd`/$(tmpinst) ; \
-       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
        for profile in $(populate_profiles); do \
          ( set fnord `echo $$profile | sed 's,:, ,g'` && \
-           echo "cd $(mcs_topdir) && $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install" && \
+           echo "cd $(mcs_topdir) && $(MAKE) RUNTIME=$$tmpinst/bin/mono PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install" && \
            cd $(mcs_topdir) && \
-           $(MAKE) PROGRAM_INSTALL_DIR=$$srcdir/runtime PROFILE=$$2 LIBRARY_INSTALL_DIR=$$srcdir/runtime/$$3 prefix=$$tmpinst/prefix install ) || exit 1 ; \
+           $(MAKE) RUNTIME=$$tmpinst/bin/mono 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/1.0
+       mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/etc/mono/1.0 $(tmpinst)/etc/mono/2.0
        $(MAKE) tmpinst-dir-contents
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/etc/mono/1.0/machine.config $(tmpinst)/etc/mono/2.0/machine.config
 
 if PLATFORM_WIN32
 
@@ -167,9 +105,8 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
        echo '#! /bin/sh' > $@
        echo 'builddir="'`pwd`'"; win_builddir="'`cygpath -w -a .`'"' >> $@
        echo 'tmpinst="$$win_builddir\\$(tmpinst)"' >> $@
-       echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="$$tmpinst\\lib"; else MONO_PATH="$${MONO_PATH};$$tmpinst\\lib" ; fi' >> $@
        echo 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@
-       echo 'export MONO_PATH MONO_CFG_DIR' >> $@
+       echo 'export MONO_CFG_DIR' >> $@
        echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime).exe" "$$@"' >> $@
        chmod +x $@
 
@@ -178,34 +115,41 @@ else
 $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
        echo '#! /bin/sh' > $@
        echo 'builddir="'`pwd`'"; tmpinst=$$builddir/$(tmpinst)' >> $@
-       echo 'if test -z "$$MONO_PATH" ; then MONO_PATH=$$tmpinst/lib; else MONO_PATH=$${MONO_PATH}:$$tmpinst/lib ; fi' >> $@
        echo 'MONO_CFG_DIR=$$tmpinst/etc' >> $@
-       echo 'export MONO_PATH MONO_CFG_DIR' >> $@
+       echo 'export MONO_CFG_DIR' >> $@
        echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime)" --config "$$builddir/data/config" "$$@"' >> $@
        chmod +x $@
 
 endif
 
-$(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
-       (t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
+$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
+       (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
        chmod +x $@
 
-# Used only by 'bootstrap-check' -- so, can safely use runtime/mbas.exe.
-$(tmpinst)/bin/mbas: $(srcdir)/Makefile.am
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
+mcs-do-run-test-profiles: tmpinst-dir
+       $(MAKE) $(TEST_SUPPORT_FILES)
+       tmpinst=`cd $(tmpinst) && pwd` ; ret=: ; \
+       PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
+       ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$tmpinst/bin/mono run-test-profiles ) || ret=false ; \
+       rm -f $(TEST_SUPPORT_FILES) ; $$ret
+
+mcs-do-compiler-tests:
+       $(MAKE) TEST_SUBDIRS="tests errors" mcs-do-run-test-profiles
+
+# Used only by 'check-local' -- so, can safely use runtime/.
+$(TEST_SUPPORT_FILES): $(srcdir)/Makefile.am
        t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \
-       ( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/mbas.exe"'" "$$@"' ) > $@
+       ( echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$r/$(@F).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
 
-# Obsolete target -- don't use.
-.PHONY: fullbuild
-fullbuild: bootstrap
-       $(MAKE) install
-       echo "*** 'fullbuild' is an obsolete target. Use 'make bootstrap && make install'."
-       exit 1
+$(tmpinst)/etc/mono/2.0/machine.config: $(srcdir)/data/net_2_0/machine.config
+       rm -f $@
+       srcdir=`cd $(srcdir) && pwd`; cd $(tmpinst)/etc/mono/2.0 && $(LN_S) $$srcdir/data/net_2_0/machine.config machine.config
 
 win32getdeps:
        wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
@@ -225,3 +169,7 @@ win32getdeps:
 
 win32setup:
        makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
+
+bootstrap: all
+       echo "*** 'make bootstrap' is obsolete.  Just run 'make' to perform a combined mono+mcs build"
+       exit 1