Change 4.0 profile to metadata reference only profile

diff --git a/.gitmodules b/.gitmodules
index f81b6c6dc718351485fe148349f9182a299bac38..e8c29dd0a0baab67e7f8316361cc5c64929ac5bf 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
 [submodule "external/referencesource"]
        path = external/referencesource
        url = git://github.com/mono/referencesource
+[submodule "external/reference-assemblies"]
+       path = external/reference-assemblies
+       url = git://github.com/mono/reference-assemblies.git

diff --git a/mcs/Makefile b/mcs/Makefile
index 350756a661b4e62ef62de08651676f9dc6ad29a7..f85356e7f37b45a48c028cbf475c7b7563f031d8 100644 (file)
--- a/mcs/Makefile
+++ b/mcs/Makefile
@@ -107,7 +107,7 @@ profiles-do--run-test:
 _boot_ = all clean install
 $(_boot_:%=profile-do--xbuild_14--%):         profile-do--xbuild_14--%:         profile-do--net_4_5--%
 $(_boot_:%=profile-do--xbuild_12--%):         profile-do--xbuild_12--%:         profile-do--net_4_5--%
-$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--net_4_5--%
+$(_boot_:%=profile-do--net_4_0--%):           profile-do--net_4_0--%:           profile-do--build--%
 $(_boot_:%=profile-do--net_4_5--%):           profile-do--net_4_5--%:           profile-do--build--%
 $(_boot_:%=profile-do--monodroid--%):         profile-do--monodroid--%:         profile-do--build--%
 $(_boot_:%=profile-do--monotouch--%):         profile-do--monotouch--%:         profile-do--build--%

diff --git a/mcs/build/common/Consts.cs.in b/mcs/build/common/Consts.cs.in
index b17eeabc70349549c95337705a9b5f074cf2fcd3..467b4d156c6a26de9a1028f3fe4c09f326d5b96e 100644 (file)
--- a/mcs/build/common/Consts.cs.in
+++ b/mcs/build/common/Consts.cs.in
@@ -52,11 +52,7 @@ static class Consts
        public const string VsVersion = "0.0.0.0"; // Useless ?
        public const string VsFileVersion = "11.0.0.0"; // TODO:
 #elif NET_4_0
-       public const string FxVersion = "4.0.0.0";
-       public const string FxFileVersion = "4.0.30319.1";
-       
-       public const string VsVersion = "0.0.0.0"; // Useless ?
-       public const string VsFileVersion = "10.0.0.0"; // TODO:
+       #error Profile NET_4_0 is not supported.
 #elif NET_3_5
        #error Profile NET_3_5 is not supported.
 #elif NET_3_0

diff --git a/mcs/build/profiles/net_4_0.make b/mcs/build/profiles/net_4_0.make
index 032ed752a7ed1cdc5f6e36fd34eeb9b1ba7a373b..83e22c4dcb037b64d9c031369dfa0eb04e1de932 100644 (file)
--- a/mcs/build/profiles/net_4_0.make
+++ b/mcs/build/profiles/net_4_0.make
@@ -1,26 +1,12 @@
 # -*- makefile -*-
 
-BOOTSTRAP_PROFILE = build
-TOOLS_PROFILE = net_4_5
-
-BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
-
-INTERNAL_RESGEN = $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(TOOLS_PROFILE)/resgen.exe
-RESGEN = MONO_PATH="$(topdir)/class/lib/$(TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
-
-# nuttzing!
-
 profile-check:
        @:
 
-DEFAULT_REFERENCES = -r:mscorlib.dll
-PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699,1635 -warn:1 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) --metadata-only
-
 FRAMEWORK_VERSION = 4.0
 XBUILD_VERSION = 4.0
 
 LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
-# Ignore tests on net_4_0 as the 4.0 IL code is never used for running (just for metadata), so it doesn't make sense to execute tests there
-NO_TEST = yes
\ No newline at end of file
+NO_BUILD = yes
+NO_TEST = yes

diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index cb71bb3c36c29cdb5ff70c2da6878825fcc5c4d1..dd84b83acda77e01b2e8e84d59d7694a952bbc05 100644 (file)
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -233,7 +233,7 @@ monotouch_runtime_SUBDIRS := $(monotouch_runtime_dirs)
 mobile_static_SUBDIRS := $(mobile_static_dirs)
 mobile_SUBDIRS := $(mobile_dynamic_dirs)
 xammac_SUBDIRS := $(xammac_dirs)
-net_4_0_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(xbuild_4_0_dirs)
+net_4_0_SUBDIRS := reference-assemblies
 net_4_5_SUBDIRS := $(net_2_0_dirs) $(net_4_0_dirs) $(net_4_5_dirs) $(xbuild_4_0_dirs) aot-compiler
 xbuild_12_SUBDIRS := $(xbuild_4_0_dirs)
 xbuild_14_SUBDIRS := $(xbuild_4_0_dirs)
@@ -242,7 +242,7 @@ 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_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

diff --git a/mcs/class/reference-assemblies/Makefile b/mcs/class/reference-assemblies/Makefile
new file mode 100644 (file)
index 0000000..26102cb
--- /dev/null
+++ b/mcs/class/reference-assemblies/Makefile
@@ -0,0 +1,9 @@
+thisdir = class/reference-assemblies
+
+include ../../build/rules.make
+
+all-local:
+
+install-local:
+       $(MKINSTALLDIRS) $(DESTDIR)$(LIBRARY_INSTALL_DIR)
+       $(INSTALL_LIB) ../../../external/reference-assemblies/v4.0/* $(DESTDIR)$(LIBRARY_INSTALL_DIR)