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

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 4d2aff61eb5..ca2624f99d7 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -2,63 +2,148 @@
 # being compiled on windows.
 #
 
-SUBDIRS = . net_1_1 net_2_0
+# hack to prevent 'check' from depending on 'all'
+AUTOMAKE_OPTIONS = cygnus
 
-mcs_topdir=$(top_srcdir)/../mcs
+tmpinst = _tmpinst
 
-monobins_DATA = mcs.exe mbas.exe monoresgen.exe secutil.exe ilasm.exe cilc.exe xsd.exe wsdl.exe genxs.exe al.exe disco.exe sqlsharp.exe signcode.exe chktrust.exe soapsuds.exe monop.exe setreg.exe cert2spc.exe certmgr.exe MakeCert.exe gacutil.exe gmcs.exe
+noinst_SCRIPTS = mono-wrapper
 
-EXTRA_DIST = $(monobins_DATA)
+symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config
+
+etc/mono/1.0/machine.config: $(top_srcdir)/data/net_1_1/machine.config
+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: $(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
+else
+build_profiles = default
+endif
+
+# override automake
+install: install-exec install-data
+
+# override automake
+install-exec: $(SUPPORT_FILES)
+	d=`pwd`; \
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
+				    RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
+
+# override automake
+install-data:
+	@:
+
+# override automake
+uninstall:
+	d=`pwd`; \
+	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='$(build_profiles)' clean-profiles
+	-rm -fr $(symlinks) $(tmpinst) .wapi
+
+if INSTALL_2_0
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
+else
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm
+endif
+
+# now a misnomer, but it'll go away soon enough.
+if ENABLE_NUNIT_TESTS
+test_select =
+else
+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: test-support-files
+	d=`pwd`; PATH=$$d/$(tmpinst)/bin:$$PATH ; export PATH ; \
+	( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \
+	rm -fr $(tmpinst); $$ret
 
-#
-# Keep in sync with mono/mono/metadata/Makefile.am
-#
-assembliesdir = $(libdir)
 if PLATFORM_WIN32
-monobinsdir = $(libdir)
+cur_dir_cmd = cygpath -w -a .
+PLATFORM_PATH_SEPARATOR = ;
 else
-monobinsdir = $(bindir)
+cur_dir_cmd = pwd
+PLATFORM_PATH_SEPARATOR = :
 endif
 
-$(monobins_DATA):
-	@case "$@" in \
-	mcs.exe)                 d=mcs                          ;; \
-	mbas.exe)                d=mbas                         ;; \
-	monoresgen.exe)          d=monoresgen                   ;; \
-	ilasm.exe)               d=ilasm                        ;; \
-	cilc.exe)                d=tools/cilc                   ;; \
-	xsd.exe)                 d=tools/mono-xsd               ;; \
-	wsdl.exe)                d=tools/wsdl                   ;; \
-	genxs.exe)               d=tools/genxs                  ;; \
-	al.exe)                  d=tools/al                     ;; \
-	disco.exe)               d=tools/disco                  ;; \
-	soapsuds.exe)            d=tools/soapsuds               ;; \
-	sqlsharp.exe)            d=tools/SqlSharp               ;; \
-	chktrust.exe)            d=tools/security               ;; \
-	signcode.exe)            d=tools/security               ;; \
-	MakeCert.exe)            d=tools/security               ;; \
-	cert2spc.exe)            d=tools/security               ;; \
-	certmgr.exe)             d=tools/security               ;; \
-	secutil.exe)             d=tools/security               ;; \
-	setreg.exe)              d=tools/security               ;; \
-	sn.exe)                  d=tools/security               ;; \
-	monop.exe)               d=tools/monop                  ;; \
-	browsercaps-updater.exe) d=tools/browsercaps-updater    ;; \
-	gacutil.exe)		 d=tools/gacutil		;; \
-	gmcs.exe)                d=gmcs				;; \
-	esac; \
-	f=$(mcs_topdir)/$$d/$@; \
-	if test -f $$f; then :; else f=$(monobinsdir)/$@; fi ; \
-	echo "cp -f $$f $(srcdir)"; \
-	cp -f $$f $(srcdir)
-
-dist-hook:
-	for i in $(monobins_DATA) $(assemblies_DATA); do        \
-		if test ! -s $(srcdir)/$$i; then echo $$i is empty && exit 1; fi	\
-	done
-
-copy_dlls:
-	cp /nt/mono/mcs/class/*/*.dll .
-
-push_dlls:
-	scp -o "Protocol 1" *.dll *.exe snapshot@mono-cvs.ximian.com:dlls
+# 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
+
+CLEANFILES = wrapper-config
+
+wrapper-config: ../data/config Makefile
+	d=`cd ../support && pwd`; \
+	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 wrapper-config
+	cp mono-wrapper $@
+
+$(tmpinst)/bin/mcs:
+	$(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe
+
+$(tmpinst)/bin/mbas:
+	$(MAKE) test-support-file target=$@ file=mbas/mbas.exe
+
+$(tmpinst)/bin/gmcs:
+	$(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe
+
+$(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)
+	chmod +x $(target)
+
+$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
+	$(mkdir_p) $(@D)
+	(b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
+	chmod +x $@
+
+# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
+MYDISTFILES = Makefile.am Makefile.in mono-wrapper.in
+distdir: $(MYDISTFILES)
+	rm -fr $(distdir)
+	mkdir $(distdir)
+	test -z '$(MYDISTFILES)' || for file in ''$(MYDISTFILES); do \
+	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
+	  cp -p $$d/$$file $(distdir) ; done
+	find $(distdir) -type f -exec chmod a+r {} ';'