Remove no longer used bootstrap profiles

diff --git a/mcs/build/Makefile b/mcs/build/Makefile
index 69721f73b689fbdff8d9c4bb0ef2d67cf4e4f1cc..f90c8b89626c1e456e07e928a656cbb11695dc20 100644 (file)
--- a/mcs/build/Makefile
+++ b/mcs/build/Makefile
@@ -17,13 +17,10 @@ common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
 PLATFORMS = darwin linux win32
 PROFILES = \
        basic \
-       net_2_0_bootstrap \
        net_2_0 \
-       moonlight_bootstrap \
        moonlight_raw \
        moonlight \
        net_3_5 \
-       net_4_0_bootstrap \
        net_4_0 
 
 COMMON_SRCS = \

diff --git a/mcs/build/profiles/monodroid_bootstrap.make b/mcs/build/profiles/monodroid_bootstrap.make
deleted file mode 100644 (file)
index 60fe305..0000000
--- a/mcs/build/profiles/monodroid_bootstrap.make
+++ /dev/null
@@ -1,21 +0,0 @@
-#! -*- makefile -*-
-
-INTERNAL_SMCS = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack $(topdir)/class/lib/$(PROFILE)/smcs.exe
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/basic/gmcs.exe
-
-BOOTSTRAP_PROFILE = net_2_0
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
-
-# We can enable this if System.dll depends on features of the mscorlib.dll from this profile
-#PROFILE_MCS_HAS_BOOTSTRAP_FALLBACK = yes
-
-profile-check:
-       @:
-
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOBILE -d:MONODROID
-FRAMEWORK_VERSION = 2.1
-NO_TEST = yes
-
-# the tuner takes care of the install
-NO_INSTALL = yes

diff --git a/mcs/build/profiles/monotouch_bootstrap.make b/mcs/build/profiles/monotouch_bootstrap.make
deleted file mode 100644 (file)
index e955b1e..0000000
--- a/mcs/build/profiles/monotouch_bootstrap.make
+++ /dev/null
@@ -1,21 +0,0 @@
-#! -*- makefile -*-
-
-INTERNAL_SMCS = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack $(topdir)/class/lib/$(PROFILE)/smcs.exe
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/basic/gmcs.exe
-
-BOOTSTRAP_PROFILE = net_2_0
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
-
-# We can enable this if System.dll depends on features of the mscorlib.dll from this profile
-#PROFILE_MCS_HAS_BOOTSTRAP_FALLBACK = yes
-
-profile-check:
-       @:
-
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOBILE -d:MONOTOUCH
-FRAMEWORK_VERSION = 2.1
-NO_TEST = yes
-
-# the tuner takes care of the install
-NO_INSTALL = yes

diff --git a/mcs/build/profiles/moonlight_bootstrap.make b/mcs/build/profiles/moonlight_bootstrap.make
deleted file mode 100644 (file)
index 0f285db..0000000
--- a/mcs/build/profiles/moonlight_bootstrap.make
+++ /dev/null
@@ -1,21 +0,0 @@
-#! -*- makefile -*-
-
-INTERNAL_SMCS = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack $(topdir)/class/lib/$(PROFILE)/smcs.exe
-INTERNAL_GMCS = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/basic/gmcs.exe
-
-BOOTSTRAP_PROFILE = basic
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS)
-
-# We can enable this if System.dll depends new features of the mscorlib.dll from this profile
-#PROFILE_MCS_HAS_BOOTSTRAP_FALLBACK = yes
-
-profile-check:
-       @:
-
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT
-FRAMEWORK_VERSION = 2.1
-NO_TEST = yes
-
-# the tuner takes care of the install
-NO_INSTALL = yes

diff --git a/mcs/build/profiles/net_2_0_bootstrap.make b/mcs/build/profiles/net_2_0_bootstrap.make
deleted file mode 100644 (file)
index f642d47..0000000
--- a/mcs/build/profiles/net_2_0_bootstrap.make
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- makefile -*-
-
-#
-# Note that we're using the .NET 1.1 MCS but MONO_PATH points to the net_2_0_bootstrap directory.
-# We do it this way to get assembly version references right.
-#
-BOOTSTRAP_PROFILE = basic
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
-MCS = $(BOOTSTRAP_MCS)
-
-profile-check: 
-
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0
-FRAMEWORK_VERSION = 2.0
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-NO_INSTALL = yes
-

