X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=ca2624f99d7b11be888ef0fcf64d626725e770fe;hb=e873f48a63541a66ae62f41e380393aedb7e1ea8;hp=2b8b798fa1b99e23a5690bdc366c77097482859e;hpb=0cdb20122904cbdb6ff059f18bc792bf5220fd8f;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 2b8b798fa1b..ca2624f99d7 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -17,26 +17,26 @@ etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 $(symlinks):
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
+SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config
+
 # The write check is to foil 'make distcheck'
-all-local: $(symlinks) mono-wrapper
+all-local: $(SUPPORT_FILES)
 	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
 	d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' all-profiles
 
 if INSTALL_2_0
 build_profiles = default net_2_0
-clean_profiles = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0
 else
 build_profiles = default
-clean_profiles = basic net_1_1_bootstrap default
 endif
 
 # override automake
 install: install-exec install-data
 
 # override automake
-install-exec:
+install-exec: $(SUPPORT_FILES)
 	d=`pwd`; \
-	cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
 				    RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
 
 # override automake
@@ -46,59 +46,71 @@ install-data:
 # override automake
 uninstall:
 	d=`pwd`; \
-	cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
 				    RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles
 
 clean-local:
-	d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(clean_profiles)' clean-profiles
+	d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
 	-rm -fr $(symlinks) $(tmpinst) .wapi
 
 if INSTALL_2_0
-TEST_SUPPORT_FILES = $(tmpinst)/config $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
 else
-TEST_SUPPORT_FILES = $(tmpinst)/config $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm
 endif
 
-# List of NUnit testcases that should be 100% pass
-centum_nunit_tests = \
-	class/Commons.Xml.Relaxng \
-	class/Cscompmgd \
-	class/Microsoft.JScript \
-	class/Mono.Posix \
-	class/Mono.Security \
-	class/System \
-	class/System.Configuration.Install \
-	class/System.Runtime.Remoting \
-	class/System.Runtime.Serialization.Formatters.Soap \
-	class/System.Web.Services
-
 # now a misnomer, but it'll go away soon enough.
 if ENABLE_NUNIT_TESTS
 test_select =
 else
-test_select = TEST_SUBDIRS='$(centum_nunit_tests) tests errors'
+test_select = ONLY_CENTUM_TESTS=yes
 endif
 
 mcs-do-test-profiles:
 	d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' test-profiles
 
-mcs-do-run-test-profiles:
-	$(mkinstalldirs) $(tmpinst)/bin
-	$(MAKE) $(TEST_SUPPORT_FILES)
+mcs-do-run-test-profiles: test-support-files
 	d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \
-	( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/$(tmpinst)/bin/mono PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \
-	rm -fr $(tmpinst) ; $$ret
+	( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \
+	rm -fr $(tmpinst); $$ret
+
+if PLATFORM_WIN32
+cur_dir_cmd = cygpath -w -a .
+PLATFORM_PATH_SEPARATOR = ;
+else
+cur_dir_cmd = pwd
+PLATFORM_PATH_SEPARATOR = :
+endif
 
-check-local: mcs-do-test-profiles
+# Use --compile-all as a poor man's PEVerify to detect invalid IL
+mcs-compileall: mono-wrapper wrapper-config
+	save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ret=:; \
+	for profile in $(build_profiles); do \
+	  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; export MONO_PATH; \
+	  for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; do \
+	    if ./mono-wrapper --compile-all $$i; then \
+	      echo $$i verified OK; \
+	    else \
+	      echo $$i verification failed; ret=false; \
+	    fi; done; done; \
+	$$ret
+
+check-local: mcs-compileall mcs-do-test-profiles
 	$(MAKE) $(test_select) mcs-do-run-test-profiles
 
-$(tmpinst)/config: ../data/config
+CLEANFILES = wrapper-config
+
+wrapper-config: ../data/config Makefile
 	d=`cd ../support && pwd`; \
-	sed 's,<configuration>,& <dllmap dll="MonoPosixHelper" target="'$$d/libMonoPosixHelper.la'" />,' ../data/config > $@
+	sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@
+	if test -z "$(libgdiplus_loc)"; then :; else \
+	  mv $@ $@t; \
+	  sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" />,' $@t > $@; \
+	  rm -f $@t; \
+	fi
 
-$(tmpinst)/bin/mono: mono-wrapper
-	sed 's,/data/config",/runtime/$(tmpinst)/config",' mono-wrapper > $@
-	chmod +x $@
+$(tmpinst)/bin/mono: mono-wrapper wrapper-config
+	cp mono-wrapper $@
 
 $(tmpinst)/bin/mcs:
 	$(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe
@@ -112,6 +124,10 @@ $(tmpinst)/bin/gmcs:
 $(tmpinst)/bin/ilasm:
 	$(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe
 
+test-support-files:
+	$(mkinstalldirs) $(tmpinst)/bin
+	$(MAKE) $(TEST_SUPPORT_FILES)
+
 test-support-file:
 	echo '#! /bin/sh' > $(target)
 	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/mono-wrapper"'" "'"$$m/$(file)"'" "$$@"' >> $(target)