From: Raja R Harinath <harinath@hurrynot.org>
Date: Thu, 21 Apr 2005 09:53:36 +0000 (-0000)
Subject: 2005-04-21  Raja R Harinath  <rharinath@novell.com>
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=0bdaad5f082b30355b8ef2081aa0b90a6c9a2612;p=mono.git

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 3656d51fc22..179e2726de2 100644
--- 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 e5b180e6749..a5a4eac433d 100644
--- 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 ca2624f99d7..e8e653f78e4 100644
--- 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
index 00000000000..3d62405181e
--- /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" "$@"