diff --git a/mcs/build/profiles/net_4_0_bootstrap.make b/mcs/build/profiles/net_4_0_bootstrap.make
deleted file mode 100644 (file)
index d740366..0000000
--- a/mcs/build/profiles/net_4_0_bootstrap.make
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- makefile -*-
-
-BOOTSTRAP_PROFILE = net_2_0
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/gmcs.exe
-MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/dmcs.exe
-
-# we have BOOTSTRAP_PROFILE listed in the MONO_PATH of MCS
-PROFILE_MCS_HAS_BOOTSTRAP_FALLBACK = yes
-
-profile-check: 
-
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:BOOTSTRAP_NET_4_0
-FRAMEWORK_VERSION = 4.0
-NO_SIGN_ASSEMBLY = yes
-NO_TEST = yes
-NO_INSTALL = yes
-

diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile
index c85675d5c11afdc644542911be352c89d202232a..a6a6439d88ccc4bbbc886218b18eae746914e350 100644 (file)
--- a/mcs/class/System.Configuration/Makefile
+++ b/mcs/class/System.Configuration/Makefile
@@ -9,7 +9,7 @@ LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll -r:System.Security.
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
 
 # This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_4_0_bootstrap net_4_0, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_4_0_bootstrap net_4_0, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Configuration.dll
 NO_INSTALL = yes

diff --git a/mcs/class/System.Core/monodroid_System.Core.dll.sources b/mcs/class/System.Core/monodroid_System.Core.dll.sources
index a1b6e09476ded1d432d115d4a1da8f91e9d4455f..36b78e4db4b6b4a162fca28aa58dc69de15c30f1 100644 (file)
--- a/mcs/class/System.Core/monodroid_System.Core.dll.sources
+++ b/mcs/class/System.Core/monodroid_System.Core.dll.sources
@@ -1,2 +1,2 @@
-#include monodroid_bootstrap_System.Core.dll.sources
+#include mobile_System.Core.dll.sources
 System/TimeZoneInfo.Android.cs

diff --git a/mcs/class/System.Core/monodroid_bootstrap_System.Core.dll.sources b/mcs/class/System.Core/monodroid_bootstrap_System.Core.dll.sources
deleted file mode 100644 (file)
index 6a8b16b..0000000
--- a/mcs/class/System.Core/monodroid_bootstrap_System.Core.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.Core.dll.sources

diff --git a/mcs/class/System.Core/monotouch_System.Core.dll.sources b/mcs/class/System.Core/monotouch_System.Core.dll.sources
index f4ad2655dd330b2f6daaeec86f57a1c67654ed85..f8de2aacb32070bc238834b7057e4219dad1cbf4 100644 (file)
--- a/mcs/class/System.Core/monotouch_System.Core.dll.sources
+++ b/mcs/class/System.Core/monotouch_System.Core.dll.sources
@@ -1 +1,5 @@
-#include monotouch_bootstrap_System.Core.dll.sources
+#include mobile_System.Core.dll.sources
+System.Linq.jvm/Conversion.cs
+System.Linq.jvm/ExpressionInterpreter.cs
+System.Linq.jvm/Runner.cs
+System.Linq.jvm/Math.cs

diff --git a/mcs/class/System.Core/monotouch_bootstrap_System.Core.dll.sources b/mcs/class/System.Core/monotouch_bootstrap_System.Core.dll.sources
deleted file mode 100644 (file)
index f8de2aa..0000000
--- a/mcs/class/System.Core/monotouch_bootstrap_System.Core.dll.sources
+++ /dev/null
@@ -1,5 +0,0 @@
-#include mobile_System.Core.dll.sources
-System.Linq.jvm/Conversion.cs
-System.Linq.jvm/ExpressionInterpreter.cs
-System.Linq.jvm/Runner.cs
-System.Linq.jvm/Math.cs

