New build system from Peter Williams (peter@newton.cx)

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

5 files changed, 11 insertions, 108 deletions

diff --git a/mcs/class/System.Configuration.Install/Makefile b/mcs/class/System.Configuration.Install/Makefile
new file mode 100644
index 00000000000..d5415952acf
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Makefile
@@ -0,0 +1,11 @@
+thisdir = class/System.Configuration.Install
+SUBDIRS =
+include ../../build/rules.make
+
+LIBRARY = System.Configuration.Install.dll
+LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
+TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
+
+EXTRA_DISTFILES = Test/ChangeLog
+
+include ../../build/library.make
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.build b/mcs/class/System.Configuration.Install/System.Configuration.Install.build
deleted file mode 100644
index 2369da3e3af..00000000000
--- a/mcs/class/System.Configuration.Install/System.Configuration.Install.build
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!-- NAnt build file for System.Configuration.Install.dll -->
-
-<project name="System.Configuration.install" default="build">
-	<property name="debug" value="true"/>
-
-	<target name="build">
-		<mkdir dir="../lib"/>
-		<csc target="library" output="../lib/System.Configuration.Install.dll" debug="${debug}">
-			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
-			
-			<!-- cor compare dies with these currently -->
-			<!--arg value="/nostdlib"/--> 	<!-- don't reference mscorlib -->
-			<arg value="/r:mscorlib.dll"/>
-			<arg value="/r:System.dll"/>
-			<sources>
-				<includes name="**/*.cs"/> 
-				<excludes name="Test/**"/>
-			</sources>
-		</csc>
-		<copy file="../lib/System.Configuration.Install.dll" tofile="Test/System.Configuration.Install.dll"/>
-		<nant basedir="Test" target="build"/>
-	</target>
-
-	<target name="test" depends="build">
-		<nant basedir="Test" target="test"/>
-	</target>
-
-	<target name="clean">
-		<nant basedir="Test" target="clean"/>
-		<delete file="../lib/System.dll" failonerror="false"/>
-	</target>
-</project>
diff --git a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
deleted file mode 100644
index 960594ca0a9..00000000000
--- a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<!-- NAnt build file for System.Configuration.Install_test.dll -->
-<!-- Target build (default) builds tests -->
-<!-- Target test runs tests -->
-
-<project name="System_test" default="build">
-	<property name="debug" value="true"/>
-
-	<target name="build">
-	</target>
-
-	<target name="assemblies">
-		<csc target="library" output="System.Configuration.Install_test.dll" debug="${debug}">
-			<sources>
-				<includes name="**/*.cs"/>
-			</sources>
-
-			<arg value="/noconfig"/>
-		    	<arg value="/r:..\..\..\nunit20\NUnit.Framework.dll"/>
-		</csc>
-
-	</target>
-
-	<target name="test" depends="assemblies">
-		<exec program="..\..\..\nunit20\nunit-console.exe" commandline="System.Configuration.Install_test.dll" failonerror="false"/>
-	</target>
-
-	<target name="clean">
-		<delete file="System.Configuration.Install_test.dll" failonerror="false"/>
-		<delete file="System.Configuration.Install_test.pdb" failonerror="false"/>
-	</target>
-</project>
diff --git a/mcs/class/System.Configuration.Install/Test/makefile.gnu b/mcs/class/System.Configuration.Install/Test/makefile.gnu
deleted file mode 100644
index fb4566ef72a..00000000000
--- a/mcs/class/System.Configuration.Install/Test/makefile.gnu
+++ /dev/null
@@ -1,27 +0,0 @@
-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)/nunit20/NUnit.Framework.dll
-
-ifdef SUBDIR
-USE_SOURCE_RULES=1
-SOURCES_INCLUDE=./$(SUBDIR)/*.cs
-SOURCES_EXCLUDE=_DUMMY_
-endif
-
-include $(topdir)/class/library.make
-
-NUNITCONSOLE=$(topdir)/nunit20/nunit-console.exe
-MONO_PATH = $(topdir)/nunit20:.
-
-test: $(LIBRARY) run_test
-
-.PHONY: run_test
-
-run_test:
-	-MONO_PATH=$(MONO_PATH) mono --debug $(NUNITCONSOLE) $(LIBRARY)
diff --git a/mcs/class/System.Configuration.Install/makefile.gnu b/mcs/class/System.Configuration.Install/makefile.gnu
deleted file mode 100644
index 1cd8d871d21..00000000000
--- a/mcs/class/System.Configuration.Install/makefile.gnu
+++ /dev/null
@@ -1,14 +0,0 @@
-topdir = ../..
-
-TEST_DIR= Test
-LIBRARY = $(topdir)/class/lib/System.Configuration.Install.dll
-
-LIB_LIST = list.unix
-LIB_FLAGS = -r corlib -r System
-
-SOURCES_INCLUDE=*.cs
-SOURCES_EXCLUDE=./Test*
-
-export MONO_PATH_PREFIX = $(topdir)/class/lib:
-
-include $(topdir)/class/library.make