diff options
author | Jackson Harper <jackson@novell.com> | 2004-06-11 23:18:55 +0400 |
---|---|---|
committer | Jackson Harper <jackson@novell.com> | 2004-06-11 23:18:55 +0400 |
commit | d6c7ea39cc15b7a49e052a2eb3282bd7069f9c96 (patch) | |
tree | 39aeb46300b37fdfc89fa67d478c20993cd0a1dc | |
parent | 7db0bfe9b3817972ffa32e801ed4aa337ab7e75f (diff) |
* runtime/net_2_0/Makefile.am:
* runtime/net_1_1/Makefile.am: Remove signing patches
svn path=/trunk/mono/; revision=29377
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | runtime/net_1_1/Makefile.am | 15 | ||||
-rw-r--r-- | runtime/net_2_0/Makefile.am | 18 |
3 files changed, 5 insertions, 33 deletions
diff --git a/ChangeLog b/ChangeLog index 2344bc32d0f..561426bdb43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-06-11 Jackson Harper <jackson@ximian.com> + * runtime/net_2_0/Makefile.am: + * runtime/net_1_1/Makefile.am: Remove signing patches + +2004-06-11 Jackson Harper <jackson@ximian.com> + * man/mono.1: Add documentation for MONO_GAC_PREFIX. * runtime/net_2_0/Makefile.am: * runtime/net_1_1/Makefile.am: Sign assemblies before diff --git a/runtime/net_1_1/Makefile.am b/runtime/net_1_1/Makefile.am index 1fd29bac999..0036c753484 100644 --- a/runtime/net_1_1/Makefile.am +++ b/runtime/net_1_1/Makefile.am @@ -3,8 +3,6 @@ # gacutil=$(srcdir)/../gacutil.exe -sn=$(srcdir)/../sn.exe -mono_snk=../../../mcs/class/mono.snk if USE_JIT mono_runtime = $(top_builddir)/mono/mini/mono @@ -65,13 +63,6 @@ gac_assemblies_list = \ System.Windows.Forms \ System.Xml -no_sign_list = \ - ICSharpCode.SharpZipLib \ - Npgsql \ - nunit.util \ - nunit.core \ - nunit.framework - gac_assemblies = $(gac_assemblies_list:=.dll) corlibdir = $(libdir) @@ -82,17 +73,11 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST) mscorlib.dll $(gac_assemblies): cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/default/$@ $@ ; \ - cd $(srcdir) && $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$@ $(mono_snk) || exit 1 ; all-local: $(gac_assemblies) install-data-local: @if test -n '$(gac_assemblies)'; then \ - for i in $(filter-out $(no_sign_list), $(gac_assemblies)) ; do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$$i $(mono_snk)" ; \ - MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$$i $(mono_snk) || exit 1 ; \ - done; \ for i in ''$(gac_assemblies); do \ echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 1.0 /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir) \ diff --git a/runtime/net_2_0/Makefile.am b/runtime/net_2_0/Makefile.am index c97d4529de0..f7605214c19 100644 --- a/runtime/net_2_0/Makefile.am +++ b/runtime/net_2_0/Makefile.am @@ -3,8 +3,6 @@ # gacutil=$(srcdir)/../gacutil.exe -sn=$(srcdir)/../sn.exe -mono_snk=../../../mcs/class/mono.snk if USE_JIT mono_runtime = $(top_builddir)/mono/mini/mono @@ -65,13 +63,6 @@ gac_assemblies_list = \ System.Windows.Forms \ System.Xml -no_sign_list = \ - ICSharpCode.SharpZipLib \ - Npgsql \ - nunit.util \ - nunit.core \ - nunit.framework - if PLATFORM_WIN32 gac_assemblies = local_mscorlib = @@ -88,22 +79,13 @@ MAINTAINERCLEANFILES = $(EXTRA_DIST) mscorlib.dll $(gac_assemblies): cd $(srcdir) && $(LN_S) ../../../mcs/class/lib/net_2_0/$@ $@ ; \ - cd $(srcdir) && $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$@ $(mono_snk) || exit 1 ; all-local: $(gac_assemblies) if INSTALL_2_0 install-data-local: @if test -n '$(gac_assemblies)'; then \ - for i in $(filter-out $(no_sign_list), $(gac_assemblies)) ; do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$$i $(mono_snk)" ; \ - MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$$i $(mono_snk) || exit 1 ; \ - done; \ for i in ''$(gac_assemblies); do \ - echo "MONO_PATH=$(srcdir) $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$$i $(mono_snk)" ; \ - MONO_PATH=$(srcdir) \ - $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(sn) -q -R $(srcdir)/$$i $(mono_snk) || exit 1 ; \ echo "MONO_PATH=$(srcdir)/../net_1_1 $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 2.0 /root $(DESTDIR)$(libdir)" ; \ MONO_PATH=$(srcdir)/../net_1_1 \ $(LIBTOOL) --mode=execute $(mono_runtime) --config ../../data/config $(gacutil) /i $(srcdir)/$$i /f /package 2.0 /root $(DESTDIR)$(libdir) || exit 1 ; \ |