Author: raja
Date: 2007-03-28 06:55:46 -0500 (Wed, 28 Mar 2007)
New Revision: 75067

Modified:
   trunk/mono/ChangeLog
   trunk/mono/mono/tests/ChangeLog
   trunk/mono/mono/tests/Makefile.am
   trunk/mono/runtime/Makefile.am
   trunk/mono/runtime/mono-wrapper.in
Log:
In .:
        * runtime/mono-wrapper.in (PATH): Include _tmpinst/bin.  Ensure
        that library invocations of 'mcs' and 'gmcs' pick the in-tree versions.
        * runtime/Makefile.am (mcs-do-run-test-profiles): Don't set PATH.
        (all-local, install-local): Depend on TEST_SUPPORT_FILES too.
        (test-support-files): Move creation of _tmpinst/bin directory ...
        (test-support-file, $(tmpinst)/bin/mono): ... here.
        ($(tmpinst)/bin/mbas, $(tmpinst)/bin/pedump): Remove.

In mono/tests:
        * Makefile.am (test-bug-80307): Don't set PATH.


Modified: trunk/mono/ChangeLog
===================================================================
--- trunk/mono/ChangeLog        2007-03-28 11:42:49 UTC (rev 75066)
+++ trunk/mono/ChangeLog        2007-03-28 11:55:46 UTC (rev 75067)
@@ -1,3 +1,13 @@
+2007-03-28  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * runtime/mono-wrapper.in (PATH): Include _tmpinst/bin.  Ensure
+       that library invocations of 'mcs' and 'gmcs' pick the in-tree versions.
+       * runtime/Makefile.am (mcs-do-run-test-profiles): Don't set PATH.
+       (all-local, install-local): Depend on TEST_SUPPORT_FILES too.
+       (test-support-files): Move creation of _tmpinst/bin directory ...
+       (test-support-file, $(tmpinst)/bin/mono): ... here.
+       ($(tmpinst)/bin/mbas, $(tmpinst)/bin/pedump): Remove.
+
 2007-03-22  Marek Habersack  <[EMAIL PROTECTED]>
 
        * data/net_2_0/machine.config: added a few missing sections, added

Modified: trunk/mono/mono/tests/ChangeLog
===================================================================
--- trunk/mono/mono/tests/ChangeLog     2007-03-28 11:42:49 UTC (rev 75066)
+++ trunk/mono/mono/tests/ChangeLog     2007-03-28 11:55:46 UTC (rev 75067)
@@ -1,3 +1,7 @@
+2007-03-28  Raja R Harinath  <[EMAIL PROTECTED]>
+
+       * Makefile.am (test-bug-80307): Don't set PATH.
+
 2007-03-27  Raja R Harinath  <[EMAIL PROTECTED]>
 
        * Makefile.am (JITTEST_PROG_RUN): Set MONO_CFG_DIR too.

Modified: trunk/mono/mono/tests/Makefile.am
===================================================================
--- trunk/mono/mono/tests/Makefile.am   2007-03-28 11:42:49 UTC (rev 75066)
+++ trunk/mono/mono/tests/Makefile.am   2007-03-28 11:55:46 UTC (rev 75067)
@@ -501,10 +501,10 @@
 bug-80307.exe: $(srcdir)/bug-80307.cs
        $(MCS) -r:System.Web -out:$@ $(srcdir)/bug-80307.cs
 
-# use helper 'mcs' and 'gmcs' from $(top_builddir)/runtime/_tmpinst
+# We use 'test-support-files' to handle an ordering issue between the 'mono/' 
and 'runtime/' directories
 test-bug-80307: bug-80307.exe
        cd $(top_builddir)/runtime && $(MAKE) test-support-files
-       PATH="$(mono_build_root)/runtime/_tmpinst/bin:$$PATH" $(RUNTIME) 
bug-80307.exe
+       $(RUNTIME) bug-80307.exe
 
 # Useful if mono is compiled with --enable-shared=no
 patch-libtool:

Modified: trunk/mono/runtime/Makefile.am
===================================================================
--- trunk/mono/runtime/Makefile.am      2007-03-28 11:42:49 UTC (rev 75066)
+++ trunk/mono/runtime/Makefile.am      2007-03-28 11:55:46 UTC (rev 75067)
@@ -27,7 +27,7 @@
 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
 
@@ -35,7 +35,7 @@
 install: install-exec install-data
 
 # override automake
-install-exec: $(SUPPORT_FILES)
+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
@@ -54,11 +54,7 @@
 
 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
@@ -71,7 +67,6 @@
        cd $(mcs_topdir) && $(MAKE) 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
 
 if PLATFORM_WIN32
@@ -110,34 +105,27 @@
        mv -f [EMAIL PROTECTED] $@
 
 $(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)
+test-support-files: $(TEST_SUPPORT_FILES)
+       @:
 
-test-support-file:
+test-support-file: $(tmpinst)/bin/mono
+       test -n '$(target)$(file)'
        echo '#! /bin/sh' > $(target)
-       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec "'"$$r/mono-wrapper"'" 
"'"$$m/$(file)"'" "$$@"' >> $(target)
+       r=`pwd`; m=`cd $(mcs_topdir) && pwd`; echo 'exec 
"'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/$(file)"'" "$$@"' >> $(target)
        chmod +x $(target)
 
-$(tmpinst)/bin/pedump: $(srcdir)/Makefile.am
-       $(mkdir_p) $(@D)
-       (b=`pwd`; echo '#! /bin/sh'; echo 'exec "'"$$b/libtool"'" 
--mode=execute "'"$$b/mono/metadata/pedump"'" "$$@"') > $@
-       chmod +x $@
-
 # the 'cygnus' option also disables the default 'distdir:' target, which we 
_do_ want
 MYDISTFILES = $(DIST_COMMON)
 distdir: $(MYDISTFILES)

Modified: trunk/mono/runtime/mono-wrapper.in
===================================================================
--- trunk/mono/runtime/mono-wrapper.in  2007-03-28 11:42:49 UTC (rev 75066)
+++ trunk/mono/runtime/mono-wrapper.in  2007-03-28 11:55:46 UTC (rev 75067)
@@ -1,6 +1,7 @@
 #! /bin/sh
 r='@mono_build_root@'
 MONO_CFG_DIR='@mono_cfg_dir@'
+PATH="$r/runtime/_tmpinst/bin:$PATH"
 MONO_SHARED_DIR=$r/runtime
-export MONO_CFG_DIR MONO_SHARED_DIR
+export MONO_CFG_DIR MONO_SHARED_DIR PATH
 exec "$r/libtool" --mode=execute "$r/@mono_runtime@" --config 
"@mono_cfg_dir@/mono/config" "$@"

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to