X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=c38feb10ef19cce9ea702f89a20b2bdfc829f693;hb=967e5d058e079e5ca5a1db920bf31f6084f0df49;hp=59495553046cd08ab0d20b00fbad7c6e4d64ed5c;hpb=631b27e20094ab2ec458c3c2a91cba0726dbed1f;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 59495553046..c38feb10ef1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,8 +45,10 @@ 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
 
@@ -55,13 +57,11 @@ if PLATFORM_WIN32
 populate_profiles = default:net_1_1
 
 # bootstraps using the .NET C# compiler
-bootstrap: faststrap
+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
@@ -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
@@ -118,14 +124,14 @@ 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:
@@ -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) ; \
@@ -156,33 +165,25 @@ populate-runtime-subdir:
 	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/1.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)' >> $@
@@ -192,13 +193,21 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	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"'" "$$@"') > $@
 	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