2008-10-08 Zoltan Varga <vargaz@gmail.com>

	* Makefile */Makefile build/profiles/*.make: Rename the 'default'
	profile to 'net_1_1'.

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

10 files changed, 16 insertions, 16 deletions

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 1dd62871a82..a0222f15529 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -89,7 +89,7 @@ common_dirs := \
 	CustomMarshalers		\
 	OpenSystem.C
 
-default_dirs :=		\
+net_1_1_dirs :=		\
 	FirebirdSql.Data.Firebird	\
 	Mono.Cecil			\
 	Mono.Cecil.Mdb		\
@@ -129,7 +129,7 @@ net_2_1_dirs := \
 net_3_5_dirs := \
 	System.Web.Extensions.Design
 
-default_SUBDIRS := $(common_dirs) $(default_dirs)
+net_1_1_SUBDIRS := $(common_dirs) $(net_1_1_dirs)
 net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs)
 net_2_1_bootstrap_SUBDIRS := corlib System Mono.CompilerServices.SymbolWriter
 net_2_1_raw_SUBDIRS := $(net_2_1_dirs)
@@ -137,7 +137,7 @@ net_3_5_SUBDIRS := $(net_3_5_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(common_dirs) $(default_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
+SUBDIRS = $(common_dirs) $(net_1_1_dirs) $(net_2_0_dirs) $(net_2_1_dirs) $(net_3_5_dirs)
 
 # These libraries below are either unimplemented or don't compile, but
 #BROKEN_SUBDIRS =
diff --git a/mcs/class/Mono.Security/Test/tools/sockethell/Makefile b/mcs/class/Mono.Security/Test/tools/sockethell/Makefile
index f4494c3674c..9a3641a4f2a 100644
--- a/mcs/class/Mono.Security/Test/tools/sockethell/Makefile
+++ b/mcs/class/Mono.Security/Test/tools/sockethell/Makefile
@@ -2,14 +2,14 @@ thisdir = class/Mono.Security/Test/tools/sockethell
 SUBDIRS = 
 include ../../../../../build/rules.make
 
-LOCAL_MCS_FLAGS = -r:System.dll -r:Mono.Security.dll -r:../../../../lib/default/nunit.framework.dll
+LOCAL_MCS_FLAGS = -r:System.dll -r:Mono.Security.dll -r:../../../../lib/net_1_1/nunit.framework.dll
 
 all-local install-local uninstall-local:
 
 test-local:
 
 run-test-local: SocketHell.dll
-	mono ../../../../lib/default/nunit-console.exe SocketHell.dll
+	mono ../../../../lib/net_1_1/nunit-console.exe SocketHell.dll
 
 clean-local:
 	rm -f *.dll *.mdb *.pdb TestResult.xml
diff --git a/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile b/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile
index 96ccddbc3fc..77f753da153 100644
--- a/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile
+++ b/mcs/class/System.Drawing/Test/DrawingTest/Test/Makefile
@@ -14,4 +14,4 @@ $(DRAWING_TEST_HELPER):
 	cp ../DrawingTestHelper/*.dll .
 
 run-test: Test.dll
-	MONO_PATH="../../../../../class/lib/default::$(MONO_PATH)" /home/andrews/monobuild/mono/runtime/mono-wrapper --debug ../../../../../class/lib/default/nunit-console.exe Test.dll $(NUNIT_FLAGS)
+	MONO_PATH="../../../../../class/lib/net_1_1::$(MONO_PATH)" /home/andrews/monobuild/mono/runtime/mono-wrapper --debug ../../../../../class/lib/net_1_1/nunit-console.exe Test.dll $(NUNIT_FLAGS)
diff --git a/mcs/class/System.EnterpriseServices/Makefile b/mcs/class/System.EnterpriseServices/Makefile
index aa9be7df359..27d35840cc5 100644
--- a/mcs/class/System.EnterpriseServices/Makefile
+++ b/mcs/class/System.EnterpriseServices/Makefile
@@ -6,7 +6,7 @@ LIBRARY = System.EnterpriseServices.dll
 LIB_MCS_FLAGS = /nowarn:0168 /nowarn:0162 /r:$(corlib)
 NO_TEST = yes
 
-ifneq (default, $(PROFILE))
+ifneq (net_1_1, $(PROFILE))
 LIB_MCS_FLAGS += /r:System.Transactions.dll
 endif
 
diff --git a/mcs/class/System.Security/Test/standalone_tests/Makefile b/mcs/class/System.Security/Test/standalone_tests/Makefile
index 08719c4ef15..b6259de7ad1 100644
--- a/mcs/class/System.Security/Test/standalone_tests/Makefile
+++ b/mcs/class/System.Security/Test/standalone_tests/Makefile
@@ -1,4 +1,4 @@
-PROFILE = default
+PROFILE = net_1_1
 RUNTIME = MONO_PATH=../../../lib/$(PROFILE) mono --debug 
 #XMLDSIG_EXE_OPTIONS =
 XMLDSIG_EXE_OPTIONS = --decent-reader
diff --git a/mcs/class/System.Web.Services/Test/standalone/Makefile b/mcs/class/System.Web.Services/Test/standalone/Makefile
index 40a8f3bc667..63b5c87579d 100644
--- a/mcs/class/System.Web.Services/Test/standalone/Makefile
+++ b/mcs/class/System.Web.Services/Test/standalone/Makefile
@@ -1,5 +1,5 @@
 MCS=mcs -g
-MONO=MONO_PATH=../../../lib/default mono
+MONO=MONO_PATH=../../../lib/net_1_1 mono
 sourcefile = proxies.sources
 
 tools: wstest.exe
@@ -71,7 +71,7 @@ test-clients: tests
 	rm -f somefile && touch somefile
 	(tail -f somefile | xsp --root server)&
 	sleep 2
-	-harness=../../../lib/default/nunit-console.exe; \
+	-harness=../../../lib/net_1_1/nunit-console.exe; \
 	if test -f $$harness; then :; else harness=../../../lib/nunit-console.exe; fi; \
 	$(MONO) $$harness System.Web.Services-standalone_test.dll
 	echo "" >> somefile
diff --git a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile
index f17b42926cd..5a5f67915dd 100644
--- a/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile
+++ b/mcs/class/System.Web/Test/mainsoft/MainsoftWebApp/Makefile
@@ -13,7 +13,7 @@ ifeq ($(PROFILE), net_2_0)
 	CSCOMPILE=gmcs
 	XSPSERVER=xsp2
 else
-	nunit_MONO_PATH="../../../../../class/lib/default"
+	nunit_MONO_PATH="../../../../../class/lib/net_1_1"
 	CSCOMPILE=mcs
 	XSPSERVER=xsp
 endif
@@ -23,10 +23,10 @@ TEST_PROG=bin/MainsoftWebApp.dll
 
 $(TEST_PROG) : 
 	$(CSCOMPILE) -target:library -recurse:./*.cs -r:System.Web.dll -r:System.Data.dll -r:System.Drawing.dll -out:$@
-

+
 run-xsp : $(TEST_PROG)
 	$(XSPSERVER) --port 8088 --applications /MainsoftWebApp:./ --nonstop
-	
+
 clean :
 	rm -f $(TEST_PROG)
 
diff --git a/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile b/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
index cd9fdeec903..c1df7c706c2 100644
--- a/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
+++ b/mcs/class/System.XML/Test/System.Xml.Schema/standalone_tests/Makefile
@@ -1,4 +1,4 @@
-PROFILE = default
+PROFILE = net_1_1
 RUNTIME = MONO_PATH=../../../../lib/$(PROFILE) mono --debug
 ifeq ($(PROFILE), net_2_0)
 	MCS = gmcs
diff --git a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
index fa2aff46501..9930b43817e 100644
--- a/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
+++ b/mcs/class/System.XML/Test/System.Xml.Xsl/standalone_tests/Makefile
@@ -16,7 +16,7 @@ ifeq ($(PROFILE), net_2_0)
 	nunit_MONO_PATH="../../../../../class/lib/net_2_0"
 	CSCOMPILE=gmcs
 else
-	nunit_MONO_PATH="../../../../../class/lib/default"
+	nunit_MONO_PATH="../../../../../class/lib/net_1_1"
 	CSCOMPILE=mcs
 endif
 
diff --git a/mcs/class/System.XML/Test/System.Xml/W3C/Makefile b/mcs/class/System.XML/Test/System.Xml/W3C/Makefile
index d325b5a3a83..01047b57ced 100644
--- a/mcs/class/System.XML/Test/System.Xml/W3C/Makefile
+++ b/mcs/class/System.XML/Test/System.Xml/W3C/Makefile
@@ -7,7 +7,7 @@ ifeq ($(PROFILE), net_2_0)
 	nunit_MONO_PATH="../../../../../class/lib/net_2_0"
 	CSCOMPILE=gmcs

 else
-	nunit_MONO_PATH="../../../../../class/lib/default"
+	nunit_MONO_PATH="../../../../../class/lib/net_1_1"
 	CSCOMPILE=mcs
 endif