* configure.in (mcs_topdir, mcs_topdir_from_srcdir): New 'subst'ed

variables.  Used to support both an in-tree mcs/ and a sibling
mcs/ directory.
* Makefile.am (mcs_topdir): Remove.
(dist-hook): Distribute mcs/ as a subdirectory.
* runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)):
Use mcs_topdir and mcs_topdir_from_srcdir.
* runtime/net_1_1/Makefile.am (mscorlib.dll $(gac_assemblies) $(mdb_files)):
Likewise.
(all-local): Depend on $(mdb_files) too.
* runtime/net_2_0/Makefile.am: Likewise.

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

diff --git a/.cvsignore b/.cvsignore
index 4fe404c27e55a9db9f183534cb54b029b2a11155..3481c4d0bc3cbd76d3427d3313137c6da0c8fcaf 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,25 +1,26 @@
+Makefile
+Makefile.in
+_tmpinst
 aclocal.m4
+autom4te.cache
 config.cache
 config.guess
 config.h
 config.h.in
+config.h.in
 config.log
 config.status
 config.sub
 configure
 libtool
-ltmain.sh
 ltconfig
-Makefile
-Makefile.in
+ltmain.sh
+mint.pc
 mono-*.tar.gz
-stamp-h
-stamp-h.in
 mono.pc
 mono.spec
-autom4te.cache
-mint.pc
+semantic.cache
+stamp-h
+stamp-h.in
 stamp-h1
-config.h.in
-_tmpinst
-tmpinst-dir.stamp
\ No newline at end of file
+tmpinst-dir.stamp

diff --git a/ChangeLog b/ChangeLog
index 751005bc574a368bc40e5a00dc2dc7e6614a5aeb..7bc25401ca8d3dbab1bd5b70ad8e81cea9fccf1e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-11-08  Raja R Harinath  <rharinath@novell.com>
+
+       * configure.in (mcs_topdir, mcs_topdir_from_srcdir): New 'subst'ed
+       variables.  Used to support both an in-tree mcs/ and a sibling
+       mcs/ directory.
+       * Makefile.am (mcs_topdir): Remove.
+       (dist-hook): Distribute mcs/ as a subdirectory.
+       * runtime/Makefile.am ($(monoone_DATA) $(monotwo_DATA) $(monobins_DATA)):
+       Use mcs_topdir and mcs_topdir_from_srcdir.
+       * runtime/net_1_1/Makefile.am (mscorlib.dll $(gac_assemblies) $(mdb_files)): 
+       Likewise.
+       (all-local): Depend on $(mdb_files) too.
+       * runtime/net_2_0/Makefile.am: Likewise.
+       
 2004-11-05  Zoltan Varga  <vargaz@freemail.hu>
 
        * runtime/net_2_0/Makefile.am (install-data-local): 

diff --git a/Makefile.am b/Makefile.am
index a3d919a064ec926a6172e787e0754e27e70baf46..a0ea58ebe1a2d1aafe61cfc21be60d6b23cfca58 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,11 @@ DIST_SUBDIRS = libgc mono ikvm-jni docs data runtime scripts man samples support
 
 EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
 
+# Distribute the 'mcs' tree too
+dist-hook:
+       test -d $(distdir)/mcs || mkdir $(distdir)/mcs
+       d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
+
 pkgconfigdir = $(libdir)/pkgconfig
 if JIT_SUPPORTED
 pkgconfig_DATA= mono.pc mint.pc
@@ -23,8 +28,6 @@ DISTCLEANFILES= mono.pc mint.pc
 # problems by doing the compilation in the right order.
 #
 
-mcs_topdir=$(top_srcdir)/../mcs
-
 .PHONY: bootstrap faststrap fasterstrap bootstrap-clean bootstrap-check get-monolite-latest monolite-bootstrap
 .PHONY: tmpinst-dir tmpinst-mcs-basic-build tmpinst-mcs-short-build tmpinst-mcs-full-build tmpinst-monolite
 .PHONY: mono-do-runtime-only mcs-do-basic-build mcs-do-short-build mcs-do-full-build mcs-do-clean-profiles mcs-do-run-test
@@ -97,12 +100,14 @@ monolite-bootstrap: tmpinst-monolite mono-do-runtime-only
        $(MAKE) tmpinst-mcs-short-build
        $(MAKE) fasterstrap
 
-bootstrap-world:
-       $(MAKE) bootstrap-clean
+compiler-tests:
+       $(MAKE) mcs-do-clean-profiles
        $(MAKE) bootstrap
-       $(MAKE) install
        $(MAKE) mcs-do-compiler-tests
 
