Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@@ -25,12 +25,6 @@ $(symlinks):
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_4_5
@@ -46,15 +40,16 @@ if INSTALL_MONOTOUCH
build_profiles += monotouch monotouch_runtime
endif
if INSTALL_MONOTOUCH_WATCH
build_profiles += monotouch_watch
endif
if INSTALL_XAMMAC
build_profiles += xammac xammac_net_4_5
endif
test_profiles = $(build_profiles)
endif
endif
if BUILD_MCS
MAKE_FLAGS=$(if $(V),,--no-print-directory -s)
@@ -79,11 +74,9 @@ install-data:
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
-rm -fr $(etctmp) $(tmpinst)
endif BUILD_MCS

View File

@@ -80,10 +80,11 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@INSTALL_4_5_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_5_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@am__append_2 = binary_reference_assemblies net_4_5 xbuild_12 xbuild_14
@INSTALL_MONODROID_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@am__append_3 = monodroid
@INSTALL_MONOTOUCH_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@am__append_4 = monotouch monotouch_runtime
@INSTALL_XAMMAC_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@am__append_5 = xammac xammac_net_4_5
@INSTALL_4_5_TRUE@am__append_2 = binary_reference_assemblies net_4_5 xbuild_12 xbuild_14
@INSTALL_MONODROID_TRUE@am__append_3 = monodroid
@INSTALL_MONOTOUCH_TRUE@am__append_4 = monotouch monotouch_runtime
@INSTALL_MONOTOUCH_WATCH_TRUE@am__append_5 = monotouch_watch
@INSTALL_XAMMAC_TRUE@am__append_6 = xammac xammac_net_4_5
subdir = runtime
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/mkinstalldirs $(srcdir)/mono-wrapper.in \
@@ -340,21 +341,10 @@ 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)
SUPPORT_FILES = $(symlinks) mono-wrapper etc/mono/config
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@build_profiles = \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@ $(am__append_2) \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@ $(am__append_3) \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@ $(am__append_4) \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@ $(am__append_5)
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_TRUE@build_profiles = xammac \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_TRUE@ $(am__append_2) \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_TRUE@ $(am__append_3) \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_TRUE@ $(am__append_4) \
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_TRUE@ $(am__append_5)
@ONLY_MONOTOUCH_TRUE@build_profiles = monotouch $(am__append_2) \
@ONLY_MONOTOUCH_TRUE@ $(am__append_3) $(am__append_4) \
@ONLY_MONOTOUCH_TRUE@ $(am__append_5)
@INSTALL_4_5_TRUE@@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@al_profile = net_4_5
@ONLY_MONOTOUCH_FALSE@@ONLY_XAMMAC_FALSE@test_profiles = $(build_profiles)
build_profiles = $(am__append_2) $(am__append_3) $(am__append_4) \
$(am__append_5) $(am__append_6)
@INSTALL_4_5_TRUE@al_profile = net_4_5
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/dmcs $(tmpinst)/bin/al2 $(tmpinst)/bin/al
@CROSS_COMPILING_FALSE@@HOST_WIN32_TRUE@cur_dir_cmd = cygpath -w -a .
@@ -572,8 +562,7 @@ $(symlinks):
@BUILD_MCS_TRUE@clean-local:
@BUILD_MCS_TRUE@ cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(build_profiles)' clean-profiles
@BUILD_MCS_TRUE@ -./mono-wrapper --wapi=semdel
@BUILD_MCS_TRUE@ -rm -fr $(etctmp) $(tmpinst) .wapi
@BUILD_MCS_TRUE@ -rm -fr $(etctmp) $(tmpinst)
mcs-do-test-profiles:
cd $(mcs_topdir) && $(MAKE) NO_DIR_CHECK=1 PROFILES='$(test_profiles)' test-profiles

View File

@@ -2,8 +2,7 @@
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
export MONO_CFG_DIR PATH
if [ -n "@nacl_self_host@" ]; then
case "$@" in
# gacutil.exe and mdoc.exe require filesystem functionality not

View File

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