X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=779787b3ce32f3fbb8a33a0f8cbde478c31e5208;hb=efb5ca40eead93a593fd1ddb0fd035ed21774dfa;hp=a979435d303720b4e8226d1bd17be293776683b8;hpb=c5724630b2176a90ebc632a49cb24b19fb7b60c8;p=mono.git

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index a979435d303..779787b3ce3 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -1,99 +1,143 @@
-# This is just used to copy and install the DLL files that are currently
-# being compiled on windows.
-#
-
-assemblies_DATA =	\
-	Accessibility.dll					\
-	ByteFX.Data.dll						\
-	Commons.Xml.Relaxng.dll					\
-	mscorlib.dll						\
-	Cscompmgd.dll						\
-	I18N.CJK.dll						\
-	I18N.dll						\
-	I18N.MidEast.dll					\
-	I18N.Other.dll						\
-	I18N.Rare.dll						\
-	I18N.West.dll						\
-	ICSharpCode.SharpZipLib.dll				\
-	Microsoft.VisualBasic.dll				\
-	Microsoft.VisualC.dll					\
-	Microsoft.Vsa.dll					\
-	Mono.Cairo.dll	                		\
-	Mono.CSharp.Debugger.dll				\
-	Mono.Data.DB2Client.dll					\
-	Mono.Data.MySql.dll					\
-	Mono.Data.PostgreSqlClient.dll				\
-	Mono.Data.SqliteClient.dll				\
-	Mono.Data.SybaseClient.dll				\
-	Mono.Data.TdsClient.dll					\
-	Mono.Data.Tds.dll					\
-	Mono.Directory.LDAP.dll					\
-	Mono.GetOptions.dll					\
-	Mono.Http.dll						\
-	Mono.PEToolkit.dll					\
-	Mono.Posix.dll						\
-	Mono.Security.dll					\
-	Mono.Security.Win32.dll					\
-	Npgsql.dll						\
-	NUnit.Util.dll						\
-	NUnit.Framework.dll					\
-	PEAPI.dll						\
-	System.Configuration.Install.dll			\
-	System.Data.dll						\
-	System.Data.OracleClient.dll				\
-	System.dll						\
-	System.Design.dll					\
-	System.DirectoryServices.dll				\
-	System.Drawing.Design.dll				\
-	System.Drawing.dll					\
-	System.EnterpriseServices.dll				\
-	System.Management.dll					\
-	System.Messaging.dll					\
-	System.Runtime.Remoting.dll				\
-	System.Runtime.Serialization.Formatters.Soap.dll	\
-	System.Security.dll					\
-	System.ServiceProcess.dll				\
-	System.Web.dll						\
-	System.Web.Services.dll					\
-	System.Windows.Forms.dll				\
-	System.Xml.dll						\
-	libgdiplus.dll.so
-
-monobins_DATA = mcs.exe mbas.exe monoresgen.exe secutil.exe ilasm.exe cilc.exe xsd.exe wsdl.exe genxs.exe disco.exe sqlsharp.exe signcode.exe chktrust.exe
-
-EXTRA_DIST = $(monobins_DATA) $(assemblies_DATA)
-
-#
-# Keep in sync with mono/mono/metadata/Makefile.am
-#
-assembliesdir = $(libdir)
-monobinsdir = $(bindir)
-
-$(assemblies_DATA):
-	-cp $(top_srcdir)/../mcs/class/lib/$@ . || cp $(assembliesdir)/$@ . 
-
-$(monobins_DATA):
-	-cp $(top_srcdir)/../mcs/mcs/mcs.exe . || cp $(monobinsdir)/mcs.exe . 
-	-cp $(top_srcdir)/../mcs/mbas/mbas.exe . || cp $(monobinsdir)/mbas.exe .
-	-cp $(top_srcdir)/../mcs/tools/security/secutil.exe . || cp $(monobinsdir)/secutil.exe . 
-	-cp $(top_srcdir)/../mcs/monoresgen/monoresgen.exe . || cp $(monobinsdir)/monoresgen.exe . 
-	-cp $(top_srcdir)/../mcs/ilasm/ilasm.exe . || cp $(monobinsdir)/ilasm.exe .
-	-cp $(top_srcdir)/../mcs/tools/cilc/cilc.exe . || cp $(monobinsdir)/cilc.exe .
-	-cp $(top_srcdir)/../mcs/tools/mono-xsd/xsd.exe . || cp $(monobinsdir)/xsd.exe .
-	-cp $(top_srcdir)/../mcs/tools/wsdl/wsdl.exe . || cp $(monobinsdir)/wsdl.exe .
-	-cp $(top_srcdir)/../mcs/tools/genxs/genxs.exe . || cp $(monobinsdir)/genxs.exe .
-	-cp $(top_srcdir)/../mcs/tools/disco/disco.exe . || cp $(monobinsdir)/disco.exe .
-	-cp $(top_srcdir)/../mcs/tools/SqlSharp/sqlsharp.exe . || cp $(monobinsdir)/sqlsharp.exe .
-	-cp $(top_srcdir)/../mcs/tools/security/chktrust.exe . || cp $(monobinsdir)/chktrust.exe .
-	-cp $(top_srcdir)/../mcs/tools/security/signcode.exe . || cp $(monobinsdir)/signcode.exe .
-        
-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
+# hack to prevent 'check' from depending on 'all'
+AUTOMAKE_OPTIONS = cygnus
+
+tmpinst = _tmpinst
+
+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/2.0/web.config etc/mono/browscap.ini
+
+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
+etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
+etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
+
+$(symlinks):
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
+
+if INSTALL_2_0
+if INSTALL_2_1
+build_profiles = default net_2_0 net_2_1
+else
+build_profiles = default net_2_0
+endif
+else
+build_profiles = default
+endif
+
+if BUILD_MCS
+
+# The write check is to foil 'make distcheck'
+all-local: $(SUPPORT_FILES) $(TEST_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: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
+
+# override automake
+install-data:
+	@:
+
+# override automake
+uninstall:
+	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:
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
+	-./semdel-wrapper
+	-rm -fr $(etctmp) $(tmpinst) .wapi
+
+endif BUILD_MCS
+
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs
+
+# 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:
+	cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles
+
+mcs-do-run-test-profiles: test-support-files
+	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 etc/mono/config
+	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$(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; ok=false; \
+	    fi; done; done; \
+	$$ok
+
+check-local: mcs-compileall mcs-do-test-profiles
+	$(MAKE) $(test_select) mcs-do-run-test-profiles
+
+CLEANFILES = etc/mono/config
+
+# depend on $(symlinks) to ensure 'etc/mono' directory exists
+etc/mono/config: ../data/config Makefile $(symlinks)
+	d=`cd ../support && pwd`; \
+	sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t
+	if test -z "$(libgdiplus_loc)"; then :; else \
+	  sed 's,<configuration>,& <dllmap dll="gdiplus.dll" target="$(libgdiplus_loc)" />,' $@t > $@tt; \
+	  mv -f $@tt $@t; fi
+	mv -f $@t $@
+
+$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
+	$(mkinstalldirs) $(tmpinst)/bin
+	cp mono-wrapper $@
+
+$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/default/mcs.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+$(tmpinst)/bin/gmcs: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/gmcs.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+test-support-files: $(TEST_SUPPORT_FILES)
+	@:
+
+# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
+MYDISTFILES = $(DIST_COMMON)
+distdir: $(MYDISTFILES)
+	rm -fr $(distdir)
+	mkdir $(distdir)
+	test -z '$(MYDISTFILES)' || for file in ''$(MYDISTFILES); do \
+	  cp -p $$file $(distdir) ; done
+	find $(distdir) -type f -exec chmod a+r {} ';'