+bootstrap-world: compiler-tests
+       $(MAKE) install
+
 # internal targets
 
 tmpinst-mcs-basic-build: mcs-do-basic-build tmpinst-dir

diff --git a/configure.in b/configure.in
index 24980fc6dcbaa0025c6e5c98fc081a566d116481..f41c9a561cacbab93302c1f729eee1769a3123d9 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -259,6 +259,19 @@ else
 fi
 CFLAGS="$CFLAGS -g $WARN"
 
+# Where's the 'mcs' source tree?
+if test -d $srcdir/mcs; then
+  mcsdir=mcs
+else
+  mcsdir=../mcs
+fi
+
+mcs_topdir='$(top_srcdir)/'$mcsdir
+mcs_topdir_from_srcdir='$(top_builddir)/'$mcsdir
+
+AC_SUBST([mcs_topdir])
+AC_SUBST([mcs_topdir_from_srcdir])
+
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
        AC_MSG_ERROR([You need to install pkg-config])
@@ -1473,7 +1486,7 @@ tools/locale-builder/Makefile
 ])
 
 echo "
-
+        mcs source:  $mcs_topdir
        GC:          $gc
        ICU:         $enable_icu
        TLS:         $with_tls

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 09c89564fb0cce41592ab7b49392287e84b5c6fa..0096563a6f7f4c1c14a35b1722d5a090646ac9af 100644 (file)
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -4,8 +4,6 @@
 
 SUBDIRS = . net_1_1 net_2_0
 
-mcs_topdir=$(top_srcdir)/../mcs
-
 monobins_DATA = \
        monoresgen.exe                          \
        monoresgen.exe.mdb                      \
@@ -93,12 +91,12 @@ $(monoone_DATA) $(monotwo_DATA) $(monobins_DATA):
        wsdl*)                                          d=tools/wsdl                                     ;; \
        sqlsharp)                                       d=tools/SqlSharp                                 ;; \
        esac; \
-       echo "test -f $(top_srcdir)/../mcs/$$d/$@" ; \
-       test -f $(top_srcdir)/../mcs/$$d/$@ || exit 1 ; \
+       echo "test -f $(mcs_topdir)/$$d/$@" ; \
+       test -f $(mcs_topdir)/$$d/$@ || exit 1 ; \
        echo "rm -f $(srcdir)/$@" ; \
        rm -f $(srcdir)/$@ ; \
-       echo "cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@" ; \
-       cd $(srcdir) && $(LN_S) ../../mcs/$$d/$@ $@
+       echo "cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/$$d/$@ $@" ; \
+       cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/$$d/$@ $@
 
 copy_dlls:
        cp /nt/mono/mcs/class/*/*.dll .

diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am
index 4bd0f9113de3cf617a552b656a5f94d3daa57f55..01175e008e5f812716447dc87152d680b890b6fe 100644 (file)
--- a/runtime/net_1_1/Makefile.am
+++ b/runtime/net_1_1/Makefile.am
@@ -83,13 +83,11 @@ EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files)
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
 mscorlib.dll $(gac_assemblies) $(mdb_files):
-       test -f $(top_srcdir)/../mcs/class/lib/default/$@
+       test -f $(mcs_topdir)/class/lib/default/$@
        -rm -f $(srcdir)/$@
-       cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@ $@
-       -cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@.mdb $@.mdb
+       cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/class/lib/default/$@ $@
 
-
-all-local: $(gac_assemblies)
+all-local: $(gac_assemblies) $(mdb_files)
 
 install-data-local:
        @if test -f $(srcdir)/mscorlib.dll.mdb; then \

diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am
index d2cd39cfcdd1feee86c8d08311d4af04fefdcc5a..29b9c852fac2691b3dd010a18631424bd334dd63 100644 (file)
--- a/runtime/net_2_0/Makefile.am
+++ b/runtime/net_2_0/Makefile.am
@@ -83,11 +83,11 @@ EXTRA_DIST = $(gac_assemblies) $(corlib_DATA) $(mdb_files)
 MAINTAINERCLEANFILES = $(EXTRA_DIST)
 
 mscorlib.dll $(gac_assemblies) $(mdb_files):
-       test -f $(top_srcdir)/../mcs/class/lib/net_2_0/$@
+       test -f $(mcs_topdir)/class/lib/net_2_0/$@
        -rm -f $(srcdir)/$@
-       cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/net_2_0/$@ $@
+       cd $(srcdir) && $(LN_S) $(mcs_topdir_from_srcdir)/class/lib/net_2_0/$@ $@
 
-all-local: $(gac_assemblies)
+all-local: $(gac_assemblies) $(mdb_files)
 
 if INSTALL_2_0
 install-data-local: