Imported Upstream version 5.16.0.100

Former-commit-id: 38faa55fb9669e35e7d8448b15c25dc447f25767
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2018-08-07 15:19:03 +00:00
parent 0a9828183b
commit 7d7f676260
4419 changed files with 170950 additions and 90273 deletions

View File

@@ -6,9 +6,12 @@ etctmp = etc
symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config etc/mono/2.0/web.config etc/mono/browscap.ini etc/mono/2.0/Browsers/Compat.browser
if INSTALL_4_x
symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
symlinks += etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
endif
# This is needed at least to build configure --with-runtime-preset=fullaot.
symlinks += etc/mono/4.5/machine.config
etc/mono/2.0/machine.config: $(top_srcdir)/data/net_2_0/machine.config
etc/mono/2.0/web.config: $(top_srcdir)/data/net_2_0/web.config
etc/mono/browscap.ini: $(top_srcdir)/data/browscap.ini
@@ -113,9 +116,15 @@ TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc
mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
mcs-do-xunit-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' xunit-test-profiles
mcs-do-run-test-profiles: test-support-files
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-test-profiles
mcs-do-xunit-run-test-profiles: test-support-files
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-xunit-test-profiles
if HOST_WIN32
if CROSS_COMPILING
cur_dir_cmd = pwd
@@ -172,25 +181,45 @@ mcs-compileall: mono-wrapper etc/mono/config
if [ "$$ok" = "false" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='verify' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='mcs-compileall' success='False' time='0'><results><test-case name='fail' executed='True' success='False' time='0'><failure><message>Verifying framework assemblies failed. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-verify.xml; fi; \
$$ok
check-local: mcs-compileall mcs-do-test-profiles
$(MAKE) mcs-do-run-test-profiles
check-local: mcs-compileall mcs-do-test-profiles mcs-do-xunit-test-profiles
$(MAKE) mcs-do-run-test-profiles mcs-do-run-xunit-test-profiles
# Compile all mcs tests
test: mcs-do-test-profiles
xunit-test: mcs-do-xunit-test-profiles
CLEANFILES = etc/mono/config
# depend on $(symlinks) to ensure 'etc/mono' directory exists
etc/mono/config: ../data/config Makefile $(symlinks)
d=`cd ../support && pwd`; \
sed 's,target="$$mono_libdir/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t
d=`cd ../mono/btls/build-shared && pwd`; \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="'$$d'/libmono-btls-shared$(libsuffix)",' $@t > $@tt
if test -z "$(libgdiplus_loc)"; then :; else \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@tt > $@ttt; \
mv -f $@ttt $@tt; fi
mv -f $@tt $@
rm -f $@t
cp $< $@
if test -d "$(abs_top_builddir)/support"; then \
sed 's,target="$$mono_libdir/libMonoPosixHelper$(libsuffix)",target="$(abs_top_builddir)/support/libMonoPosixHelper.la",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/support'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/metadata"; then \
sed 's,target="$$mono_libdir/libmono-system-native$(libsuffix)",target="$(abs_top_builddir)/mono/metadata/libmono-system-native.la",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/mono/metadata'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/btls/build-shared"; then \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="$(abs_top_builddir)/mono/btls/build-shared/libmono-btls-shared$(libsuffix)",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/mono/btls/build-shared'"; \
fi
if test -n "$(libgdiplus_loc)"; then \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
fi
cat $@
$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
$(mkinstalldirs) $(tmpinst)/bin

View File

@@ -79,7 +79,7 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@INSTALL_4_x_TRUE@am__append_1 = etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.5/machine.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
@INSTALL_4_x_TRUE@am__append_1 = etc/mono/4.0/machine.config etc/mono/4.0/web.config etc/mono/4.5/web.config etc/mono/4.0/Browsers/Compat.browser etc/mono/4.5/Browsers/Compat.browser
@INSTALL_4_x_TRUE@am__append_2 = binary_reference_assemblies net_4_x xbuild_12 xbuild_14
@INSTALL_MONODROID_TRUE@am__append_3 = monodroid monodroid_tools
@INSTALL_MONOTOUCH_TRUE@am__append_4 = monotouch monotouch_runtime
@@ -193,26 +193,17 @@ EXEEXT = @EXEEXT@
FGREP = @FGREP@
GDKX11 = @GDKX11@
GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
GINT_TO_POINTER = @GINT_TO_POINTER@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GMSGFMT = @GMSGFMT@
GMSGFMT_015 = @GMSGFMT_015@
GNUC_NORETURN = @GNUC_NORETURN@
GNUC_PRETTY = @GNUC_PRETTY@
GNUC_UNUSED = @GNUC_UNUSED@
GPOINTER_TO_INT = @GPOINTER_TO_INT@
GPOINTER_TO_UINT = @GPOINTER_TO_UINT@
GREP = @GREP@
GSIZE = @GSIZE@
GSIZE_FORMAT = @GSIZE_FORMAT@
GSSIZE = @GSSIZE@
GTKX11 = @GTKX11@
GUINT_TO_POINTER = @GUINT_TO_POINTER@
G_GINT32_FORMAT = @G_GINT32_FORMAT@
G_GINT64_FORMAT = @G_GINT64_FORMAT@
G_GUINT32_FORMAT = @G_GUINT32_FORMAT@
G_GUINT64_FORMAT = @G_GUINT64_FORMAT@
G_HAVE_ISO_VARARGS = @G_HAVE_ISO_VARARGS@
HAVE_ALLOCA_H = @HAVE_ALLOCA_H@
HAVE_MSGFMT = @HAVE_MSGFMT@
HAVE_NINJA = @HAVE_NINJA@
@@ -382,9 +373,12 @@ top_srcdir = @top_srcdir@
tmpinst = _tmpinst
noinst_SCRIPTS = mono-wrapper monodis-wrapper
etctmp = etc
# This is needed at least to build configure --with-runtime-preset=fullaot.
symlinks = etc/mono/1.0/machine.config etc/mono/2.0/machine.config \
etc/mono/2.0/web.config etc/mono/browscap.ini \
etc/mono/2.0/Browsers/Compat.browser $(am__append_1)
etc/mono/2.0/Browsers/Compat.browser $(am__append_1) \
etc/mono/4.5/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) \
@@ -618,9 +612,15 @@ $(symlinks):
mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
mcs-do-xunit-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' xunit-test-profiles
mcs-do-run-test-profiles: test-support-files
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-test-profiles
mcs-do-xunit-run-test-profiles: test-support-files
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-xunit-test-profiles
# 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.
mcs-compileall: mono-wrapper etc/mono/config
@@ -649,23 +649,43 @@ mcs-compileall: mono-wrapper etc/mono/config
if [ "$$ok" = "false" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='verify' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='mcs-compileall' success='False' time='0'><results><test-case name='fail' executed='True' success='False' time='0'><failure><message>Verifying framework assemblies failed. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-verify.xml; fi; \
$$ok
check-local: mcs-compileall mcs-do-test-profiles
$(MAKE) mcs-do-run-test-profiles
check-local: mcs-compileall mcs-do-test-profiles mcs-do-xunit-test-profiles
$(MAKE) mcs-do-run-test-profiles mcs-do-run-xunit-test-profiles
# Compile all mcs tests
test: mcs-do-test-profiles
xunit-test: mcs-do-xunit-test-profiles
# depend on $(symlinks) to ensure 'etc/mono' directory exists
etc/mono/config: ../data/config Makefile $(symlinks)
d=`cd ../support && pwd`; \
sed 's,target="$$mono_libdir/libMonoPosixHelper$(libsuffix)",target="'$$d'/libMonoPosixHelper.la",' ../data/config > $@t
d=`cd ../mono/btls/build-shared && pwd`; \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="'$$d'/libmono-btls-shared$(libsuffix)",' $@t > $@tt
if test -z "$(libgdiplus_loc)"; then :; else \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@tt > $@ttt; \
mv -f $@ttt $@tt; fi
mv -f $@tt $@
rm -f $@t
cp $< $@
if test -d "$(abs_top_builddir)/support"; then \
sed 's,target="$$mono_libdir/libMonoPosixHelper$(libsuffix)",target="$(abs_top_builddir)/support/libMonoPosixHelper.la",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/support'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/metadata"; then \
sed 's,target="$$mono_libdir/libmono-system-native$(libsuffix)",target="$(abs_top_builddir)/mono/metadata/libmono-system-native.la",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/mono/metadata'" && false; \
fi
if test -d "$(abs_top_builddir)/mono/btls/build-shared"; then \
sed 's,target="$$mono_libdir/libmono-btls-shared$(libsuffix)",target="$(abs_top_builddir)/mono/btls/build-shared/libmono-btls-shared$(libsuffix)",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
else \
echo "Unknown directory '$(abs_top_builddir)/mono/btls/build-shared'"; \
fi
if test -n "$(libgdiplus_loc)"; then \
sed 's,target="$(libgdiplus_install_loc)",target="$(libgdiplus_loc)",' $@ > $@.tmp \
&& mv $@.tmp $@ \
; \
fi
cat $@
$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
$(mkinstalldirs) $(tmpinst)/bin