X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=779787b3ce32f3fbb8a33a0f8cbde478c31e5208;hb=efb5ca40eead93a593fd1ddb0fd035ed21774dfa;hp=38301be684625d5c2081ef0ad6e49855db6174f8;hpb=35d06b6dd712de83c2abfe1c2079519e27228fb4;p=mono.git diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 38301be6846..779787b3ce3 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -1,43 +1,46 @@ -# 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 -symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config +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)/$@ -# The write check is to foil 'make distcheck' -all-local: $(symlinks) mono-wrapper - 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 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 -clean_profiles = basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0 +endif 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) $(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: - 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) $(TEST_SUPPORT_FILES) + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles # override automake install-data: @@ -45,67 +48,96 @@ 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 -if INSTALL_2_0 -TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs -else -TEST_SUPPORT_FILES = $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm -endif +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 = TEST_SUBDIRS='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: - $(mkinstalldirs) $(tmpinst)/bin - $(MAKE) $(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 +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 -check-local: mcs-do-test-profiles +# 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 -$(tmpinst)/bin/mcs: - $(MAKE) test-support-file target=$@ file=class/lib/default/mcs.exe +CLEANFILES = etc/mono/config -$(tmpinst)/bin/mbas: - $(MAKE) test-support-file target=$@ file=mbas/mbas.exe +# 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,,& ,' $@t > $@tt; \ + mv -f $@tt $@t; fi + mv -f $@t $@ -$(tmpinst)/bin/gmcs: - $(MAKE) test-support-file target=$@ file=gmcs/gmcs.exe +$(tmpinst)/bin/mono: mono-wrapper etc/mono/config + $(mkinstalldirs) $(tmpinst)/bin + cp mono-wrapper $@ -$(tmpinst)/bin/ilasm: - $(MAKE) test-support-file target=$@ file=ilasm/ilasm.exe +$(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 $@ -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/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/pedump: $(srcdir)/Makefile.am - $(mkdir_p) $(@D) - (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" --mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@ +$(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 = 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 {} ';'