X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=1b9881a2f08c33dc45b4de4f3a5533dba65f5df1;hb=b3e660af62c1ec9f73bfc0b83ab82d037e998f0b;hp=cf5b1dbfa532b31a695ca9e6b828f4c335602431;hpb=32ef09ab6008c900267c58e13e5440b982b8c00b;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index cf5b1dbfa53..1b9881a2f08 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -1,14 +1,11 @@
-# This is just used to copy and install the DLL files that are currently
-# being compiled on windows.
-#
-
 # hack to prevent 'check' from depending on 'all'
 AUTOMAKE_OPTIONS = cygnus
 
 tmpinst = _tmpinst
 
-noinst_SCRIPTS = mono-wrapper
+noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper
 
+etctmp = etc
 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
@@ -17,27 +14,27 @@ etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
 $(symlinks):
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
-# The write check is to foil 'make distcheck'
-all-local: $(symlinks) mono-wrapper wrapper-config
-	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
+SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config
 
 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
 
+if BUILD_MCS
+
+# 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
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
+
 # override automake
 install: install-exec install-data
 
 # override automake
-install-exec:
-	d=`pwd`; \
-	cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \
-				    RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
+install-exec: $(SUPPORT_FILES)
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
 
 # override automake
 install-data:
@@ -45,13 +42,15 @@ install-data:
 
 # override automake
 uninstall:
-	d=`pwd`; \
-	cd $(mcs_topdir) && $(MAKE) prefix='$(exec_prefix)' PROFILES='$(build_profiles)' \
-				    RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
 
+## semdel-wrapper will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
 clean-local:
-	d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(clean_profiles)' clean-profiles
-	-rm -fr $(symlinks) $(tmpinst) .wapi
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
+	-./semdel-wrapper
+	-rm -fr $(etctmp) $(tmpinst) .wapi
+
+endif BUILD_MCS
 
 if INSTALL_2_0
 TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
@@ -59,53 +58,54 @@ else
 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
+	cd $(mcs_topdir) && $(MAKE) 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
+	d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles
+
+if PLATFORM_WIN32
+cur_dir_cmd = cygpath -w -a .
+PLATFORM_PATH_SEPARATOR = ;
+else
+cur_dir_cmd = pwd
+PLATFORM_PATH_SEPARATOR = :
+endif
 
 # 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) && pwd`; ret=:; \
+	save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
 	for profile in $(build_profiles); do \
-	  MONO_PATH="$$mcs_topdir/class/lib/$$profile:$$save_MONO_PATH"; export MONO_PATH; \
-	  for i in $(mcs_topdir)/class/lib/$$profile/*.dll $(mcs_topdir)/class/lib/$$profile/*.exe; 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 $(mcs_topdir)/class/Microsoft.VisualBasic/fixup/$$profile/*.dll; do \
 	    if ./mono-wrapper --compile-all $$i; then \
 	      echo $$i verified OK; \
 	    else \
-	      echo $$i verification failed; ret=false; \
+	      echo $$i verification failed; ok=false; \
 	    fi; done; done; \
-	$$ret
+	$$ok
 
 check-local: mcs-compileall mcs-do-test-profiles
 	$(MAKE) $(test_select) mcs-do-run-test-profiles
 
-wrapper-config: ../data/config
+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 $@
@@ -137,11 +137,10 @@ $(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
 	chmod +x $@
 
 # the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
-MYDISTFILES = Makefile.am Makefile.in mono-wrapper.in
+MYDISTFILES = $(DIST_COMMON)
 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
+	  cp -p $$file $(distdir) ; done
 	find $(distdir) -type f -exec chmod a+r {} ';'