Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

runtime/Makefile.am

@@ -0,0 +1,227 @@
+tmpinst = _tmpinst
+
+noinst_SCRIPTS = mono-wrapper monodis-wrapper
+
+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_0
+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
+endif
+
+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
+etc/mono/2.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
+etc/mono/4.0/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
+etc/mono/4.5/Browsers/Compat.browser: $(top_srcdir)/data/Browsers/Compat.browser
+etc/mono/4.0/machine.config: $(top_srcdir)/data/net_4_0/machine.config
+etc/mono/4.0/web.config: $(top_srcdir)/data/net_4_0/web.config
+etc/mono/4.5/machine.config: $(top_srcdir)/data/net_4_5/machine.config
+etc/mono/4.5/web.config: $(top_srcdir)/data/net_4_5/web.config
+
+$(symlinks):
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
+
+if ONLY_MONOTOUCH
+build_profiles = monotouch
+else
+if ONLY_XAMMAC
+build_profiles = xammac
+else
+build_profiles = 
+
+if INSTALL_2_0
+build_profiles += net_2_0 net_3_5
+al_profile = net_2_0
+endif
+
+if INSTALL_4_0
+build_profiles += net_4_0
+al_profile = net_4_0
+endif
+
+if INSTALL_4_5
+build_profiles += net_4_5 xbuild_12
+al_profile = net_4_5
+endif
+
+if INSTALL_MONODROID
+build_profiles += monodroid
+endif
+
+if INSTALL_MONOTOUCH
+build_profiles += monotouch monotouch_runtime
+endif
+
+if INSTALL_XAMMAC
+build_profiles += xammac
+endif
+
+test_profiles = $(build_profiles)
+
+endif
+endif
+
+if BUILD_MCS
+
+MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
+
+# The write check is to foil 'make distcheck'
+all-local: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
+	if test -w $(mcs_topdir); then :; else chmod -R +w $(mcs_topdir); fi
+	cd $(mcs_topdir) && $(MAKE) $(MAKE_FLAGS) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' CC='$(CC)' all-profiles
+
+# override automake
+install: install-exec install-data
+
+# override automake
+install-exec: $(SUPPORT_FILES) $(TEST_SUPPORT_FILES)
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) install-profiles
+
+# override automake
+install-data:
+	@:
+
+# override automake
+uninstall:
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' RUNTIME_HAS_CONSISTENT_GACDIR=yes prefix=$(prefix) uninstall-profiles
+
+## mono --wapi=semdel will probably not delete the semaphore if someone is crazy enough to do a 'make -j distclean' :-)
+clean-local:
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
+	-./mono-wrapper --wapi=semdel
+	-rm -fr $(etctmp) $(tmpinst) .wapi
+
+endif BUILD_MCS
+
+TEST_SUPPORT_FILES = $(tmpinst)/bin/mono $(tmpinst)/bin/ilasm $(tmpinst)/bin/mcs $(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
+test_select =
+else
+test_select = ONLY_CENTUM_TESTS=yes
+endif
+
+mcs-do-test-profiles:
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles
+
+mcs-do-run-test-profiles: test-support-files
+	cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' run-test-profiles
+
+if HOST_WIN32
+if CROSS_COMPILING
+cur_dir_cmd = pwd
+PLATFORM_PATH_SEPARATOR = :
+else
+cur_dir_cmd = cygpath -w -a .
+PLATFORM_PATH_SEPARATOR = ;
+endif
+else
+cur_dir_cmd = pwd
+PLATFORM_PATH_SEPARATOR = :
+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 net 4.0 assemblies because the contain metadata only
+mcs-compileall: mono-wrapper etc/mono/config
+	save_MONO_PATH=$$MONO_PATH; mcs_topdir=`cd $(mcs_topdir) && $(cur_dir_cmd)`; ok=:; \
+	for profile in $(test_profiles); do \
+	  if [ "net_4_0" = "$$profile" ]; then \
+          continue; \
+      fi; \
+	  if [ "net_3_5" = "$$profile" ]; then \
+		  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+	  elif [ "xbuild_12" = "$$profile" ]; then \
+		  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$mcs_topdir/class/lib/net_4_5$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+	  else \
+		  MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \
+	  fi; \
+	  export MONO_PATH; \
+	  for i in $(mcs_topdir)/class/lib/$$profile/*.{dll,exe}; do \
+		if [ ! -f $$i ] ; then \
+			continue ; \
+		fi ;  \
+	    if ./mono-wrapper --compile-all --verify-all --security=verifiable $$i; then \
+	      echo $$i verified OK; \
+	    else \
+	      echo $$i verification failed; ok=false; \
+	    fi; done; done; \
+	$$ok
+
+if NACL_CODEGEN
+check-local:
+else
+check-local: mcs-compileall mcs-do-test-profiles
+	$(MAKE) $(test_select) mcs-do-run-test-profiles
+endif
+
+# Compile all mcs tests
+test: mcs-do-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="libMonoPosixHelper[^"]*",target="'$$d/libMonoPosixHelper.la'",' ../data/config > $@t
+	if test -z "$(libgdiplus_loc)"; then :; else \
+	  sed 's,target="[^"]*libgdiplus[^"]*",target="$(libgdiplus_loc)",' $@t > $@tt; \
+	  mv -f $@tt $@t; fi
+	mv -f $@t $@
+
+$(tmpinst)/bin/mono: mono-wrapper etc/mono/config
+	$(mkinstalldirs) $(tmpinst)/bin
+	cp mono-wrapper $@
+
+$(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"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+$(tmpinst)/bin/gmcs: $(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 -sdk:2"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+$(tmpinst)/bin/dmcs: $(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 -sdk:4"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+$(tmpinst)/bin/ilasm: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	echo 'exec "'"$$r/$(tmpinst)/bin/mono"'" "'"$$m/ilasm/ilasm.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+$(tmpinst)/bin/al2: $(tmpinst)/bin/mono Makefile
+	echo '#! /bin/sh' > $@ ; \
+	r=`pwd`; m=`cd $(mcs_topdir) && pwd`; \
+	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/$(al_profile)/al.exe"'" "$$@"' >> $@ ; \
+	chmod +x $@
+
+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/mkinstalldirs

@@ -0,0 +1,101 @@
+#! /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

runtime/mono-wrapper.in

@@ -0,0 +1,16 @@
+#! /bin/sh
+r='@mono_build_root@'
+MONO_CFG_DIR='@mono_cfg_dir@'
+PATH="$r/runtime/_tmpinst/bin:$PATH"
+MONO_SHARED_DIR=$r/runtime
+export MONO_CFG_DIR MONO_SHARED_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 "$r/@mono_runtime@" --config "@mono_cfg_dir@/mono/config" "$@"

runtime/monodis-wrapper.in

@@ -0,0 +1,6 @@
+#! /bin/sh
+r='@mono_build_root@'
+MONO_CFG_DIR='@mono_cfg_dir@'
+MONO_SHARED_DIR=$r/runtime
+export MONO_CFG_DIR MONO_SHARED_DIR
+exec "$r/libtool" --mode=execute -dlopen "$r/mono/mini/libmono-2.0.la" "$r/mono/dis/monodis" "$@"