Fri Mar 14 09:29:29 CET 2008 Paolo Molaro <lupus@ximian.com>

	* driver.cs: added a bootstrap option to ignore sn failures for now
	when bootstrapping a build. The option name will periodically change
	so no one else can use it.

svn path=/trunk/mcs/; revision=98246

diff --git a/mcs/tools/gacutil/ChangeLog b/mcs/tools/gacutil/ChangeLog
index 0d7ee60bd580ab2063e24837be5961e0a886e3c4..c93e99dd78dfbdeac7546dc563fb91d89f55eee1 100644 (file)
--- a/mcs/tools/gacutil/ChangeLog
+++ b/mcs/tools/gacutil/ChangeLog
@@ -1,3 +1,10 @@
+
+Fri Mar 14 09:29:29 CET 2008 Paolo Molaro <lupus@ximian.com>
+
+       * driver.cs: added a bootstrap option to ignore sn failures for now
+       when bootstrapping a build. The option name will periodically change
+       so no one else can use it.
+
 2008-03-14  Atsushi Enomoto  <atsushi@ximian.com>
 
        * driver.cs : temporarily disable r98206 strongname check

diff --git a/mcs/tools/gacutil/driver.cs b/mcs/tools/gacutil/driver.cs
index fa77c9c99e75524a82857ef89e73592317ee36a2..f7d02bdc893889393c2be8b76e1d1184001ba315 100644 (file)
--- a/mcs/tools/gacutil/driver.cs
+++ b/mcs/tools/gacutil/driver.cs
@@ -37,6 +37,7 @@ namespace Mono.Tools {
                }
 
                private static bool silent;
+               static bool in_bootstrap;
 
                public static int Main (string [] args)
                {
@@ -81,6 +82,11 @@ namespace Mono.Tools {
                                                continue;
                                        }
 
+                                       if (args [i] == "-bootstrap" || args [i] == "/bootstrap") {
+                                               in_bootstrap = true;
+                                               continue;
+                                       }
+
                                        if (command == Command.Unknown) {
                                                command = GetCommand (args [i]);
                                                if (command != Command.Unknown) {
@@ -234,14 +240,25 @@ namespace Mono.Tools {
                        }
 
                        an = assembly.GetName ();
-                       /*
-                       Process sn_cmd = Process.Start ("sn", "-q -v " + name);
-                       sn_cmd.WaitForExit ();
-                       if (sn_cmd.ExitCode != 0) {
-                               WriteLine (string.Format (failure_msg, name) + "Attempt to install an assembly without a strong name.");
-                               return false;
+                       try {
+                               Process sn_cmd = Process.Start ("sn", "-q -v " + name);
+                               sn_cmd.WaitForExit ();
+                               if (sn_cmd.ExitCode != 0) {
+                                       if (in_bootstrap) {
+                                               WriteLine (string.Format (failure_msg, name) + "Attempt to install an assembly without a strong name (sn failed, continuing anyway).");
+                                       } else {
+                                               WriteLine (string.Format (failure_msg, name) + "Attempt to install an assembly without a strong name.");
+                                               return false;
+                                       }
+                               }
+                       } catch {
+                               if (in_bootstrap) {
+                                       WriteLine (string.Format (failure_msg, name) + "Attempt to install an assembly without a strong name (sn failed, continuing anyway).");
+                               } else {
+                                       WriteLine (string.Format (failure_msg, name) + "Attempt to install an assembly without a strong name.");
+                                       return false;
+                               }
                        }
-                       */
                        pub_tok = an.GetPublicKeyToken ();
                        if (pub_tok == null || pub_tok.Length == 0) {
                                WriteLine (string.Format (failure_msg, name) + "Attempt to install an assembly without a strong name.");

diff --git a/mcs/tools/mono-service/Makefile b/mcs/tools/mono-service/Makefile
index 2f44b2e970a7db98b05c525f74f09cc8ecf436b5..0115d2718b6d5a21695b1b718fb62489667eb135 100644 (file)
--- a/mcs/tools/mono-service/Makefile
+++ b/mcs/tools/mono-service/Makefile
@@ -11,13 +11,6 @@ LOCAL_MCS_FLAGS = -r:System.ServiceProcess.dll -r:Mono.Posix.dll -unsafe
 # Copied from library.make
 
 # -- begin --
-ifdef NO_INSTALL
-GACUTIL = :
-else
-gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
-GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
-endif
-
 ifeq ($(PLATFORM), win32)
 GACDIR = `cygpath -w $(mono_libdir)`
 GACROOT = `cygpath -w $(DESTDIR)$(mono_libdir)`

diff --git a/mcs/tools/tuner/Makefile b/mcs/tools/tuner/Makefile
index 93411c2fc78f8e2e8ddd7009a1b58123215f78dc..60bb848be1ba105ba8db0762ab9db2e77d3aabd7 100644 (file)
--- a/mcs/tools/tuner/Makefile
+++ b/mcs/tools/tuner/Makefile
@@ -86,9 +86,6 @@ tune.stamp: $(WORKING_FILES) $(OUTPUT_DIR)/.stamp
        for i in $(DLLFILES); do $(SN) $(SNFLAGS) $(OUTPUT_DIR)/$$i $(topdir)/class/mono.snk; done
        mv $@t $@
 
-gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
-GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
-
 TUNER_INSTALL_DIR = $(DESTDIR)$(mono_libdir)/mono/2.1
 
 end-install: inst-mscorlib.dll inst-smcs.exe gac-System gac-System.Xml.Core gac-System.Core