2005-04-21 Raja R Harinath <rharinath@novell.com>

	* runtime/Makefile.am: Update.  Pass 'monodis-wrapper' as ILDISASM
	to sub-makes.
	* runtime/monodis-wrapper.in: New file.
	* configure.in (runtime/monodis-wrapper): Create.

svn path=/trunk/mono/; revision=43387

diff --git a/ChangeLog b/ChangeLog
index 3656d51fc22d55bb85025ba54cccdfc29b285b86..179e2726de2bbdd03218336175e559b38789d17c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-21  Raja R Harinath  <rharinath@novell.com>
+
+       * runtime/Makefile.am: Update.  Pass 'monodis-wrapper' as ILDISASM
+       to sub-makes.
+       * runtime/monodis-wrapper.in: New file.
+       * configure.in (runtime/monodis-wrapper): Create.
+
 2005-04-20  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
        * data/net_1_1/machine.config, data/net_2_0/machine.config: 
        added ' explicit="true" strict="false" ' to system.web/compilation 

diff --git a/configure.in b/configure.in
index e5b180e6749d77b5c9962c66efc64629ad688f1f..a5a4eac433d616a23c128cdf00ae49574db4ab77 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1651,6 +1651,7 @@ fi
 AC_SUBST(mono_cfg_dir)
 
 AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
+AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
 
 AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index ca2624f99d7b11be888ef0fcf64d626725e770fe..e8e653f78e41a6c7d81579da81137683d8958666 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -7,7 +7,7 @@ AUTOMAKE_OPTIONS = cygnus
 
 tmpinst = _tmpinst
 
-noinst_SCRIPTS = mono-wrapper
+noinst_SCRIPTS = mono-wrapper monodis-wrapper
 
 symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config
 
@@ -22,7 +22,7 @@ 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 PROFILES='$(build_profiles)' all-profiles
+       d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' all-profiles
 
 if INSTALL_2_0
 build_profiles = default net_2_0
@@ -37,7 +37,7 @@ install: install-exec install-data
 install-exec: $(SUPPORT_FILES)
        d=`pwd`; \
        cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
-                                   RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
+                                   RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes install-profiles
 
 # override automake
 install-data:
@@ -47,7 +47,7 @@ install-data:
 uninstall:
        d=`pwd`; \
        cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' \
-                                   RUNTIME=$$d/mono-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles
+                                   RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper RUNTIME_HAS_CONSISTENT_GACDIR=yes uninstall-profiles
 
 clean-local:
        d=`pwd`; cd $(mcs_topdir) && $(MAKE) PROFILES='$(build_profiles)' clean-profiles
@@ -67,11 +67,11 @@ 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
+       d=`pwd`; cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper 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 PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \
+       ( cd $(mcs_topdir) && $(MAKE) RUNTIME=$$d/mono-wrapper ILDISASM=$$d/monodis-wrapper PROFILES='$(build_profiles)' run-test-profiles ) || ret=false ; \
        rm -fr $(tmpinst); $$ret
 
 if PLATFORM_WIN32

diff --git a/runtime/monodis-wrapper.in b/runtime/monodis-wrapper.in
new file mode 100644 (file)
index 0000000..3d62405
--- /dev/null
+++ b/runtime/monodis-wrapper.in
@@ -0,0 +1,6 @@
+#! /bin/sh
+r='@mono_build_root@'
+MONO_CFG_DIR='@mono_cfg_dir@'
+MONO_SHARED_DIR=$r/runtime
+export MONO_CFG_DIR MONO_SHARED_DIR
+exec "$r/libtool" --mode=execute "$r/mono/dis/monodis" "$@"