diff options
| author | Joe Shaw <joeshaw@novell.com> | 2005-01-12 17:31:08 +0000 |
|---|---|---|
| committer | Joe Shaw <joeshaw@novell.com> | 2005-01-12 17:31:08 +0000 |
| commit | 2388bc86ee7e2b01f36ec6711608601f538eb712 (patch) | |
| tree | 5caf538e68abbf177b638c501db1de880170719a | |
| parent | ed3cfaec212027b3c5adfe805378f42c642d463c (diff) | |
| download | dbus-2388bc86ee7e2b01f36ec6711608601f538eb712.tar.gz | |
2005-01-12 Joe Shaw <joeshaw@novell.com>
* mono/Makefile.am: Always build the dbus DLL with --debug.
* mono/Arguments.cs (GetDBusTypeConstructor): If the type
is an enum, get the enum's underlying type. Another mono
1.1.3 fix.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | mono/Arguments.cs | 2 | ||||
| -rw-r--r-- | mono/Makefile.am | 4 |
3 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2005-01-12 Joe Shaw <joeshaw@novell.com> + + * mono/Makefile.am: Always build the dbus DLL with --debug. + + * mono/Arguments.cs (GetDBusTypeConstructor): If the type + is an enum, get the enum's underlying type. Another mono + 1.1.3 fix. + 2005-01-11 Joe Shaw <joeshaw@novell.com> Patch from Sjoerd Simons <sjoerd@luon.net> diff --git a/mono/Arguments.cs b/mono/Arguments.cs index d78fbff2..b68ed5a3 100644 --- a/mono/Arguments.cs +++ b/mono/Arguments.cs @@ -165,6 +165,8 @@ namespace DBus if (type.IsArray) constructorType = typeof (System.Array); + else if (type.IsEnum) + constructorType = Enum.GetUnderlyingType (type); else constructorType = type.UnderlyingSystemType; diff --git a/mono/Makefile.am b/mono/Makefile.am index 12c9faa5..0b52050b 100644 --- a/mono/Makefile.am +++ b/mono/Makefile.am @@ -51,10 +51,10 @@ DISTCLEANFILES=AssemblyInfo.cs $(ASSEMBLY).config $(ASSEMBLY) all-am: $(TARGET) dbus-sharp.dll: $(DBUS_SHARP_FILES) - $(CSC) --unsafe --target library -o dbus-sharp.dll $(DBUS_SHARP_FILES) AssemblyInfo.cs + $(CSC) --debug --unsafe --target library -o dbus-sharp.dll $(DBUS_SHARP_FILES) AssemblyInfo.cs test-dbus-sharp.exe: $(TEST_DBUS_SHARP_FILES) - $(CSC) --unsafe --target exe -L . -r dbus-sharp.dll -pkg:gtk-sharp -o test-dbus-sharp.exe $(TEST_DBUS_SHARP_FILES) + $(CSC) --debug --unsafe --target exe -L . -r dbus-sharp.dll -pkg:gtk-sharp -o test-dbus-sharp.exe $(TEST_DBUS_SHARP_FILES) clean: rm -f $(TARGET) $(NOINST_EXES) |