Imported Upstream version 6.6.0.97

Former-commit-id: 36b6262d38adef7275aee46c9258ae34f9e3fb39

runtime/Makefile.am

@@ -3,6 +3,8 @@ tmpinst = _tmpinst
 
 noinst_SCRIPTS = mono-wrapper monodis-wrapper
 
+EXTRA_DIST = bin/mono-hang-watchdog.in
+
 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
 
@@ -308,12 +310,3 @@ $(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
 
 test-support-files: $(TEST_SUPPORT_FILES)
 	@:
-
-# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
-MYDISTFILES = $(DIST_COMMON)
-distdir: $(MYDISTFILES)
-	rm -fr $(distdir)
-	mkdir $(distdir)
-	test -z '$(MYDISTFILES)' || for file in ''$(MYDISTFILES); do \
-	  cp -p $$file $(distdir) ; done
-	find $(distdir) -type f -exec chmod a+r {} ';'

runtime/Makefile.in

@@ -431,6 +431,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 tmpinst = _tmpinst
 noinst_SCRIPTS = mono-wrapper monodis-wrapper
+EXTRA_DIST = bin/mono-hang-watchdog.in
 etctmp = etc
 
 # This is needed at least to build configure --with-runtime-preset=fullaot.
@@ -461,9 +462,6 @@ TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/csc
 VERIFY_TESTS_FILTER = System.Runtime.CompilerServices.Unsafe.dll \
 	$(am__append_17) Xunit.NetCore.Extensions.dll $(am__append_18)
 CLEANFILES = etc/mono/config
-
-# the 'cygnus' option also disables the default 'distdir:' target, which we _do_ want
-MYDISTFILES = $(DIST_COMMON)
 all: all-am
 
 .SUFFIXES:
@@ -514,6 +512,37 @@ ctags CTAGS:
 
 cscope cscopelist:
 
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
 check-am: all-am
 	$(MAKE) $(AM_MAKEFLAGS) check-local
 check: check-am
@@ -830,12 +859,6 @@ $(tmpinst)/bin/al: $(tmpinst)/bin/mono Makefile
 
 test-support-files: $(TEST_SUPPORT_FILES)
 	@:
-distdir: $(MYDISTFILES)
-	rm -fr $(distdir)
-	mkdir $(distdir)
-	test -z '$(MYDISTFILES)' || for file in ''$(MYDISTFILES); do \
-	  cp -p $$file $(distdir) ; done
-	find $(distdir) -type f -exec chmod a+r {} ';'
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

runtime/bin/mono-hang-watchdog.in

@@ -0,0 +1,3 @@
+#! /bin/sh
+r='@mono_build_root@'
+exec "$r/tools/mono-hang-watchdog/mono-hang-watchdog" "$@"

runtime/mkinstalldirs

@@ -1,101 +0,0 @@
-#! /bin/sh
-# mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
-# Created: 1993-05-16
-# Public domain
-
-# $Id: mkinstalldirs 36980 2004-12-03 01:08:33Z benm $
-
-errstatus=0
-dirmode=""
-
-usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
-
-# process command line arguments
-while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )			# -h for help
-	echo "${usage}" 1>&2; exit 0 ;;
-     -m )					# -m PERM arg
-	shift
-	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-	dirmode="${1}"
-	shift ;;
-     -- ) shift; break ;;			# stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
-     * )  break ;;				# first non-opt arg
-   esac
-done
-
-for file
-do
-  if test -d "$file"; then
-    shift
-  else
-    break
-  fi
-done
-
-case $# in
-0) exit 0 ;;
-esac
-
-case $dirmode in
-'')
-  if mkdir -p -- . 2>/dev/null; then
-    echo "mkdir -p -- $*"
-    exec mkdir -p -- "$@"
-  fi ;;
-*)
-  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-    echo "mkdir -m $dirmode -p -- $*"
-    exec mkdir -m "$dirmode" -p -- "$@"
-  fi ;;
-esac
-
-for file
-do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
-
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
-
-     if test ! -d "$pathcomp"; then
-	echo "mkdir $pathcomp"
-
-	mkdir "$pathcomp" || lasterr=$?
-
-	if test ! -d "$pathcomp"; then
-	  errstatus=$lasterr
-	else
-	  if test ! -z "$dirmode"; then
-	     echo "chmod $dirmode $pathcomp"
-
-	     lasterr=""
-	     chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-	     if test ! -z "$lasterr"; then
-	       errstatus=$lasterr
-	     fi
-	  fi
-	fi
-     fi
-
-     pathcomp="$pathcomp/"
-   done
-done
-
-exit $errstatus
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 3
-# End:
-# mkinstalldirs ends here