Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -29,7 +29,7 @@ build_profiles =
if INSTALL_4_x
build_profiles += binary_reference_assemblies net_4_x xbuild_12 xbuild_14
al_profile = net_4_x
net_profile = net_4_x
endif
if INSTALL_MONODROID
@@ -48,14 +48,26 @@ if INSTALL_MONOTOUCH_TV
build_profiles += monotouch_tv monotouch_tv_runtime
endif
if INSTALL_MOBILE_STATIC
build_profiles += mobile_static
if INSTALL_TESTING_AOT_HYBRID
build_profiles += testing_aot_hybrid
endif
if INSTALL_TESTING_AOT_FULL
build_profiles += testing_aot_full
endif
if INSTALL_WINAOT
build_profiles += winaot
endif
if INSTALL_XAMMAC
build_profiles += xammac xammac_net_4_5
endif
if INSTALL_ORBIS
build_profiles += orbis
endif
test_profiles = $(build_profiles)
if BUILD_MCS
@@ -88,7 +100,7 @@ clean-local:
endif BUILD_MCS
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/al
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc $(tmpinst)/bin/mcs $(tmpinst)/bin/al
mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
@@ -109,20 +121,20 @@ cur_dir_cmd = pwd
PLATFORM_PATH_SEPARATOR = :
endif
if INSTALL_MOBILE_STATIC
# ILASM.exe has features which a mobile_static runtime will not support.
if FULL_AOT_TESTS
# ILASM.exe has features which a testing_aot_full runtime will not support.
# It is invoked with an external mono when used in the runtime.
# We skip it here because otherwise it will fail to verify.
MOBILE_STATIC_FILTER=grep -v ilasm
FULL_AOT_TESTS_FILTER=grep -v ilasm
else
MOBILE_STATIC_FILTER=echo
FULL_AOT_TESTS_FILTER=echo
endif
# Compile all assemblies with the verifier turned on. Code must be valid but not verifiable.
# TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
# Skip binary_reference_assemblies because they contain metadata only
mcs-compileall: mono-wrapper etc/mono/config
export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(MOBILE_STATIC_FILTER)` ; \
export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(FULL_AOT_TESTS_FILTER)` ; \
save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
for profile in $(test_profiles); do \
if [ "binary_reference_assemblies" = "$$profile" ]; then \
@@ -177,10 +189,16 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
$(mkinstalldirs) $(tmpinst)/bin
cp mono-wrapper $@
$(tmpinst)/bin/csc: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$(CSC)"'" "$$@"' >> $@ ; \
chmod +x $@
$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe"'" "$$@"' >> $@ ; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(net_profile)/mcs.exe"'" "$$@"' >> $@ ; \
chmod +x $@
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
@@ -192,7 +210,7 @@ $(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
$(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/$(al_profile)/al.exe"'" "$$@"' >> $@ ; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(net_profile)/al.exe"'" "$$@"' >> $@ ; \
chmod +x $@
test-support-files: $(TEST_SUPPORT_FILES)

View File

@@ -85,8 +85,11 @@ target_triplet = @target@
@INSTALL_MONOTOUCH_TRUE@am__append_4 = monotouch monotouch_runtime
@INSTALL_MONOTOUCH_WATCH_TRUE@am__append_5 = monotouch_watch monotouch_watch_runtime
@INSTALL_MONOTOUCH_TV_TRUE@am__append_6 = monotouch_tv monotouch_tv_runtime
@INSTALL_MOBILE_STATIC_TRUE@am__append_7 = mobile_static
@INSTALL_XAMMAC_TRUE@am__append_8 = xammac xammac_net_4_5
@INSTALL_TESTING_AOT_HYBRID_TRUE@am__append_7 = testing_aot_hybrid
@INSTALL_TESTING_AOT_FULL_TRUE@am__append_8 = testing_aot_full
@INSTALL_WINAOT_TRUE@am__append_9 = winaot
@INSTALL_XAMMAC_TRUE@am__append_10 = xammac xammac_net_4_5
@INSTALL_ORBIS_TRUE@am__append_11 = orbis
subdir = runtime
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(srcdir)/mono-wrapper.in \
@@ -158,6 +161,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CMAKE = @CMAKE@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CSC = @CSC@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@@ -190,7 +194,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
HOST_CC = @HOST_CC@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -222,6 +225,7 @@ MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
MONO_CORLIB_VERSION = @MONO_CORLIB_VERSION@
MONO_DL_NEED_USCORE = @MONO_DL_NEED_USCORE@
MONO_NACL_ALIGN_MASK_OFF = @MONO_NACL_ALIGN_MASK_OFF@
MSGFMT = @MSGFMT@
@@ -350,23 +354,24 @@ symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config \
SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
build_profiles = $(am__append_2) $(am__append_3) $(am__append_4) \
$(am__append_5) $(am__append_6) $(am__append_7) \
$(am__append_8)
@INSTALL_4_x_TRUE@al_profile = net_4_x
$(am__append_8) $(am__append_9) $(am__append_10) \
$(am__append_11)
@INSTALL_4_x_TRUE@net_profile = net_4_x
test_profiles = $(build_profiles)
@BUILD_MCS_TRUE@MAKE_FLAGS = $(if $(V),,--no-print-directory -s)
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(tmpinst)/bin/al
TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc $(tmpinst)/bin/mcs $(tmpinst)/bin/al
@CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@cur_dir_cmd = cygpath -w -a .
@CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@cur_dir_cmd = pwd
@HOST_WIN32_FALSE@cur_dir_cmd = pwd
@CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@PLATFORM_PATH_SEPARATOR = ;
@CROSS_COMPILING_TRUE@@HOST_WIN32_TRUE@PLATFORM_PATH_SEPARATOR = :
@HOST_WIN32_FALSE@PLATFORM_PATH_SEPARATOR = :
@INSTALL_MOBILE_STATIC_FALSE@MOBILE_STATIC_FILTER = echo
@FULL_AOT_TESTS_FALSE@FULL_AOT_TESTS_FILTER = echo
# ILASM.exe has features which a mobile_static runtime will not support.
# ILASM.exe has features which a testing_aot_full runtime will not support.
# It is invoked with an external mono when used in the runtime.
# We skip it here because otherwise it will fail to verify.
@INSTALL_MOBILE_STATIC_TRUE@MOBILE_STATIC_FILTER = grep -v ilasm
@FULL_AOT_TESTS_TRUE@FULL_AOT_TESTS_FILTER = grep -v ilasm
CLEANFILES = etc/mono/config
# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
@@ -588,7 +593,7 @@ mcs-do-run-test-profiles: test-support-files
# TODO it would be nice to split assemblies without unsafe code to use the verifier with verifiable mode.
# Skip binary_reference_assemblies because they contain metadata only
mcs-compileall: mono-wrapper etc/mono/config
export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(MOBILE_STATIC_FILTER)` ; \
export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | $(FULL_AOT_TESTS_FILTER)` ; \
save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
for profile in $(test_profiles); do \
if [ "binary_reference_assemblies" = "$$profile" ]; then \
@@ -638,10 +643,16 @@ $(tmpinst)/bin/mono: mono-wrapper etc/mono/config
$(mkinstalldirs) $(tmpinst)/bin
cp mono-wrapper $@
$(tmpinst)/bin/csc: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$(CSC)"'" "$$@"' >> $@ ; \
chmod +x $@
$(tmpinst)/bin/mcs: $(tmpinst)/bin/mono Makefile
echo '#! /bin/sh' > $@ ; \
r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/build/mcs.exe"'" "$$@"' >> $@ ; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(net_profile)/mcs.exe"'" "$$@"' >> $@ ; \
chmod +x $@
$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
@@ -653,7 +664,7 @@ $(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
$(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/$(al_profile)/al.exe"'" "$$@"' >> $@ ; \
echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/class/lib/$(net_profile)/al.exe"'" "$$@"' >> $@ ; \
chmod +x $@
test-support-files: $(TEST_SUPPORT_FILES)