Re: [Mono-dev] [PATCH] Two patches to make SGen work on Darwin/x86
On 03/24/10 Mark Probst wrote:
Here's an updated patch that fixes this problem, both for mono-ehash
as well as for mono-hash.
--- a/mono/metadata/boehm-gc.c
+++ b/mono/metadata/boehm-gc.c
@@ -932,5 +932,11 @@ mono_gc_get_write_barrier (void)
#endif
+void
+mono_gc_invoke_without_moving (void (*func) (void*), void *data)
+{
+ func (data);
+}
+
Please introduce a typedef for the function pointer type.
I think the naming here is misleading, since the issue is not just about
moving the objects, but also about them being collected.
Moreover, I think the feature should be actually implemented in Boehm
since it's provided by the library and it can be useful for other cases,
too.
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -597,6 +597,7 @@ safe_object_get_size (MonoObject* o)
* ##
*/
static LOCK_DECLARE (gc_mutex);
+static LOCK_DECLARE (interruption_mutex);
It may be better to put the declaration of the mutexes far from each
other so that there are more chances they'll end up in separate
cachelines and hence provide an effective advantage wrt using a single
mutex.
static int gc_disabled = 0;
static int num_minor_gcs = 0;
static int num_major_gcs = 0;
@@ -3337,6 +3338,8 @@ collect_nursery (size_t requested_size)
TV_DECLARE (atv);
TV_DECLARE (btv);
+ LOCK_INTERRUPTION;
You need to put the lock acquisition at the start of
stop_world(), here it can cause a deadlock, since a thread may be
stopped while holding interruption_mutex and this call here
will wait indefinitely.
Also, to prepare for the future changes, introduce two functions:
void acquire_gc_locks (void) and void release_gc_locks (void) and
call them in stop_world()/restart().
The rest looks ok to me.
lupus
--
-
lu...@debian.org debian/rules
lu...@ximian.com Monkeys do it better
___
Mono-devel-list mailing list
Mono-devel-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-devel-list
Re: [Mono-dev] [PATCH] WCF more detail on Destination Unreachable
Thanks for the explanation, I had a feeling it wouldn't be as simple as I was hoping it was. :-) -Original Message- From: Atsushi Eno [mailto:atsushi...@veritas-vos-liberabit.com] Sent: 25 March 2010 4:12 AM To: Matt Dargavel Cc: mono-devel-list@lists.ximian.com Subject: Re: [Mono-dev] [PATCH] WCF more detail on Destination Unreachable Thanks for the test, it cleared some things up :) So - first, I cannot apply your HttpRequestChannel change. The code you removed was introduced to fix real problem regarding HTTP 4xx; when HTTP 4xx is returned, the response stream is inaccessible and the channel should not try to read it. Instead, the server code seems to have an issue that it should just return 500. While it is set to 400 at HttpRequestContext with explicit comment that it is what .NET does, I was likely wrong by seeing response from WebHttpBinding, which likely has special error handling. In general our fault handling is not well done yet and I'm seeing a couple of issues to get correct fix there. Better fault handling is one of the tasks on my stack, but it may be time to give priority than ongoing bugfix as it's blocking your patch that will help my ongoing work... Atsushi Eno On 2010/03/24 19:41, Matt Dargavel wrote: Apologies for the wait- it's the time difference! :-) I've come up with a test for the DestinationUnreachable patch. When I was doing my testing I was using a combination of a .NET client and manually firing in requests using PuTTY and examining the reply. When I use a WCF Client in Mono the exception detail is currently lost in HttpRequestChannel, with a WebException being returned instead. The patch I've attached changes HttpRequestChannel so that 400+ errors are returned normally. This results in a FaultException being returned instead. The FaultException includes the extra details my previous patch added. Do you think this is acceptable and covers what you need? Hopefully you'll be able to add it to the NUnit tests fairly easily. Thanks, Matt. -Original Message- From: Atsushi Eno [mailto:atsushi...@veritas-vos-liberabit.com] Sent: 24 March 2010 6:18 AM To: Matt Dargavel Cc: mono-devel-list@lists.ximian.com Subject: Re: [Mono-dev] [PATCH] WCF more detail on Destination Unreachable Instead of waiting for your reply, I've rather committed the patch (with a few change) and verify it later with a runnable repro. - DestinationUnreachableInfo.patch is done Atsushi Eno On 2010/03/24 14:35, Atsushi Eno wrote: I still couldn't reproduce the detailed error message. Let's please post a runnable repro case instead of code-less explanation ;) Atsushi Eno On 2010/03/23 22:38, Matt Dargavel wrote: You can reproduce it by requesting an operation that doesn't exist. (It was happening before I implemented the two Service Contracts on one end point change as the wrong channel dispatcher was getting the request.) So I should be able to write a test case for that... -Original Message- From: Atsushi Eno [mailto:atsushi...@veritas-vos-liberabit.com] Sent: 23 March 2010 12:57 PM To: Matt Dargavel Cc: mono-devel-list@lists.ximian.com Subject: Re: [PATCH] WCF more detail on Destination Unreachable It's looking fine, but how did you check your change? (I know it could happen not always reproducible, so that's okay if it's not really always reproducible.) BTW I thank a lot for your properties change, that fixed a bug that annoyed me today ;-) Atsushi Eno On 2010/03/23 20:28, Matt Dargavel wrote: A patch to return more detail when an endpoint / operation isn't found. Not sure if you'll want to apply this, but it helped in some service debugging I was doing. Matt. ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
Re: [Mono-dev] Threading parameters? Fill a DataGridView via Invoke very slow
MonoDevelop on Windows uses .NET by default, not Mono. boolean wrote: Another solution with delegates instead of invoke brings no advantages. It´s curious on Windows and Mono Develop it´s comperable fast like on .NET. -- View this message in context: http://n4.nabble.com/Threading-parameters-Fill-a-DataGridView-via-Invoke-very-slow-tp1680691p1690764.html Sent from the Mono - Dev mailing list archive at Nabble.com. ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
[Mono-dev] Test Suite Failures
Hey guys! We have accumulated many test suite failures in the past month. If you commit to mono, please take the time to regularly check the buildbots to ensure you are not breaking things. The buildbot results are available here: http://wrench.mono-project.com/builds Our new buildbots build every revision, so it's easy to track down where something regressed. Current Regressions (all on SLE11 32 bit) --- test-runtime mkbundle error http://build.mono-project.com/WebServices/Download.aspx?workfile_id=2166773 test-mini simd error 154183 - kumpera http://build.mono-project.com/GetFile.aspx?id=2163467 test-aot simd error 154183 - kumpera http://build.mono-project.com/GetFile.aspx?id=2166777 tests-verify Mvc Error 153615 - mhabersack http://build.mono-project.com/GetFile.aspx?id=2166784 test-compiler-2.0 test-454.cs http://build.mono-project.com/WebServices/Download.aspx?workfile_id=2166786 test-System-2.0 LicenseManagerTests 153687 - kumpera http://build.mono-project.com/WebServices/Download.aspx?workfile_id=2083269 test-System_Runtime_Remoting Timeout 153687 - kumpera http://build.mono-project.com/WebServices/Download.aspx?workfile_id=2166905 test-Microsoft_Build_Tasks-2.0 TaskBatchingTest 153687 - kumpera http://build.mono-project.com/GetFile.aspx?id=2166925 test-Mono_C5-2.0 generics sharing error 154072 - zoltan http://build.mono-project.com/GetFile.aspx?id=2166929 test-System_Xml_Linq-3.5 castdatetimes 153558 - atsushi http://build.mono-project.com/WebServices/Download.aspx?workfile_id=2166934 Thanks for your help in keeping Mono from regressing! Jonathan ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
Re: [Mono-dev] Test Suite Failures
Hi, test-runtime mkbundle error http://build.mono-project.com/WebServices/Download.aspx?workfile_id=2166773 This is caused by mkbundle trying to use the installed mono-2.pc to compile some C code, but it cannot be found. Adding our mono-2.pc to PKG_CONFIG_PATH wouldn't work either, since it references the installed dirs, i.e. /usr/local/include etc. Zoltan ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
[Mono-dev] UriBuilder bug in Bugzilla (with Patch)
We've encountered problems with this bug: https://bugzilla.novell.com/show_bug.cgi?id=532291 It's seems that there is a patch and regression test cases for Mono which have been languishing in Bugzilla for a while. Would someone be so kind as to review and commit the patch? ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
Re: [Mono-dev] Test Suite Failures
On Thu, Mar 25, 2010 at 12:14 PM, Jonathan Pobst mon...@jpobst.com wrote: Hey guys! We have accumulated many test suite failures in the past month. If you commit to mono, please take the time to regularly check the buildbots to ensure you are not breaking things. The buildbot results are available here: http://wrench.mono-project.com/builds Our new buildbots build every revision, so it's easy to track down where something regressed. Current Regressions (all on SLE11 32 bit) --- test-mini simd error 154183 - kumpera http://build.mono-project.com/GetFile.aspx?id=2163467 test-aot simd error 154183 - kumpera http://build.mono-project.com/GetFile.aspx?id=2166777 Fixed, I forgot to commit the mcs bits. ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
Re: [Mono-dev] [PATCH] Version fix for git
Am 20.03.2010 um 22:54 schrieb Andreas Färber: When working on a Git repository that was cloned from a git-svn repo, it is currently displayed as tarball in `mono -V`. The method used to obtain the git revision info - searching the log - is independent of git-svn. The patch below thus only checks for a .git subdirectory. Any objections? If no one objects, I'll commit this fix tomorrow. Andreas diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index 4fe7052..093077b 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -586,7 +586,7 @@ EXTRA_DIST = $(common_BURGSRC) TestDriver.cs ldscript ldscript.mono \ $(posix_sources) version.h: Makefile - if test -d $(top_srcdir)/.git/svn; then svn_info=git log --no- color --first-parent -n1 --grep=git-svn-id: --pretty=format:%b | sed -n -e 's,git-svn-id: \(.*\)@\(.*\) .*,URL: \1 Revision: \2,p'; fi; \ + if test -d $(top_srcdir)/.git; then svn_info=git log --no-color -- first-parent -n1 --grep=git-svn-id: --pretty=format:%b | sed -n -e 's,git-svn-id: \(.*\)@\(.*\) .*,URL: \1 Revision: \2,p'; fi; \ if test -d $(srcdir)/.svn; then svn_info='svn info'; fi; \ if test -n $$svn_info; then \ (cd $(top_srcdir); \ ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
[Mono-dev] [PATCH] xsp to use newer Sqlite
The older Mono.Data.SqliteClient is gone, so this patch is needed to
build xsp against mono trunk HEAD
--
Jay
Index: test/1.1/webcontrols/dbpage1.aspx
===
--- test/1.1/webcontrols/dbpage1.aspx (revision 154071)
+++ test/1.1/webcontrols/dbpage1.aspx (working copy)
@@ -30,12 +30,12 @@
Version ver = Environment.Version;
if (providerAssembly == null || providerAssembly == )
if (ver.Major == 1)
-providerAssembly = Mono.Data.SqliteClient,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
+providerAssembly = Mono.Data.Sqlite,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
else if (ver.Major == 2)
-providerAssembly = Mono.Data.SqliteClient,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
+providerAssembly = Mono.Data.Sqlite,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
if (cncTypeName == null || cncTypeName == )
- cncTypeName = Mono.Data.SqliteClient.SqliteConnection;
+ cncTypeName = Mono.Data.Sqlite.SqliteConnection;
if (cncString == null || cncString == ) {
string dbPath = Path.Combine (Path.GetDirectoryName
(Request.MapPath (Request.FilePath)), dbpage1.sqlite);
Index: test/1.1/webcontrols/dbpage_test_setup.cs
===
--- test/1.1/webcontrols/dbpage_test_setup.cs (revision 154071)
+++ test/1.1/webcontrols/dbpage_test_setup.cs (working copy)
@@ -1,6 +1,6 @@
using System;
using System.IO;
-using Mono.Data.SqliteClient;
+using Mono.Data.Sqlite;
class App
{
Index: test/1.1/webcontrols/Makefile.am
===
--- test/1.1/webcontrols/Makefile.am(revision 154079)
+++ test/1.1/webcontrols/Makefile.am(working copy)
@@ -48,7 +48,7 @@
EXTRA_DIST = $(sqlite_DATA) $(samples_DATA) $(dbpage_test_setup_build)
dbpage_test_setup.exe: $(dbpage_test_setup_build)
- $(GMCS) -debug:full -r:Mono.Data.SqliteClient.dll -out:$@ $^
+ $(GMCS) -debug:full -r:Mono.Data.Sqlite.dll -out:$@ $^
dbpage1.sqlite: dbpage_test_setup.exe
$(RUNTIME) dbpage_test_setup.exe
Index: test/1.1/webcontrols/dbpage2.aspx
===
--- test/1.1/webcontrols/dbpage2.aspx (revision 154071)
+++ test/1.1/webcontrols/dbpage2.aspx (working copy)
@@ -36,12 +36,12 @@
Version ver = Environment.Version;
if (providerAssembly == null || providerAssembly == )
if (ver.Major == 1)
-providerAssembly = Mono.Data.SqliteClient,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
+providerAssembly = Mono.Data.Sqlite,
Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
else if (ver.Major == 2)
-providerAssembly = Mono.Data.SqliteClient,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
+providerAssembly = Mono.Data.Sqlite,
Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756;
if (cncTypeName == null || cncTypeName == )
- cncTypeName = Mono.Data.SqliteClient.SqliteConnection;
+ cncTypeName = Mono.Data.Sqlite.SqliteConnection;
if (cncString == null || cncString == ) {
string dbPath = Path.Combine (Path.GetDirectoryName
(Request.MapPath (Request.FilePath)), dbpage2.sqlite);
___
Mono-devel-list mailing list
Mono-devel-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-devel-list
[Mono-dev] [PATCH] MonoDevelop AddinAuthoring updated for some MD Core namespace renames or class moves
MonoDevelop AddinAuthoring updated for some MD Core namespace renames or
class moves
--
Jay
Index:
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinDescriptionView.cs
===
---
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinDescriptionView.cs
(revision 154234)
+++
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinDescriptionView.cs
(working copy)
@@ -2,9 +2,9 @@
using System;
using System.IO;
using MonoDevelop.Core;
-using MonoDevelop.Core.Gui;
using MonoDevelop.Ide.Gui.Content;
using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide;
using Mono.Addins;
using Mono.Addins.Description;
Index:
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinAuthoringService.cs
===
---
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinAuthoringService.cs
(revision 154234)
+++
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinAuthoringService.cs
(working copy)
@@ -34,6 +34,7 @@
using Mono.Addins.Setup;
using MonoDevelop.Core;
using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Ide;
using MonoDevelop.Ide.Gui;
using MonoDevelop.Ide.Gui.Content;
using MonoDevelop.Projects;
Index:
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/ExtensionEditorWidget.cs
===
---
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/ExtensionEditorWidget.cs
(revision 154234)
+++
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/ExtensionEditorWidget.cs
(working copy)
@@ -6,8 +6,7 @@
using Mono.Addins.Description;
using Gtk;
using MonoDevelop.Core;
-using MonoDevelop.Core.Gui;
-using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide;
using MonoDevelop.Components;
using MonoDevelop.Projects;
@@ -43,7 +42,7 @@
{
this.Build();
- pixAddin = ImageService.GetPixbuf
(MonoDevelop.Core.Gui.Stock.Addin, IconSize.Menu);
+ pixAddin = ImageService.GetPixbuf
(MonoDevelop.Ide.Gui.Stock.Addin, IconSize.Menu);
pixLocalAddin = ImageService.GetPixbuf
(md-addinauthoring-current-addin, IconSize.Menu);
pixExtensionPoint = ImageService.GetPixbuf
(md-extension-point, IconSize.Menu);
pixExtensionNode = ImageService.GetPixbuf
(md-extension-node, IconSize.Menu);
Index:
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/TypeCellEditor.cs
===
---
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/TypeCellEditor.cs
(revision 154234)
+++
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/TypeCellEditor.cs
(working copy)
@@ -31,7 +31,6 @@
using Gdk;
using System.Text;
using System.ComponentModel;
-using MonoDevelop.Core.Gui;
using MonoDevelop.Components.PropertyGrid;
namespace MonoDevelop.AddinAuthoring
Index:
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinOptionPanelWidget.cs
===
---
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinOptionPanelWidget.cs
(revision 154234)
+++
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/AddinOptionPanelWidget.cs
(working copy)
@@ -2,9 +2,9 @@
using System;
using MonoDevelop.Core;
using MonoDevelop.Projects;
-using MonoDevelop.Core.Gui;
-using MonoDevelop.Projects.Gui.Dialogs;
+using MonoDevelop.Ide;
using MonoDevelop.Ide.Gui;
+using MonoDevelop.Ide.Gui.Dialogs;
namespace MonoDevelop.AddinAuthoring
{
Index:
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/ExtensionSelectorDialog.cs
===
---
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/ExtensionSelectorDialog.cs
(revision 154234)
+++
extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring/ExtensionSelectorDialog.cs
(working copy)
@@ -5,7 +5,7 @@
using Mono.Addins;
using Mono.Addins.Description;
using MonoDevelop.Core;
-using MonoDevelop.Core.Gui;
+using MonoDevelop.Ide;
using MonoDevelop.Ide.Gui;
namespace MonoDevelop.AddinAuthoring
@@ -48,9 +48,9 @@
this.adesc = adesc;
this.isRoot = isRoot;
- pixCategory = ImageService.GetPixbuf
(MonoDevelop.Core.Gui.Stock.ClosedFolder, IconSize.Menu);
- pixNamespace = ImageService.GetPixbuf
(MonoDevelop.Core.Gui.Stock.NameSpace, IconSize.Menu);
- pixAddin = ImageService.GetPixbuf
(MonoDevelop.Core.Gui.Stock.Addin, IconSize.Menu);
+ pixCategory = ImageService.GetPixbuf
[Mono-dev] [PATCH] MonoDevelop remove Mono.Data
It wasn't getting used, it was needlessly referenced and needlessly imported with using statements. But Mono.Data is gone, so this is needed to build against a fresh mono trunk HEAD -- Jay Index: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.csproj === --- extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.csproj (revision 154234) +++ extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.csproj (working copy) @@ -69,9 +69,6 @@ Reference Include=Mono.TextEditor, Version=1.0.0.0, Culture=neutral Packagemonodevelop/Package /Reference -Reference Include=Mono.Data - SpecificVersionFalse/SpecificVersion -/Reference Reference Include=Mono.Data.Sqlite SpecificVersionFalse/SpecificVersion /Reference Index: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am === --- extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am (revision 154234) +++ extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/Makefile.am (working copy) @@ -7,7 +7,6 @@ -r:$(top_builddir)/build/MonoDevelop.Database.Components.dll \ -r:$(top_builddir)/build/MonoDevelop.Database.Designer.dll \ -r:$(top_builddir)/build/MonoDevelop.Database.Sql.dll \ - -r:Mono.Data \ -r:Mono.Data.Sqlite \ -r:System \ -r:System.Data ___ Mono-devel-list mailing list Mono-devel-list@lists.ximian.com http://lists.ximian.com/mailman/listinfo/mono-devel-list
[Mono-dev] [PATCH] debugger was using Mono.GetOptions
this patch pulls in Mono.Options and uses it instead of Mono.GetOptions.
--
Jay
Index: frontend/Interpreter.cs
===
--- frontend/Interpreter.cs (revision 154213)
+++ frontend/Interpreter.cs (working copy)
@@ -15,8 +15,6 @@
using Mono.Debugger.Languages;
using EE=Mono.Debugger.ExpressionEvaluator;
-using Mono.GetOptions;
-
namespace Mono.Debugger.Frontend
{
public class Interpreter : DebuggerMarshalByRefObject,
IInterruptionHandler, IDisposable
Index: frontend/ScriptingContext.cs
===
--- frontend/ScriptingContext.cs(revision 154213)
+++ frontend/ScriptingContext.cs(working copy)
@@ -12,8 +12,6 @@
using Mono.Debugger.Languages;
using EE = Mono.Debugger.ExpressionEvaluator;
-using Mono.GetOptions;
-
namespace Mono.Debugger.Frontend
{
public class ScriptingException : Exception
Index: configure.in
===
--- configure.in(revision 154213)
+++ configure.in(working copy)
@@ -146,7 +146,7 @@
AC_SUBST(BASE_DEPENDENCIES_LIBS)
## Versions of dependencies
-PKG_CHECK_MODULES(SERVER_DEPENDENCIES, mono = $MONO_REQUIRED_VERSION glib-2.0
= $GLIB_REQUIRED_VERSION $martin_deps)
+PKG_CHECK_MODULES(SERVER_DEPENDENCIES, mono-2 = $MONO_REQUIRED_VERSION
glib-2.0 = $GLIB_REQUIRED_VERSION $martin_deps)
AC_SUBST(SERVER_DEPENDENCIES_CFLAGS)
AC_SUBST(SERVER_DEPENDENCIES_LIBS)
@@ -160,7 +160,7 @@
CECIL_ASM=`pkg-config --variable=Libraries cecil`
AC_SUBST(CECIL_ASM)
-PKG_CHECK_MODULES(WRAPPER, mono = $MONO_REQUIRED_VERSION gthread-2.0 =
$GLIB_REQUIRED_VERSION)
+PKG_CHECK_MODULES(WRAPPER, mono-2 = $MONO_REQUIRED_VERSION gthread-2.0 =
$GLIB_REQUIRED_VERSION)
AC_SUBST(WRAPPER_CFLAGS)
AC_SUBST(WRAPPER_LIBS)
Index: build/Makefile.am
===
--- build/Makefile.am (revision 154213)
+++ build/Makefile.am (working copy)
@@ -95,7 +95,6 @@
AssemblyInfo.cs
TEST_FRAMEWORK_DEPS = \
- -r:Mono.GetOptions \
-r:./Mono.Debugger.dll \
-r:./Mono.Debugger.Frontend.dll \
-r:System.Runtime.Remoting \
@@ -115,25 +114,20 @@
$(top_builddir)/test/src/*.dll
SYMBOL_WRITER_DEPS = \
- -r:Mono.GetOptions \
-r:./Mono.Cecil.dll
SYMBOL_READER_DEPS = \
- -r:Mono.GetOptions \
-r:./Mono.Cecil.dll
DEBUGGER_DEPS = \
- -r:Mono.GetOptions \
-r:Mono.Debugger.SymbolWriter \
-r:System.Runtime.Serialization.Formatters.Soap \
-r:./Mono.Cecil.dll
MDB_DEPS = \
- -r:Mono.GetOptions \
-r:./Mono.Debugger.dll
TEST_DEPS = \
- -r:Mono.GetOptions \
-r:./Mono.Debugger.dll \
-r:./Mono.Debugger.Frontend.dll \
-r:./Mono.Debugger.Test.Framework.dll \
___
Mono-devel-list mailing list
Mono-devel-list@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-devel-list
