mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.4.0.167

Browse Source 
Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/Makefile.am
View File

@@ -164,14 +164,11 @@ mcs-compileall: mono-wrapper etc/mono/config
else \
echo $$i verification failed; ok=false; \
fi; done; done; \
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
if NACL_CODEGEN
check-local:
else
check-local: mcs-compileall mcs-do-test-profiles
$(MAKE) mcs-do-run-test-profiles
endif
# Compile all mcs tests
test: mcs-do-test-profiles

8
runtime/Makefile.in
View File

@@ -235,7 +235,6 @@ 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@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
@@ -333,7 +332,6 @@ mkdir_p = @mkdir_p@
mono_build_root = @mono_build_root@
mono_cfg_dir = @mono_cfg_dir@
mono_runtime = @mono_runtime@
nacl_self_host = @nacl_self_host@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
@@ -622,11 +620,11 @@ mcs-compileall: mono-wrapper etc/mono/config
else \
echo $$i verification failed; ok=false; \
fi; done; done; \
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
@NACL_CODEGEN_TRUE@check-local:
@NACL_CODEGEN_FALSE@check-local: mcs-compileall mcs-do-test-profiles
@NACL_CODEGEN_FALSE@ $(MAKE) mcs-do-run-test-profiles
check-local: mcs-compileall mcs-do-test-profiles
$(MAKE) mcs-do-run-test-profiles
# Compile all mcs tests
test: mcs-do-test-profiles

9
runtime/mono-wrapper.in
View File

@@ -4,13 +4,4 @@ MONO_CFG_DIR='@mono_cfg_dir@'
PATH="$r/runtime/_tmpinst/bin:$PATH"
MONO_EXECUTABLE=${MONO_EXECUTABLE:-"$r/@mono_runtime@"}
export MONO_CFG_DIR PATH
if [ -n "@nacl_self_host@" ]; then
case "$@" in
# gacutil.exe and mdoc.exe require filesystem functionality not
# exposed in NaCl.
# mcs.exe was added to the list recently because mcs under NaCl
# no longer produces equivalent output. TODO: investigate
*/mcs.exe* | */gacutil.exe* | */mdoc.exe* ) exec /usr/local/bin/mono "$@";;
esac
fi
exec "$r/libtool" --mode=execute "${MONO_EXECUTABLE}" --config "@mono_cfg_dir@/mono/config" "$@"