diff options
8 files changed, 79 insertions, 8 deletions
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.build b/mcs/class/System.Configuration.Install/System.Configuration.Install.build index 2305c545320..2369da3e3af 100644 --- a/mcs/class/System.Configuration.Install/System.Configuration.Install.build +++ b/mcs/class/System.Configuration.Install/System.Configuration.Install.build @@ -9,11 +9,11 @@ <mkdir dir="../lib"/> <csc target="library" output="../lib/System.Configuration.Install.dll" debug="${debug}"> <arg value="/noconfig"/> <!-- don't reference ms assemblies --> - <arg value="/lib:../lib/"/> <!-- cor compare dies with these currently --> <!--arg value="/nostdlib"/--> <!-- don't reference mscorlib --> - <arg value="/r:corlib.dll"/> + <arg value="/r:mscorlib.dll"/> + <arg value="/r:System.dll"/> <sources> <includes name="**/*.cs"/> <excludes name="Test/**"/> diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install/IManagedInstaller.cs b/mcs/class/System.Configuration.Install/System.Configuration.Install/IManagedInstaller.cs index b7570a2b89a..986c5b8d288 100644 --- a/mcs/class/System.Configuration.Install/System.Configuration.Install/IManagedInstaller.cs +++ b/mcs/class/System.Configuration.Install/System.Configuration.Install/IManagedInstaller.cs @@ -6,7 +6,7 @@ // (C) Alejandro Sánchez Acosta // -using System.Runtime.InteropService; +using System.Runtime.InteropServices; namespace System.Configuration.Installer { diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install/TODOAttribute.cs b/mcs/class/System.Configuration.Install/System.Configuration.Install/TODOAttribute.cs new file mode 100644 index 00000000000..1682ac8df6e --- /dev/null +++ b/mcs/class/System.Configuration.Install/System.Configuration.Install/TODOAttribute.cs @@ -0,0 +1,39 @@ +// +// TODOAttribute.cs +// +// Author: +// Ravi Pratap (ravi@ximian.com) +// +// (C) Ximian, Inc. http://www.ximian.com +// + +using System; + +namespace System.Configuration.Install { + + /// <summary> + /// The TODO attribute is used to flag all incomplete bits in our class libraries + /// </summary> + /// + /// <remarks> + /// Use this to decorate any element which you think is not complete + /// </remarks> + [AttributeUsage (AttributeTargets.All, AllowMultiple=true)] + public class MonoTODOAttribute : Attribute { + + private string comment; + + public MonoTODOAttribute () + {} + + public MonoTODOAttribute (string comment) + { + this.comment = comment; + } + + public string Comment + { + get { return comment; } + } + } +} diff --git a/mcs/class/System.Configuration.Install/Test/makefile.gnu b/mcs/class/System.Configuration.Install/Test/makefile.gnu new file mode 100644 index 00000000000..34211373291 --- /dev/null +++ b/mcs/class/System.Configuration.Install/Test/makefile.gnu @@ -0,0 +1,29 @@ +topdir = ../../.. + +LIBRARY = system_configuration_install_linux_test.dll + +LIB_LIST = system_configuration_install_linux_test.args +LIB_FLAGS = \ + -r $(topdir)/class/lib/corlib.dll \ + -r $(topdir)/class/lib/System.dll \ + -r $(topdir)/class/lib/NUnitCore_mono.dll + +SOURCES_INCLUDE=*.cs +SOURCES_EXCLUDE=_DUMMY_ + +include $(topdir)/class/library.make + +MCS_FLAGS = --target library --noconfig + +TEST_SUITE_PREFIX = MonoTests. +TEST_SUITE = AllTests +NUNITCONSOLE=$(topdir)/class/lib/NUnitConsole_mono.exe +MONO_PATH = $(topdir)/class/lib:. + + +test: $(LIBRARY) run_test + +.PHONY: run_test + +run_test: + -MONO_PATH=$(MONO_PATH) mono $(NUNITCONSOLE) $(TEST_SUITE_PREFIX)$(TEST_SUITE),system_configuration_install_linux_test.dll diff --git a/mcs/class/System.Configuration.Install/Test/system_configuration_install_linux_test.args b/mcs/class/System.Configuration.Install/Test/system_configuration_install_linux_test.args new file mode 100644 index 00000000000..319c3080e66 --- /dev/null +++ b/mcs/class/System.Configuration.Install/Test/system_configuration_install_linux_test.args @@ -0,0 +1,2 @@ +./AllTests.cs +./System.Configuration.Install/AllTests.cs diff --git a/mcs/class/System.Configuration.Install/makefile.gnu b/mcs/class/System.Configuration.Install/makefile.gnu index b5b21016add..1cd8d871d21 100644 --- a/mcs/class/System.Configuration.Install/makefile.gnu +++ b/mcs/class/System.Configuration.Install/makefile.gnu @@ -1,9 +1,10 @@ topdir = ../.. +TEST_DIR= Test LIBRARY = $(topdir)/class/lib/System.Configuration.Install.dll LIB_LIST = list.unix -LIB_FLAGS = -r corlib -r System.dll +LIB_FLAGS = -r corlib -r System SOURCES_INCLUDE=*.cs SOURCES_EXCLUDE=./Test* diff --git a/mcs/class/library.build b/mcs/class/library.build index 594a1081ef2..fea7581cc0c 100644 --- a/mcs/class/library.build +++ b/mcs/class/library.build @@ -24,7 +24,7 @@ <nant basedir="System.Web" target="build"/>
<nant basedir="System.Web.Services" target="build"/>
<nant basedir="Microsoft.VisualBasic" target="build"/>
- <!-- <nant basedir="System.Configuration.Install" target="build"/>-->
+ <nant basedir="System.Configuration.Install" target="build"/>
<nant basedir="System.Runtime.Remoting" target="build"/>
<nant basedir="System.Runtime.Serialization.Formatters.Soap" target="build"/>
<nant basedir="Mono.PEToolkit" target="build"/>
@@ -37,7 +37,7 @@ <nant basedir="System.Data" target="test"/>
<nant basedir="System.Web.Services" target="test"/>
<nant basedir="Microsoft.VisualBasic" target="test"/>
- <!-- <nant basedir="System.Configuration.Install" target="test"/>-->
+ <nant basedir="System.Configuration.Install" target="test"/>
</target>
<target name="clean">
@@ -61,7 +61,7 @@ <nant basedir="Mono.Data.TdsClient" target="clean"/>
<nant basedir="System.Web.Services" target="clean"/>
<nant basedir="Microsoft.VisualBasic" target="clean"/>
- <!-- <nant basedir="System.Configuration.Install" target="clean"/>-->
+ <nant basedir="System.Configuration.Install" target="clean"/>
<nant basedir="Mono.PEToolkit" target="clean"/>
</target>
</project>
diff --git a/mcs/class/makefile.gnu b/mcs/class/makefile.gnu index c313316d7af..f983846b10a 100644 --- a/mcs/class/makefile.gnu +++ b/mcs/class/makefile.gnu @@ -13,7 +13,7 @@ DIRS = corlib \ System.Web.Services \ System.Runtime.Remoting \ System.Runtime.Serialization.Formatters.Soap \ -# System.Configuration.Install \ + System.Configuration.Install \ Mono.CSharp.Debugger \ Mono.Data.MySql \ Mono.Data.PostgreSqlClient \ |