X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=runtime%2FMakefile.am;h=8a2fd6550883dc4a3baf0bf6500fbd7812aacc4e;hb=0ad9d70d196902cbf923358666496d013b8aa787;hp=8dc57d641050f61b2dadd3a575209e03fa6311f5;hpb=a3c8762d6760a0857abd6b6708bbf9e2b442fdb2;p=mono.git diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 8dc57d64105..8a2fd655088 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -1,28 +1,21 @@ -# 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 monodis-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/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 $(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 ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' all-profiles +SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config if INSTALL_2_0 build_profiles = default net_2_0 @@ -30,14 +23,19 @@ else build_profiles = 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: $(SUPPORT_FILES) - d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ - RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles + cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles # override automake install-data: @@ -45,13 +43,15 @@ install-data: # override automake uninstall: - d=`pwd`; \ - cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \ - RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-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='$(build_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 @@ -67,12 +67,11 @@ test_select = ONLY_CENTUM_TESTS=yes endif mcs-do-test-profiles: - d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-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 ILDISASM=$$d/monodis-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 . @@ -83,33 +82,33 @@ 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) && $(cur_dir_cmd)`; ret=:; \ +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 \ + 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; \ + 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 -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 cp mono-wrapper $@ $(tmpinst)/bin/mcs: @@ -139,11 +138,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 monodis-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 {} ';'