Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/Makefile

@@ -16,94 +16,6 @@ build_SUBDIRS :=  \
 	Mono.Posix \
 	System.Core
 
-net_2_0_dirs := \
-	corlib				\
-	System				\
-	System.XML			\
-	Mono.CompilerServices.SymbolWriter \
-	Mono.Posix			\
-	System.Core			\
-	Mono.Security			\
-	System.Security			\
-	System.Configuration		\
-	I18N				\
-	$(resgen_dir)			\
-	System.Drawing			\
-	System.Transactions		\
-	System.EnterpriseServices	\
-	Mono.Data.Tds			\
-	System.Data			\
-	Accessibility			\
-	Mono.WebBrowser			\
-	System.Runtime.Serialization.Formatters.Soap \
-	Managed.Windows.Forms		\
-	Mono.Data.Sqlite		\
-	System.Web.ApplicationServices	\
-	System.Web			\
-	System.Web.Services		\
-	System.Runtime.Remoting		\
-	System.Configuration.Install 	\
-	System.Management		\
-	System.Data.OracleClient	\
-	Microsoft.VisualC		\
-	Cscompmgd			\
-	PEAPI				\
-	Npgsql				\
-	Commons.Xml.Relaxng		\
-	Novell.Directory.Ldap		\
-	Mono.Security.Win32		\
-	System.DirectoryServices	\
-	System.DirectoryServices.Protocols	\
-	RabbitMQ.Client			\
-	Mono.Messaging			\
-	System.Messaging	        \
-	Mono.Messaging.RabbitMQ		\
-	System.ServiceProcess           \
-	System.Drawing.Design		\
-	System.Design			\
-	ICSharpCode.SharpZipLib		\
-	Mono.Http			\
-	Mono.Cairo                      \
-	IBM.Data.DB2			\
-	CustomMarshalers		\
-	Mono.Cecil			\
-	Mono.Cecil.Mdb			\
-	Mono.Debugger.Soft		\
-	SystemWebTestShim			\
-	System.Xml.Linq			\
-	System.Runtime.Serialization	\
-	System.Data.DataSetExtensions	\
-	System.Data.Linq		\
-	System.Web.Abstractions		\
-	System.Web.Routing		\
-	System.IdentityModel		\
-	System.IdentityModel.Selectors	\
-	System.ServiceModel		\
-	System.Web.Extensions		\
-	System.Web.Extensions.Design	\
-	System.ComponentModel.DataAnnotations	\
-	System.Web.DynamicData		\
-	System.Web.Mvc2			\
-	Mono.C5				\
-	Mono.Management			\
-	Mono.Options 			\
-	Mono.Simd			\
-	Mono.Tasklets       		\
-	System.Dynamic			\
-	Mono.CSharp			\
-	System.Net			\
-	System.Json
-
-net_2_0_only_dirs := \
-	System.Web.Extensions_1.0	\
-	System.Web.Extensions.Design_1.0\
-	Compat.ICSharpCode.SharpZipLib	\
-	WindowsBase			\
-	System.ServiceModel.Web 	\
-	System.Data.Services.Client	\
-	System.Data.Services		\
-	System.Web.Mvc \
-
 pcl_facade_dirs := Facades
 
 mobile_common_dirs := \
@@ -163,7 +75,81 @@ monotouch_runtime_dirs := \
 	System.XML \
 	Mono.CSharp
 
