* Makefile.am (MCS_DIRS, MCS_FILES): Add back Mono.CSharp.Debugger.

(tmpinst-dir-contents, $(tmpinst)/bin/mono.bat): Remove mono.bat
in W32.  Use 'mono' and 'mcs' in W32 too.
(bootstrap) [PLATFORM_WIN32]: Back to single stage bootstrap.
* runtime/net_2_0/Makefile.am (gac_assemblies_list): Don't mention
nunit.*, IBM.Data.DB2, ICSharpCode.SharpZipLib.
Fix for #60443, the GAC .DLL-Hell.

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

1 files changed, 19 insertions, 25 deletions

diff --git a/Makefile.am b/Makefile.am
index 59495553046..eaa4952f2ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,8 +45,10 @@ MCS_BASIC_FILES = \
 
 # Set of directories and files the 'mcs' compiler can use
 ## We build class/System twice to resolve the cyclic dependency of class/System.XML
-MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System $(MONO_CSHARP_DEBUGGER_DIR)
-MCS_FILES = $(MCS_BASIC_FILES) $(mcs_topdir)/class/lib/default/System.Xml.dll $(MONO_CSHARP_DEBUGGER_FILE)
+MCS_DIRS = $(MCS_BASIC_DIRS) class/System.XML class/System class/Mono.CSharp.Debugger
+MCS_FILES = $(MCS_BASIC_FILES) \
+	$(mcs_topdir)/class/lib/default/System.Xml.dll \
+	$(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
 
 tmpinst = _tmpinst
 
@@ -55,13 +57,11 @@ if PLATFORM_WIN32
 populate_profiles = default:net_1_1
 
 # bootstraps using the .NET C# compiler
-bootstrap: faststrap
+bootstrap: tmpinst-dir mono-do-runtime-only
+	$(MAKE) fasterstrap
 
 else
 
-MONO_CSHARP_DEBUGGER_DIR = class/Mono.CSharp.Debugger
-MONO_CSHARP_DEBUGGER_FILE = $(mcs_topdir)/class/lib/default/Mono.CSharp.Debugger.dll
-
 populate_profiles = default:net_1_1 net_2_0:net_2_0
 
 bootstrap: tmpinst-mcs-basic-build mono-do-runtime-only
@@ -159,30 +159,22 @@ tmpinst-dir:
 	mkdir -p $(tmpinst) $(tmpinst)/bin $(tmpinst)/lib $(tmpinst)/etc/mono
 	$(MAKE) tmpinst-dir-contents
 
+tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
+
 if PLATFORM_WIN32
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono.bat $(tmpinst)/etc/mono/machine.config
+$(tmpinst)/bin/mono: $(srcdir)/Makefile.am
+	echo '#! /bin/sh' > $@
+	echo 'builddir="'`pwd`'"; win_builddir="'`cygpath -w -a .`'"' >> $@
+	echo 'tmpinst="$$win_builddir\\$(tmpinst)"' >> $@
+	echo 'if test -z "$$MONO_PATH" ; then MONO_PATH="$$tmpinst\\lib"; else MONO_PATH="$${MONO_PATH};$$tmpinst\\lib" ; fi' >> $@
+	echo 'MONO_CFG_DIR="$$tmpinst\\etc"' >> $@
+	echo 'export MONO_PATH MONO_CFG_DIR' >> $@
+	echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/mono.exe" "$$@"' >> $@
+	chmod +x $@
 
 else
 
-tmpinst-dir-contents: $(tmpinst)/bin/mono $(tmpinst)/bin/mcs $(tmpinst)/etc/mono/machine.config
-
-endif
-
-$(tmpinst)/bin/mono.bat: $(srcdir)/Makefile.am
-	echo '@echo off' > $@
-	echo 'set builddir="'"`pwd`"'"' >> $@
-	echo 'set win_builddir="'"`cygpath -w -a .`"'"' >> $@
-	echo 'set tmpinst="%win_builddir%\$(tmpinst)"' >> $@
-	echo 'if %MONO_PATH% == "" goto when_empty' >> $@
-	echo 'set MONO_PATH="%MONO_PATH%;%tmpinst%\lib"' >> $@
-	echo 'goto endif_empty' >> $@
-	echo ':when_empty' >> $@
-	echo 'set MONO_PATH=%tmpinst%\lib' >> $@
-	echo ':endif_empty' >> $@
-	echo 'set MONO_CFG_DIR=%tmpinst%\etc' >> $@
-	echo "`cygpath -w /bin/sh`" '"%builddir%/libtool" --mode=execute "%builddir%/$(mono_runtime)" --config "%win_builddir%\data\config" %*' >> $@
-
 $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	echo '#! /bin/sh' > $@
 	echo 'builddir="'`pwd`'"; tmpinst=$$builddir/$(tmpinst)' >> $@
@@ -192,6 +184,8 @@ $(tmpinst)/bin/mono: $(srcdir)/Makefile.am
 	echo 'exec "$$builddir/libtool" --mode=execute "$$builddir/$(mono_runtime)" --config "$$builddir/data/config" "$$@"' >> $@
 	chmod +x $@
 
+endif
+
 $(tmpinst)/bin/mcs: $(srcdir)/Makefile.am
 	(t=`cd $(tmpinst) && pwd`; echo '#! /bin/sh'; echo 'exec "'"$$t/bin/mono"'" "'"$$t/lib/mcs.exe"'" "$$@"') > $@
 	chmod +x $@