X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=a0ea58ebe1a2d1aafe61cfc21be60d6b23cfca58;hb=90dad4d70b5c01ae230621cbab1770822923777d;hp=048b0cae5378fa06ef06118eb01827f63bd70018;hpb=fbe700235c5d1a4313edc5417b53804e79acc2a1;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 048b0cae537..a0ea58ebe1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,19 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_jni_dir) docs runtime scripts man data 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
-DIST_SUBDIRS = libgc mono ikvm-jni docs runtime scripts man data samples support web tools
+DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support web tools
 
 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
@@ -23,8 +28,6 @@ DISTCLEANFILES= mono.pc mint.pc
 # 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
@@ -45,23 +48,24 @@ MCS_BASIC_FILES = \
 
 # 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 $(MONO_CSHARP_DEBUGGER_DIR)
-MCS_FILES = $(MCS_BASIC_FILES) $(mcs_topdir)/class/lib/default/System.Xml.dll $(MONO_CSHARP_DEBUGGER_FILE)
+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
 
 tmpinst = _tmpinst
 
 if PLATFORM_WIN32
 
+populate_profiles = default:net_1_1
+
 # bootstraps using the .NET C# compiler
-bootstrap: tmpinst-dir
-	cd $(mcs_topdir) && $(MAKE) PROFILE=default all
-	$(MAKE) populate_profiles='default:net_1_1' populate-runtime-subdir
-	$(MAKE)
+bootstrap: tmpinst-dir mono-do-runtime-only
+	$(MAKE) fasterstrap
 
 else
 
-MONO_CSHARP_DEBUGGER_DIR = class/Mono.CSharp.Debugger
-MONO_CSHARP_DEBUGGER_FILE = $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
+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
@@ -74,11 +78,17 @@ faststrap: tmpinst-mcs-short-build
 	$(MAKE) fasterstrap
 
 fasterstrap: tmpinst-mcs-full-build
-	$(MAKE) populate_profiles='default:net_1_1 net_2_0:net_2_0' populate-runtime-subdir
+	$(MAKE) populate-runtime-subdir
 	$(MAKE)
 
 bootstrap-clean: clean mcs-do-clean-profiles
-bootstrap-check: check mcs-do-run-test
+
+bootstrap-check: check mcs-do-run-test-profiles #mono-do-testjit
+
+mono-do-testjit: $(tmpinst)/bin/ilasm
+	tmpinst=`cd $(tmpinst) && pwd` ; \
+	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
+	cd mono/tests && $(MAKE) test
 
 # building with monolite
 
@@ -90,6 +100,14 @@ monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
 	$(MAKE) tmpinst-mcs-short-build
 	$(MAKE) fasterstrap
 
+compiler-tests:
+	$(MAKE) mcs-do-clean-profiles
+	$(MAKE) bootstrap
+	$(MAKE) mcs-do-compiler-tests
+
+bootstrap-world: compiler-tests
+	$(MAKE) install
+
 # internal targets
 
 tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir
@@ -117,28 +135,33 @@ mono-do-runtime-only: $(CONFIG_HEADER)
 mcs-do-basic-build:
 	rm -f $(MCS_FILES)
 	for dir in $(MCS_BASIC_DIRS); do \
-	  (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default USE_BOOT_COMPILE=yes BOOTSTRAP_MCS="mcs -d:BOOTSTRAP_WITH_OLDLIB") || exit 1 ; \
+	  (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) || exit 1 ; \
+	  (cd $(mcs_topdir)/$$dir && $(MAKE) PROFILE=default NO_SIGN_ASSEMBLY=yes) || exit 1 ; \
 	done
 
 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)/bin/ilasm $(tmpinst)/bin/pedump
 	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:
+	tmpinst=`cd $(tmpinst) && pwd` ; \
+	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
+	cd $(mcs_topdir) && $(MAKE) compiler-tests
 
 populate-runtime-subdir:
 	test -n '$(populate_profiles)'
@@ -150,38 +173,31 @@ 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 $(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)/etc/mono/2.0/machine.config
+
 if PLATFORM_WIN32
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono.bat $(tmpinst)/etc/mono/machine.config
+$(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 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime).exe" "$$@"' >> $@
+	chmod +x $@
 
 else
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
-
-endif
-
-$(tmpinst)/bin/mono.bat: $(srcdir)/Makefile.am
-	echo '@echo off' > $@
-	echo 'set builddir="'"`pwd`"'"' >> $@
-	echo 'set win_builddir="'"`cygpath -w -a .`"'"' >> $@
-	echo 'set tmpinst="%win_builddir%\$(tmpinst)"' >> $@
-	echo 'if %MONO_PATH% == "" goto when_empty' >> $@
-	echo 'set MONO_PATH="%MONO_PATH%;%tmpinst%\lib"' >> $@
-	echo 'goto endif_empty' >> $@
-	echo ':when_empty' >> $@
-	echo 'set MONO_PATH=%tmpinst%\lib' >> $@
-	echo ':endif_empty' >> $@
-	echo 'set MONO_CFG_DIR=%tmpinst%\etc' >> $@
-	echo "`cygpath -w /bin/sh`" '"%builddir%/libtool" --mode=execute "%builddir%/$(mono_runtime)" --config "%win_builddir%\data\config" %*' >> $@
-
 $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	echo '#! /bin/sh' > $@
 	echo 'builddir="'`pwd`'"; tmpinst=$$builddir/$(tmpinst)' >> $@
@@ -191,13 +207,29 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime)" --config "$$builddir/data/config" "$$@"' >> $@
 	chmod +x $@
 
+endif
+
+$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
+	(b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
+	chmod +x $@
+
 $(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/.
+$(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm: $(srcdir)/Makefile.am
+	t=`cd $(tmpinst) && pwd`; r=`cd $(srcdir)/runtime && pwd`; \
+	( 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
+
+$(tmpinst)/etc/mono/2.0/machine.config: $(srcdir)/data/net_2_0/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/2.0 && $(LN_S) $$srcdir/data/net_2_0/machine.config machine.config
 
 # Obsolete target -- don't use.
 .PHONY: fullbuild