diff --git a/mcs/class/System.Core/moonlight_bootstrap_System.Core.dll.sources b/mcs/class/System.Core/moonlight_bootstrap_System.Core.dll.sources
deleted file mode 100644 (file)
index 82f86b0..0000000
--- a/mcs/class/System.Core/moonlight_bootstrap_System.Core.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include moonlight_raw_System.Core.dll.sources

diff --git a/mcs/class/System.Core/net_4_0_bootstrap_System.Core.dll.sources b/mcs/class/System.Core/net_4_0_bootstrap_System.Core.dll.sources
deleted file mode 100644 (file)
index 7406bcc..0000000
--- a/mcs/class/System.Core/net_4_0_bootstrap_System.Core.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include net_4_0_System.Core.dll.sources

diff --git a/mcs/class/System.Transactions/Makefile b/mcs/class/System.Transactions/Makefile
index 275584fbaf0a6c6558a9c4662866f84a2f2106b7..95696e807507d11fc0856bb5130a6cae5edd9cb3 100644 (file)
--- a/mcs/class/System.Transactions/Makefile
+++ b/mcs/class/System.Transactions/Makefile
@@ -14,7 +14,7 @@ endif
 TEST_MCS_FLAGS = /nowarn:1595 $(LIB_MCS_FLAGS)
 
 # This is a .NET 2.0+ only assembly
-VALID_PROFILE := $(filter net_2_0_bootstrap net_2_0 net_4_0 monotouch monodroid, $(PROFILE))
+VALID_PROFILE := $(filter net_2_0 net_4_0 monotouch monodroid, $(PROFILE))
 ifndef VALID_PROFILE
 LIBRARY_NAME = dummy-System.Transactions.dll
 NO_INSTALL = yes

diff --git a/mcs/class/System/monodroid_System.dll.sources b/mcs/class/System/monodroid_System.dll.sources
index b39258ead9d21cadbd7ed3b9181250da6875ec2a..70a77a6dbff401e4d973b5d5f8ce11321a969f9a 100644 (file)
--- a/mcs/class/System/monodroid_System.dll.sources
+++ b/mcs/class/System/monodroid_System.dll.sources
@@ -1 +1 @@
-#include monodroid_bootstrap_System.dll.sources
+#include mobile_System.dll.sources

diff --git a/mcs/class/System/monodroid_bootstrap_System.dll.sources b/mcs/class/System/monodroid_bootstrap_System.dll.sources
deleted file mode 100644 (file)
index 70a77a6..0000000
--- a/mcs/class/System/monodroid_bootstrap_System.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include mobile_System.dll.sources

diff --git a/mcs/class/System/monotouch_System.dll.sources b/mcs/class/System/monotouch_System.dll.sources
index c3a408a05aad3fa29d2f2578211827f36a6863cc..8dce31d234c5b119f6502c1b4dbf3c9b3baf94c0 100644 (file)
--- a/mcs/class/System/monotouch_System.dll.sources
+++ b/mcs/class/System/monotouch_System.dll.sources
@@ -1 +1,2 @@
-#include monotouch_bootstrap_System.dll.sources
+#include mobile_System.dll.sources
+MonoTouch/MonoPInvokeCallbackAttribute.cs

diff --git a/mcs/class/System/monotouch_bootstrap_System.dll.sources b/mcs/class/System/monotouch_bootstrap_System.dll.sources
deleted file mode 100644 (file)
index 8dce31d..0000000
--- a/mcs/class/System/monotouch_bootstrap_System.dll.sources
+++ /dev/null
@@ -1,2 +0,0 @@
-#include mobile_System.dll.sources
-MonoTouch/MonoPInvokeCallbackAttribute.cs

