diff options
| -rw-r--r-- | mcs/Makefile | 2 | ||||
| -rw-r--r-- | mcs/build/Makefile | 1 | ||||
| -rw-r--r-- | mcs/build/library.make | 2 | ||||
| -rw-r--r-- | mcs/build/profiles/moonlight.make | 19 | ||||
| -rw-r--r-- | mcs/build/profiles/moonlight_raw.make | 7 | ||||
| -rw-r--r-- | mcs/class/Makefile | 6 | ||||
| -rw-r--r-- | runtime/Makefile.am | 10 |
7 files changed, 12 insertions, 35 deletions
diff --git a/mcs/Makefile b/mcs/Makefile index 65696ace3a7..f65f91f6bd5 100644 --- a/mcs/Makefile +++ b/mcs/Makefile @@ -107,7 +107,7 @@ $(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%: $(_boot_:%=profile-do--moonlight--%): profile-do--moonlight--%: profile-do--moonlight_raw--% $(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--% $(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--% -$(_boot_:%=profile-do--moonlight_raw--%): profile-do--moonlight_raw--%: profile-do--build--% +$(_boot_:%=profile-do--moonlight_raw--%): profile-do--moonlight_raw--%: $(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--% $(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--% diff --git a/mcs/build/Makefile b/mcs/build/Makefile index 414bb81c9f4..b6d41e0c05f 100644 --- a/mcs/build/Makefile +++ b/mcs/build/Makefile @@ -20,7 +20,6 @@ PROFILES = \ build \ net_2_0 \ moonlight_raw \ - moonlight \ net_3_5 \ net_4_0 diff --git a/mcs/build/library.make b/mcs/build/library.make index 4b14c263916..857c0a077ce 100644 --- a/mcs/build/library.make +++ b/mcs/build/library.make @@ -66,10 +66,12 @@ library_CLEAN_FILES += $(build_lib) $(build_lib).so $(build_lib).mdb $(build_lib ifdef NO_SIGN_ASSEMBLY SN = : else +ifeq ("$(SN)","") sn = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/sn.exe SN = $(Q) MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn) SNFLAGS = -q endif +endif ifeq ($(PLATFORM), win32) GACDIR = `cygpath -w $(mono_libdir)` diff --git a/mcs/build/profiles/moonlight.make b/mcs/build/profiles/moonlight.make deleted file mode 100644 index f3aba438b8f..00000000000 --- a/mcs/build/profiles/moonlight.make +++ /dev/null @@ -1,19 +0,0 @@ -#! -*- makefile -*- - -my_runtime = $(RUNTIME) $(RUNTIME_FLAGS) --security=temporary-smcs-hack -INTERNAL_SMCS = $(my_runtime) $(topdir)/class/lib/$(PROFILE)/smcs.exe - -BOOTSTRAP_PROFILE = moonlight_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 -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/moonlight_raw.make b/mcs/build/profiles/moonlight_raw.make index e808a94490b..7b98ae1204f 100644 --- a/mcs/build/profiles/moonlight_raw.make +++ b/mcs/build/profiles/moonlight_raw.make @@ -2,14 +2,15 @@ BOOTSTRAP_PROFILE = build -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) +BOOTSTRAP_MCS = mcs +MCS = $(BOOTSTRAP_MCS) profile-check: @: DEFAULT_REFERENCES = -r:mscorlib.dll -PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) +PROFILE_MCS_FLAGS = -lib:$(topdir)/class/lib/moonlight_raw -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:MOONLIGHT -d:SILVERLIGHT -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) +SN = sn FRAMEWORK_VERSION = 2.1 NO_TEST = yes diff --git a/mcs/class/Makefile b/mcs/class/Makefile index 7e550c6dad1..263dde8b7fe 100644 --- a/mcs/class/Makefile +++ b/mcs/class/Makefile @@ -125,7 +125,7 @@ net_2_0_only_dirs := \ WindowsBase \ System.Data.Services.Client -moonlight_dirs := \ +moonlight_raw_dirs := \ corlib \ System \ Mono.CompilerServices.SymbolWriter \ @@ -184,7 +184,7 @@ net_4_0_dirs := \ WebMatrix.Data net_2_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) aot-compiler -moonlight_raw_SUBDIRS := $(moonlight_dirs) +moonlight_raw_SUBDIRS := $(moonlight_raw_dirs) monodroid_SUBDIRS := $(mobile_dirs) monotouch_SUBDIRS := $(mobile_dirs) net_3_5_SUBDIRS := $(net_3_5_only_dirs) @@ -192,7 +192,7 @@ net_4_0_SUBDIRS := $(common_dirs) $(net_2_0_dirs) $(net_4_0_dirs) aot-compiler include ../build/rules.make -SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_dirs) $(mobile_dirs) $(net_4_0_dirs) +SUBDIRS = $(common_dirs) $(net_2_0_dirs) $(net_2_0_only_dirs) $(moonlight_raw_dirs) $(mobile_dirs) $(net_4_0_dirs) DIST_ONLY_SUBDIRS = dlr IKVM.Reflection aot-compiler diff --git a/runtime/Makefile.am b/runtime/Makefile.am index f7d508c2db0..d1072450db4 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -26,16 +26,10 @@ SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config if MOONLIGHT moon-do-basic: Makefile $(SUPPORT_FILES) - cd $(mcs_topdir)/class/Mono.Cecil && $(MAKE) PROFILE=basic - cd $(mcs_topdir)/class/Mono.Cecil.Mdb && $(MAKE) PROFILE=basic - cd $(mcs_topdir)/tools/linker && $(MAKE) PROFILE=basic - cd $(mcs_topdir)/tools/tuner && $(MAKE) PROFILE=basic + cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw moon-do-basic-clean: - cd $(mcs_topdir)/class/Mono.Cecil && $(MAKE) PROFILE=basic clean - cd $(mcs_topdir)/class/Mono.Cecil.Mdb && $(MAKE) PROFILE=basic clean - cd $(mcs_topdir)/tools/linker && $(MAKE) PROFILE=basic clean - cd $(mcs_topdir)/tools/tuner && $(MAKE) PROFILE=basic clean + cd $(mcs_topdir)/ && $(MAKE) NO_DIR_CHECK=1 PROFILE=moonlight_raw clean endif if ONLY_MOONLIGHT |