Imported Upstream version 2.10~rc1upstream/2.10_rc1

2 files changed, 70 insertions, 5 deletions

diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 24f9210dd8..ec9f357096 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -24,6 +24,20 @@ $(symlinks):
 
 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
+
+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
+endif
+
 if ONLY_MOONLIGHT
 build_profiles = moonlight_raw
 test_profiles = moonlight_raw
@@ -35,6 +49,16 @@ test_profiles = $(build_profiles)
 if MOONLIGHT
 build_profiles += moonlight_raw
 test_profiles += moonlight_raw
+
+moon-do-moonlight-raw: Makefile $(SUPPORT_FILES)
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' all-profiles
+
+moon-do-moonlight-raw-clean:
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' clean-profiles
+
+moon-do-build: moon-do-moonlight-raw moon-do-basic
+moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
+
 endif
 
 if INSTALL_4_0
@@ -42,6 +66,10 @@ build_profiles += net_4_0
 #test_profiles += net_4_0
 endif
 
+if INSTALL_MONODROID
+build_profiles += monodroid
+endif
+
 if INSTALL_MONOTOUCH
 build_profiles += monotouch
 endif
@@ -78,7 +106,7 @@ clean-local:
 
 endif BUILD_MCS
 
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
 
 # now a misnomer, but it'll go away soon enough.
 if ENABLE_NUNIT_TESTS
@@ -174,6 +202,12 @@ $(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile
 	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/al.exe"'" "$$@"' >> $@ ; \
 	chmod +x $@
 
+$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_4_0/al.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
 test-support-files: $(TEST_SUPPORT_FILES)
 	@:
 
diff --git a/runtime/Makefile.in b/runtime/Makefile.in
index 5622f38075..f4bca9738c 100644
--- a/runtime/Makefile.in
+++ b/runtime/Makefile.in
@@ -38,7 +38,8 @@ target_triplet = @target@
 @MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@am__append_3 = moonlight_raw
 @INSTALL_4_0_TRUE@@ONLY_MOONLIGHT_FALSE@am__append_4 = net_4_0
 #test_profiles += net_4_0
-@INSTALL_MONOTOUCH_TRUE@@ONLY_MOONLIGHT_FALSE@am__append_5 = monotouch
+@INSTALL_MONODROID_TRUE@@ONLY_MOONLIGHT_FALSE@am__append_5 = monodroid
+@INSTALL_MONOTOUCH_TRUE@@ONLY_MOONLIGHT_FALSE@am__append_6 = monotouch
 subdir = runtime
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(srcdir)/mono-wrapper.in $(srcdir)/monodis-wrapper.in
@@ -142,6 +143,7 @@ MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
 MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
+MOONLIGHT_DEFINES = @MOONLIGHT_DEFINES@
 MSGFMT = @MSGFMT@
 MSGFMT_015 = @MSGFMT_015@
 MSGMERGE = @MSGMERGE@
@@ -261,13 +263,15 @@ symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config \
 	etc/mono/2.0/Browsers/Compat.browser $(am__append_1)
 SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
 @ONLY_MOONLIGHT_FALSE@build_profiles = net_2_0 net_3_5 $(am__append_2) \
-@ONLY_MOONLIGHT_FALSE@	$(am__append_4) $(am__append_5)
+@ONLY_MOONLIGHT_FALSE@	$(am__append_4) $(am__append_5) \
+@ONLY_MOONLIGHT_FALSE@	$(am__append_6)
 @ONLY_MOONLIGHT_TRUE@build_profiles = moonlight_raw $(am__append_2) \
-@ONLY_MOONLIGHT_TRUE@	$(am__append_4) $(am__append_5)
+@ONLY_MOONLIGHT_TRUE@	$(am__append_4) $(am__append_5) \
+@ONLY_MOONLIGHT_TRUE@	$(am__append_6)
 @ONLY_MOONLIGHT_FALSE@test_profiles = $(build_profiles) \
 @ONLY_MOONLIGHT_FALSE@	$(am__append_3)
 @ONLY_MOONLIGHT_TRUE@test_profiles = moonlight_raw $(am__append_3)
-TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/gmcs $(tmpinst)/bin/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
 @ENABLE_NUNIT_TESTS_FALSE@test_select = ONLY_CENTUM_TESTS=yes
 
 # now a misnomer, but it'll go away soon enough.
@@ -441,6 +445,27 @@ etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
 $(symlinks):
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
+@MOONLIGHT_TRUE@moon-do-basic: Makefile $(SUPPORT_FILES)
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/class/Mono.Cecil && $(MAKE) PROFILE=basic
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/class/Mono.Cecil.Mdb && $(MAKE) PROFILE=basic
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/tools/linker && $(MAKE) PROFILE=basic
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/tools/tuner && $(MAKE) PROFILE=basic
+
+@MOONLIGHT_TRUE@moon-do-basic-clean:
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/class/Mono.Cecil && $(MAKE) PROFILE=basic clean
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/class/Mono.Cecil.Mdb && $(MAKE) PROFILE=basic clean
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/tools/linker && $(MAKE) PROFILE=basic clean
+@MOONLIGHT_TRUE@	cd $(mcs_topdir)/tools/tuner && $(MAKE) PROFILE=basic clean
+
+@MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@moon-do-moonlight-raw: Makefile $(SUPPORT_FILES)
+@MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' all-profiles
+
+@MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@moon-do-moonlight-raw-clean:
+@MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='moonlight_raw' CC='$(CC)' clean-profiles
+
+@MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@moon-do-build: moon-do-moonlight-raw moon-do-basic
+@MOONLIGHT_TRUE@@ONLY_MOONLIGHT_FALSE@moon-do-clean: moon-do-moonlight-raw-clean moon-do-basic-clean
+
 # The write check is to foil 'make distcheck'
 @BUILD_MCS_TRUE@all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
 @BUILD_MCS_TRUE@	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
@@ -538,6 +563,12 @@ $(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile
 	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_2_0/al.exe"'" "$$@"' >> $@ ; \
 	chmod +x $@
 
+$(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/net_4_0/al.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
 test-support-files: $(TEST_SUPPORT_FILES)
 	@:
 distdir: $(MYDISTFILES)