-net_4_0_dirs := \
+net_4_5_dirs := \
+	corlib				\
+	System				\
+	System.XML			\
+	Mono.CompilerServices.SymbolWriter \
+	Mono.Posix			\
+	System.Core			\
+	Mono.Security			\
+	System.Security			\
+	System.Configuration		\
+	I18N				\
+	$(resgen_dir)			\
+	System.Drawing			\
+	System.Transactions		\
+	System.EnterpriseServices	\
+	Mono.Data.Tds			\
+	System.Data			\
+	System.ComponentModel.DataAnnotations	\
+	Accessibility			\
+	Mono.WebBrowser			\
+	System.Runtime.Serialization.Formatters.Soap \
+	Managed.Windows.Forms		\
+	Mono.Data.Sqlite		\
+	System.Web.ApplicationServices	\
+	System.Web			\
+	System.Web.Services		\
+	System.Runtime.Remoting		\
+	System.Configuration.Install 	\
+	System.Management		\
+	System.Data.OracleClient	\
+	Microsoft.VisualC		\
+	Cscompmgd			\
+	PEAPI				\
+	Commons.Xml.Relaxng		\
+	Novell.Directory.Ldap		\
+	Mono.Security.Win32		\
+	System.DirectoryServices	\
+	System.DirectoryServices.Protocols	\
+	RabbitMQ.Client			\
+	Mono.Messaging			\
+	System.Messaging	        \
+	Mono.Messaging.RabbitMQ		\
+	System.ServiceProcess           \
+	System.Drawing.Design		\
+	System.Design			\
+	ICSharpCode.SharpZipLib		\
+	Mono.Http			\
+	Mono.Cairo                      \
+	IBM.Data.DB2			\
+	CustomMarshalers		\
+	Mono.Cecil			\
+	Mono.Cecil.Mdb			\
+	Mono.Debugger.Soft		\
+	SystemWebTestShim			\
+	System.Xml.Linq			\
+	System.Runtime.Serialization	\
+	System.Data.DataSetExtensions	\
+	System.Data.Linq		\
+	System.Web.Abstractions		\
+	System.Web.Routing		\
+	System.IdentityModel		\
+	System.IdentityModel.Selectors	\
+	System.ServiceModel		\
+	System.Web.Extensions		\
+	System.Web.Extensions.Design	\
+	System.Web.DynamicData		\
+	Mono.C5				\
+	Mono.Management			\
+	Mono.Options 			\
+	Mono.Simd			\
+	Mono.Tasklets       		\
+	System.Dynamic			\
+	Mono.CSharp			\
+	System.Net			\
+	System.Json		\
 	System.Numerics		\
 	Microsoft.CSharp	\
 	System.Windows.Forms.DataVisualization	\
@@ -192,12 +178,8 @@ net_4_0_dirs := \
 	System.Data.Services.Client	\
 	System.Data.Services \
 	System.Json.Microsoft \
-	monodoc
-
-net_4_0_only_dirs := \
-	System.ComponentModel.Composition
-
-net_4_5_dirs := \
+	System.Data.Entity \
+	monodoc	\
 	System.Threading.Tasks.Dataflow \
 	System.ComponentModel.Composition.4.5 \
 	System.Net.Http	\
@@ -211,8 +193,6 @@ net_4_5_dirs := \
 	System.Web.Http \
 	System.Web.Http.SelfHost \
 	System.Web.Http.WebHost \
-	EntityFramework	\
-	EntityFramework.SqlServer	\
 	Mono.CodeContracts \
 	System.IO.Compression \
 	System.IO.Compression.FileSystem \
@@ -231,23 +211,22 @@ xbuild_4_0_dirs := \
 	$(xbuild_2_0_dirs)	\
 	Microsoft.Build
 
-net_2_0_SUBDIRS := $(net_2_0_dirs) $(net_2_0_only_dirs) $(xbuild_2_0_dirs) aot-compiler
 monodroid_SUBDIRS := $(monodroid_dirs)
 monotouch_SUBDIRS := $(monotouch_dirs)
 monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
-net_3_5_SUBDIRS := $(xbuild_2_0_dirs)
-net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(xbuild_4_0_dirs)
-net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
+net_4_0_SUBDIRS := reference-assemblies
+net_4_5_SUBDIRS := $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
+xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
 
 include ../build/rules.make
 
-SUBDIRS = $(net_2_0_dirs) $(net_2_0_only_dirs) $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_0_dirs) $(net_4_0_only_dirs) $(net_4_5_dirs)
+SUBDIRS = $(mobile_static_dirs) $(mobile_dynamic_dirs) $(monotouch_dirs) $(monodroid_dirs) $(xammac_dirs) $(net_4_5_dirs)
 
-DIST_ONLY_SUBDIRS = dlr aot-compiler $(xbuild_4_0_dirs)
+DIST_ONLY_SUBDIRS = dlr aot-compiler reference-assemblies $(xbuild_4_0_dirs)
 
 # No new makefiles for: System.Messaging, System.Web.Mobile,
 # System.ServiceProcess