X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=46ebdc7a791d7754ad96b037fbfbb2fa87d5f24a;hb=2653a50304b04b52ce863344bd01818079399107;hp=eaa4952f2ce93022fb74c0b1e4dd42027b8a290d;hpb=856016dd5745bcf1ab83f035756eb9a0101aac90;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index eaa4952f2ce..46ebdc7a791 100644
--- 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
 
@@ -118,14 +118,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,7 +136,7 @@ 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
@@ -156,10 +156,10 @@ 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/machine.config
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/1.0/machine.config
 
 if PLATFORM_WIN32
 
@@ -170,7 +170,7 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	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.exe" "$$@"' >> $@
+	echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime).exe" "$$@"' >> $@
 	chmod +x $@
 
 else
@@ -190,9 +190,15 @@ $(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