X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=Makefile.am;h=a3d919a064ec926a6172e787e0754e27e70baf46;hb=e3610469592288bc8364822858be0bef7ebc5008;hp=8fd7775adf5419e82e8bc3213aa81afe3018ba12;hpb=db2f5c68b7d732eeb5c7427ed4b184cb4f6d0fb4;p=mono.git

diff --git a/Makefile.am b/Makefile.am
index 8fd7775adf5..a3d919a064e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -79,7 +79,13 @@ 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 #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
 
@@ -137,20 +143,20 @@ 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)/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-dir $(tmpinst)/bin/mbas
+mcs-do-compiler-tests:
 	tmpinst=`cd $(tmpinst) && pwd` ; \
 	PATH=$$tmpinst/bin:$$PATH ; export PATH ; \
-	cd $(mcs_topdir) && $(MAKE) test-compiler
+	cd $(mcs_topdir) && $(MAKE) compiler-tests
 
 populate-runtime-subdir:
 	test -n '$(populate_profiles)'
@@ -162,15 +168,16 @@ 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/1.0
+	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-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
 
@@ -197,20 +204,28 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 
 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 $@
 
-# Used only by 'bootstrap-check' -- so, can safely use runtime/mbas.exe.
-$(tmpinst)/bin/mbas: $(srcdir)/Makefile.am
+# 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/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
 
+$(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
+
 # Obsolete target -- don't use.
 .PHONY: fullbuild
 fullbuild: bootstrap