Add a sanity-check to catch cyclic-dependency issues

* build/library.make (SNFLAGS): Remove '-R', since it's specific to the
action required.
($(build_lib)): Use -R flag with $(SN).
($(the_lib)): Add a sanity check to verify that the assembly is signed.
* tools/csharplib/Makefile ($(the_lib)): Update to changes in build/library.make.

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

diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog
index ded7d195d3670cac6f346ca2f2a836efd9eba52f..688708811811e599f1af3553ee104919d3e65912 100644 (file)
--- a/mcs/build/ChangeLog
+++ b/mcs/build/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-30  Raja R Harinath  <harinath@hurrynot.org>
+
+       * library.make (SNFLAGS): Remove '-R', since it's specific to the
+       action required.
+       ($(build_lib)): Use -R flag with $(SN).
+       ($(the_lib)): Add a sanity check to verify that the assembly is signed.
+
 2009-07-26  Raja R Harinath  <harinath@hurrynot.org>
 
        Make AOT compilation explicit

diff --git a/mcs/build/library.make b/mcs/build/library.make
index 2be22379527ca1720fe006832f85b8dc3b2ac2ff..b9e859d85996a4dd0562922b8ccb3f887197552a 100644 (file)
--- a/mcs/build/library.make
+++ b/mcs/build/library.make
@@ -69,7 +69,7 @@ SN = :
 else
 sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
 SN = $(Q) MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
-SNFLAGS = -q -R
+SNFLAGS = -q
 endif
 
 ifeq ($(PLATFORM), win32)
@@ -225,12 +225,12 @@ $(the_lib): $(the_libdir)/.stamp
 
 $(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
        $(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
-       $(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
+       $(SN) $(SNFLAGS) -R $@ $(LIBRARY_SNK)
 
 ifdef LIBRARY_USE_INTERMEDIATE_FILE
 $(the_lib): $(build_lib)
-       $(SN) $(SNFLAGS) $(build_lib) $(LIBRARY_SNK)
        $(Q) cp $(build_lib) $@
+       $(SN) $(SNFLAGS) -v $@
        $(Q) test ! -f $(build_lib).mdb || mv $(build_lib).mdb $@.mdb
        $(Q) test ! -f $(build_lib:.dll=.pdb) || mv $(build_lib:.dll=.pdb) $(the_lib:.dll=.pdb)
 endif

diff --git a/mcs/tools/csharplib/ChangeLog b/mcs/tools/csharplib/ChangeLog
index 800178b1fac6fbe0b150ffc72174984b4f39e7e3..c05f7823f408f8bbe443fbb2a36fadac22a1a753 100644 (file)
--- a/mcs/tools/csharplib/ChangeLog
+++ b/mcs/tools/csharplib/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-30  Raja R Harinath  <harinath@hurrynot.org>
+
+       * Makefile ($(the_lib)): Update to changes in build/library.make.
+
 2009-07-02  Jb Evain  <jbevain@novell.com>
 
        * Makefile: adjust to the linker build change.

diff --git a/mcs/tools/csharplib/Makefile b/mcs/tools/csharplib/Makefile
index 47d751b166f0a3899c5d288278c03e3aafe6ca09..116f9b613ae1af72933584cfcd31751d2e5cc5a7 100644 (file)
--- a/mcs/tools/csharplib/Makefile
+++ b/mcs/tools/csharplib/Makefile
@@ -34,5 +34,5 @@ MONO_PATH=MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(t
 $(the_lib): $(the_libdir)/.stamp Makefile Mono.CSharp.dll.sources $(build_lib)
        $(MKINSTALLDIRS) fixup
        $(MONO_PATH) $(RUNTIME) $(LINKER) -d fixup/$(PROFILE) -o out -l none -c skip -b true -x link.xml -s Mono.Tuner.AdjustVisibility,Mono.Tuner:OutputStep -s Mono.Tuner.PrintStatus,Mono.Tuner:OutputStep  -i compiler.info
-       $(SN) $(SNFLAGS) out/Mono.CSharp.dll $(topdir)/class/mono.snk
+       $(SN) $(SNFLAGS) -R out/Mono.CSharp.dll $(topdir)/class/mono.snk
        cp out/Mono.CSharp.dll $(the_lib)