X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=0e876e2a49142f02bb0dba91a450a698c16ad7f2;hb=4a3ac25e762bdc7ed8756d9e3112ccfe2988ebda;hp=1b9881a2f08c33dc45b4de4f3a5533dba65f5df1;hpb=94ce5c5aaf912e55f106bbf3250612b02ac850b5;p=mono.git diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 1b9881a2f08..0e876e2a491 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -3,38 +3,45 @@ AUTOMAKE_OPTIONS = cygnus tmpinst = _tmpinst -noinst_SCRIPTS = mono-wrapper monodis-wrapper semdel-wrapper +noinst_SCRIPTS = mono-wrapper monodis-wrapper etctmp = etc -symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config +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/2.0/Browsers/Compat.browser 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 +etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/net_2_0/Browsers/Compat.browser $(symlinks): cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ -SUPPORT_FILES = $(symlinks) mono-wrapper wrapper-config +SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config if INSTALL_2_0 -build_profiles = default net_2_0 +if INSTALL_2_1 +build_profiles = net_1_1 net_2_0 net_3_5 net_2_1 else -build_profiles = default +build_profiles = net_1_1 net_2_0 net_3_5 +endif +else +build_profiles = net_1_1 endif if BUILD_MCS # The write check is to foil 'make distcheck' -all-local: $(SUPPORT_FILES) +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 + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles # override automake install: install-exec install-data # override automake -install-exec: $(SUPPORT_FILES) - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles +install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES) + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles # override automake install-data: @@ -42,21 +49,17 @@ install-data: # override automake uninstall: - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 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' :-) +## mono --wapi=semdel 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 + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles + -./mono-wrapper --wapi=semdel -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 -else -TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/bin/mbas $(tmpinst)/bin/ilasm -endif +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 @@ -66,27 +69,44 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' test-profiles + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' test-profiles mcs-do-run-test-profiles: test-support-files - d=`cd $(tmpinst) && pwd`; PATH=$$d/bin:$$PATH ; export PATH ; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' run-test-profiles + cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' run-test-profiles if PLATFORM_WIN32 +if CROSS_COMPILING +cur_dir_cmd = pwd +PLATFORM_PATH_SEPARATOR = : +else cur_dir_cmd = cygpath -w -a . PLATFORM_PATH_SEPARATOR = ; +endif 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 +# Compile all assemblies with the verifier turned on. Code must be valid but not verifiable. +# TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode. +# Skip net 2.1 assemblies for now because of visibility problems +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 $(mcs_topdir)/class/Microsoft.VisualBasic/fixup/$$profile/*.dll; do \ - if ./mono-wrapper --compile-all $$i; then \ + if [ "net_2_1" = "$$profile" ]; then \ + break; \ + fi; \ + if [ "net_3_5" = "$$profile" ]; then \ + MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \ + else \ + MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \ + fi; \ + export MONO_PATH; \ + for i in $(mcs_topdir)/class/lib/$$profile/*.{dll,exe}; do \ + if [ ! -f $$i ] ; then \ + continue ; \ + fi ; \ + if ./mono-wrapper --compile-all --security=validil --verify-all $$i; then \ echo $$i verified OK; \ else \ echo $$i verification failed; ok=false; \ @@ -96,46 +116,42 @@ mcs-compileall: mono-wrapper wrapper-config check-local: mcs-compileall mcs-do-test-profiles $(MAKE) $(test_select) mcs-do-run-test-profiles -CLEANFILES = wrapper-config +CLEANFILES = etc/mono/config -wrapper-config: ../data/config Makefile +# 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 > $@ + sed 's,target="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t if test -z "$(libgdiplus_loc)"; then :; else \ - mv $@ $@t; \ - sed 's,,& ,' $@t > $@; \ - rm -f $@t; \ - fi + sed 's,,& ,' $@t > $@tt; \ + mv -f $@tt $@t; fi + mv -f $@t $@ -$(tmpinst)/bin/mono: mono-wrapper wrapper-config +$(tmpinst)/bin/mono: mono-wrapper etc/mono/config + $(mkinstalldirs) $(tmpinst)/bin 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) +$(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/net_1_1/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 = $(DIST_COMMON) distdir: $(MYDISTFILES)