diff --git a/mcs/class/System/moonlight_bootstrap_System.dll.sources b/mcs/class/System/moonlight_bootstrap_System.dll.sources
deleted file mode 100644 (file)
index f44e2a0..0000000
--- a/mcs/class/System/moonlight_bootstrap_System.dll.sources
+++ /dev/null
@@ -1,10 +0,0 @@
-../../build/common/Consts.cs
-../../build/common/Locale.cs
-../../build/common/MonoTODOAttribute.cs
-../corlib/System.Collections/CollectionDebuggerView.cs
-../corlib/System.Collections.Generic/CollectionDebuggerView.cs
-
-#include moonlight_shared_System.dll.sources
-
-System.Security.Cryptography.X509Certificates/X509_2_1_bootstrap.cs
-

diff --git a/mcs/class/corlib/monodroid_bootstrap_corlib.dll.sources b/mcs/class/corlib/monodroid_bootstrap_corlib.dll.sources
deleted file mode 100644 (file)
index b024074..0000000
--- a/mcs/class/corlib/monodroid_bootstrap_corlib.dll.sources
+++ /dev/null
@@ -1,2 +0,0 @@
-#include corlib.dll.sources
-

diff --git a/mcs/class/corlib/monodroid_corlib.dll.sources b/mcs/class/corlib/monodroid_corlib.dll.sources
deleted file mode 100644 (file)
index b14cc9c..0000000
--- a/mcs/class/corlib/monodroid_corlib.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monodroid_bootstrap_corlib.dll.sources

diff --git a/mcs/class/corlib/monotouch_bootstrap_corlib.dll.sources b/mcs/class/corlib/monotouch_bootstrap_corlib.dll.sources
deleted file mode 100644 (file)
index da77893..0000000
--- a/mcs/class/corlib/monotouch_bootstrap_corlib.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include corlib.dll.sources

diff --git a/mcs/class/corlib/monotouch_corlib.dll.sources b/mcs/class/corlib/monotouch_corlib.dll.sources
deleted file mode 100644 (file)
index 57c488d..0000000
--- a/mcs/class/corlib/monotouch_corlib.dll.sources
+++ /dev/null
@@ -1 +0,0 @@
-#include monotouch_bootstrap_corlib.dll.sources

diff --git a/mcs/class/corlib/moonlight_bootstrap_corlib.dll.sources b/mcs/class/corlib/moonlight_bootstrap_corlib.dll.sources
deleted file mode 100644 (file)
index 346a842..0000000
--- a/mcs/class/corlib/moonlight_bootstrap_corlib.dll.sources
+++ /dev/null
@@ -1,2 +0,0 @@
-#include moonlight_raw_corlib.dll.sources
-

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index 8117f1ae7a822e1b21a7b1a3ae46bcad17bade3f..dfa59d5f0b54c81fc1085f3f4a2bd46fe6897dd0 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -53,14 +53,12 @@ moonlight_dirs := \
        compiler-tester
 
 basic_SUBDIRS = gacutil security
-net_2_0_bootstrap_SUBDIRS = resgen culevel
 net_2_0_SUBDIRS := $(basic_SUBDIRS) $(net_2_0_dirs)
 moonlight_raw_SUBDIRS := $(moonlight_dirs)
 moonlight_SUBDIRS := $(moonlight_dirs)
-net_4_0_bootstrap_SUBDIRS = resgen culevel
 net_4_0_SUBDIRS := $(net_4_0_dirs) $(basic_SUBDIRS)
 
-SUBDIRS = $(basic_SUBDIRS) $(net_2_0_bootstrap_SUBDIRS) $(net_2_0_SUBDIRS) $(moonlight_SUBDIRS)
+SUBDIRS = $(basic_SUBDIRS) $(net_2_0_SUBDIRS) $(moonlight_SUBDIRS)
 DIST_SUBDIRS = $(SUBDIRS) $(net_4_0_dirs)
 
 include ../build/rules.make

diff --git a/mcs/tools/resgen/.cvsignore b/mcs/tools/resgen/.cvsignore
deleted file mode 100755 (executable)
index e76d6f6..0000000
--- a/mcs/tools/resgen/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-monoresgen.pdb\r
-*.mdb

diff --git a/mcs/tools/resgen/.gitattributes b/mcs/tools/resgen/.gitattributes
deleted file mode 100644 (file)
index 5e22e9a..0000000
--- a/mcs/tools/resgen/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-/.cvsignore -crlf