diff options
author | Raja R Harinath <harinath@hurrynot.org> | 2008-02-17 20:54:22 +0300 |
---|---|---|
committer | Raja R Harinath <harinath@hurrynot.org> | 2008-02-17 20:54:22 +0300 |
commit | 264c06c08365188f3afb4b77cde389d73b1d9e70 (patch) | |
tree | 754fe6cd7398ed08b83499ae5065721cb686eefb /mcs/build | |
parent | 4216888bceaa873fc0e85d9496cced0cd81e49b8 (diff) | |
parent | bcb97912fdc8ae1b92a127f46359e84622813339 (diff) |
In .:
* Makefile (_boot_): Orchestrate the net_2_1 bootstrap.
(net_2_1_bootstrap_SUBDIRS, net_2_1_raw_SUBDIRS): New.
In build:
* profiles/net_2_1_bootstrap.make: New.
* profiles/net_2_1_raw.make: New. The untuned 2.1 profile.
* profiles/net_2_1.make: New. The tuned 2.1 profile.
* Makefile (PROFILES): Update.
In class:
* Makefile (net_3_5_dirs): Remove System.Xml.Linq, now that it's
built in the 2.0 profile.
In class/System:
* Makefile (CYCLIC_DEPS): New macro.
(CYCLIC_DEP_FILES): Use it to clean up handling of cyclic dependencies.
* net_2_1_raw_System.dll.sources: Rename from net_2_1_System.dll.sources.
* net_2_1_bootstrap_System.dll.sources: New.
In class/corlib:
* Makefile (LIBRARY_COMPILE) [net_2_1]: Remove special case.
In errors:
* Makefile: Enable testing net_2_1 profile.
In mcs:
* Makefile (GMCS_PROFILE): Remove.
(COMPILER_NAME): New helper.
In tests:
* Makefile: Enable smcs testing.
In tools:
* Makefile (net_2_1_raw_SUBDIRS): New.
In tools/compiler-tester:
* Makefile [PROFILE=net_2_1]: Copy file from net_2_1_raw profile.
* compiler-tester.cs: Work better with 'net_2_1' profiles.
In tools/tuner:
* Makefile: Improve. Update to new net_2_1 profiles. Specify
more dependencies. Do work only when necessary.
* Descriptors/smcs.xml: Add CompilerCallableEntryPoint.
svn path=/trunk/mcs/; revision=95989
Diffstat (limited to 'mcs/build')
-rw-r--r-- | mcs/build/ChangeLog | 7 | ||||
-rw-r--r-- | mcs/build/Makefile | 2 | ||||
-rw-r--r-- | mcs/build/profiles/net_2_1.make | 10 | ||||
-rw-r--r-- | mcs/build/profiles/net_2_1_bootstrap.make | 17 | ||||
-rw-r--r-- | mcs/build/profiles/net_2_1_raw.make | 19 |
5 files changed, 51 insertions, 4 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index 5110a9f9afe..4b1c0f2b8c0 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,10 @@ +2008-02-17 Raja R Harinath <harinath@hurrynot.org> + + * profiles/net_2_1_bootstrap.make: New. + * profiles/net_2_1_raw.make: New. The untuned 2.1 profile. + * profiles/net_2_1.make: New. The tuned 2.1 profile. + * Makefile (PROFILES): Update. + 2007-12-06 Atsushi Enomoto <atsushi@ximian.com> * profiles/net_3_5.make : fixed net_2_0 path. diff --git a/mcs/build/Makefile b/mcs/build/Makefile index 47cbfe0bd22..e475f2b4111 100644 --- a/mcs/build/Makefile +++ b/mcs/build/Makefile @@ -21,6 +21,8 @@ PROFILES = \ default \ net_2_0_bootstrap \ net_2_0 \ + net_2_1_bootstrap \ + net_2_1_raw \ net_2_1 \ net_1_0 \ net_3_5 diff --git a/mcs/build/profiles/net_2_1.make b/mcs/build/profiles/net_2_1.make index 9bcf6dfac29..f6a58a5c348 100644 --- a/mcs/build/profiles/net_2_1.make +++ b/mcs/build/profiles/net_2_1.make @@ -1,10 +1,12 @@ #! -*- makefile -*- -INTERNAL_SMCS = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack $(topdir)/class/lib/net_2_1/smcs.exe +my_runtime = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack +INTERNAL_SMCS = $(my_runtime) $(topdir)/class/lib/$(PROFILE)/smcs.exe -BOOTSTRAP_PROFILE = net_2_1 -BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_2_1$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS) -MCS = MONO_PATH="$(topdir)/class/lib/net_2_1$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS) +BOOTSTRAP_PROFILE = net_2_1_bootstrap + +BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(my_runtime) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/smcs.exe +MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS) profile-check: @: diff --git a/mcs/build/profiles/net_2_1_bootstrap.make b/mcs/build/profiles/net_2_1_bootstrap.make new file mode 100644 index 00000000000..be05dd87452 --- /dev/null +++ b/mcs/build/profiles/net_2_1_bootstrap.make @@ -0,0 +1,17 @@ +#! -*- makefile -*- + +INTERNAL_SMCS = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack $(topdir)/class/lib/$(PROFILE)/smcs.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) + +profile-check: + @: + +PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 +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_1_raw.make b/mcs/build/profiles/net_2_1_raw.make new file mode 100644 index 00000000000..f6a58a5c348 --- /dev/null +++ b/mcs/build/profiles/net_2_1_raw.make @@ -0,0 +1,19 @@ +#! -*- makefile -*- + +my_runtime = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack +INTERNAL_SMCS = $(my_runtime) $(topdir)/class/lib/$(PROFILE)/smcs.exe + +BOOTSTRAP_PROFILE = net_2_1_bootstrap + +BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(my_runtime) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/smcs.exe +MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_SMCS) + +profile-check: + @: + +PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 +FRAMEWORK_VERSION = 2.1 +NO_TEST = yes + +# the tuner takes care of the install +NO_INSTALL = yes |