Imported Upstream version 5.0.0.42
Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
1190d13a04
commit
6bdd276d05
25
Makefile.am
25
Makefile.am
@ -42,12 +42,11 @@ dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
|
||||
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
|
||||
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
|
||||
# Disable this for now because it is very slow and causes wrench to timeout:
|
||||
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
|
||||
mac-sdk-package:
|
||||
external/bockbuild/bb MacSDK --package
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
noinst_DATA = mono-uninstalled.pc
|
||||
@ -55,17 +54,13 @@ DISTCLEANFILES= mono-uninstalled.pc
|
||||
|
||||
# building with monolite
|
||||
mcslib = $(mcs_topdir)/class/lib
|
||||
monolite = $(mcslib)/monolite
|
||||
mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
|
||||
monolite_url = http://download.mono-project.com/monolite/monolite-$(mono_corlib_version)-latest.tar.gz
|
||||
monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
|
||||
.PHONY: get-monolite-latest
|
||||
get-monolite-latest:
|
||||
-rm -fr $(mcslib)/monolite-*
|
||||
-mkdir -p $(mcslib)
|
||||
test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
|
||||
test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
|
||||
cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd $(mcslib) && mv -f monolite-* monolite
|
||||
-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
|
||||
-mkdir -p $(mcslib)/monolite
|
||||
cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
|
||||
|
||||
if BITCODE
|
||||
BITCODE_CHECK=yes
|
||||
|
||||
28
Makefile.in
28
Makefile.in
@ -232,6 +232,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -264,7 +265,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -296,6 +296,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
@ -438,17 +439,13 @@ EXTRA_DIST = \
|
||||
mcs/class/referencesource
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
|
||||
# Disable this for now because it is very slow and causes wrench to timeout:
|
||||
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
noinst_DATA = mono-uninstalled.pc
|
||||
DISTCLEANFILES = mono-uninstalled.pc
|
||||
|
||||
# building with monolite
|
||||
mcslib = $(mcs_topdir)/class/lib
|
||||
monolite = $(mcslib)/monolite
|
||||
mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
|
||||
monolite_url = http://download.mono-project.com/monolite/monolite-$(mono_corlib_version)-latest.tar.gz
|
||||
monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
|
||||
@BITCODE_TRUE@BITCODE_CHECK = yes
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-recursive
|
||||
@ -949,18 +946,17 @@ dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
|
||||
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
|
||||
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
|
||||
mac-sdk-package:
|
||||
external/bockbuild/bb MacSDK --package
|
||||
.PHONY: get-monolite-latest
|
||||
get-monolite-latest:
|
||||
-rm -fr $(mcslib)/monolite-*
|
||||
-mkdir -p $(mcslib)
|
||||
test ! -d $(monolite) || test ! -d $(monolite).old || rm -fr $(monolite).old
|
||||
test ! -d $(monolite) || mv -f $(monolite) $(monolite).old
|
||||
cd $(mcslib) && { (wget -O- $(monolite_url) || curl $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd $(mcslib) && mv -f monolite-* monolite
|
||||
-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
|
||||
-mkdir -p $(mcslib)/monolite
|
||||
cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
|
||||
|
||||
.PHONY: check-ci
|
||||
check-ci:
|
||||
|
||||
52
README.md
52
README.md
@ -15,19 +15,22 @@ The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.or
|
||||
6. [Configuration Options](#configuration-options)
|
||||
7. [Working with Submodules](#working-with-submodules)
|
||||
|
||||
**Build Status**
|
||||
### Build Status
|
||||
|
||||
Officially supported architectures:
|
||||
| OS | Architecture | Status |
|
||||
|--------------|--------------------|------------------------------|
|
||||
| Ubuntu 14.04 | amd64 | [![ubuntu-1404-amd64][1]][2] |
|
||||
| Ubuntu 14.04 | i386 | [![ubuntu-1404-i386][3]][4] |
|
||||
| Debian 8 | armel | [![debian-8-armel][5]][6] |
|
||||
| Debian 8 | armhf | [![debian-8-armhf][7]][8] |
|
||||
| Debian 8 | arm64 | [![debian-8-arm64][9]][10] |
|
||||
| OS X | amd64 | [![osx-amd64][11]][12] |
|
||||
| OS X | i386 | [![osx-i386][13]][14] |
|
||||
| Windows | amd64 | [![windows-amd64][15]][16] |
|
||||
| Windows | i386 | [![windows-amd64][17]][18] |
|
||||
| CentOS | s390x (cs) | [![centos-s390x][19]][20] |
|
||||
|
||||
| ubuntu-1404-amd64 | ubuntu-1404-i386 | debian-8-armel | debian-8-armhf | debian-8-arm64 | windows-amd64 |
|
||||
|------------------------------|-----------------------------|---------------------------|---------------------------|-----------------------------|----------------------------|
|
||||
| [![ubuntu-1404-amd64][1]][2] | [![ubuntu-1404-i386][3]][4] | [![debian-8-armel][5]][6] | [![debian-8-armhf][7]][8] | [![debian-8-arm64][9]][10] | [![windows-amd64][11]][12] |
|
||||
|
||||
Community supported architectures:
|
||||
|
||||
| centos-s390x |
|
||||
|---------------------------|
|
||||
| [![centos-s390x][13]][14] |
|
||||
_(cs) = community supported architecture_
|
||||
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64
|
||||
@ -39,10 +42,16 @@ Community supported architectures:
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/
|
||||
[11]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
|
||||
[12]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
|
||||
[13]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon
|
||||
[14]: https://jenkins.mono-project.com/job/z/label=centos-s390x
|
||||
[11]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/badge/icon
|
||||
[12]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/
|
||||
[13]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-i386/badge/icon
|
||||
[14]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-i386/
|
||||
[15]: https://jenkins.mono-project.com/job/z/label=w64/badge/icon
|
||||
[16]: https://jenkins.mono-project.com/job/z/label=w64/
|
||||
[17]: https://jenkins.mono-project.com/job/z/label=w32/badge/icon
|
||||
[18]: https://jenkins.mono-project.com/job/z/label=w32/
|
||||
[19]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon
|
||||
[20]: https://jenkins.mono-project.com/job/z/label=centos-s390x
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@ -453,6 +462,19 @@ disable it.
|
||||
* There are a number of runtime options to control this
|
||||
also, see the man page.
|
||||
|
||||
* `--with-csc=roslyn,mcs,default`
|
||||
|
||||
* Use this option to configure which C# compiler to use. By default
|
||||
the configure script will pick Roslyn, except on platforms where
|
||||
Roslyn does not work (Big Endian systems) where it will pick mcs.
|
||||
|
||||
If you specify "mcs", then Mono's C# compiler will be used. This
|
||||
also allows for a complete bootstrap of Mono's core compiler and
|
||||
core libraries from source.
|
||||
|
||||
If you specify "roslyn", then Roslyn's C# compiler will be used.
|
||||
This currently uses Roslyn binaries.
|
||||
|
||||
* `--enable-nacl`
|
||||
|
||||
* This configures the Mono compiler to generate code
|
||||
|
||||
@ -8,11 +8,12 @@ CLEANFILES = *.dll *.exe *.mdb
|
||||
EXTRA_DIST=README.md SUBMODULES.json versions.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
|
||||
CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
|
||||
TOOLS_CLASS=$(mcs_topdir)/class/lib/build
|
||||
|
||||
with_mono_path = MONO_PATH=$(CLASS)
|
||||
RUNTIME = $(with_mono_path) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe
|
||||
ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
|
||||
RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll
|
||||
ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
|
||||
|
||||
include versions.mk
|
||||
include profiler-stress.mk
|
||||
|
||||
@ -1 +1 @@
|
||||
61a884697b79e16cc9e036de2b08a7e79166e5ac
|
||||
1d85af9de41fd599926a3a180bdd0b2f2afe2fae
|
||||
@ -18,7 +18,7 @@
|
||||
{
|
||||
"name": "ms-test-suite",
|
||||
"url": "git@github.com:xamarin/ms-test-suite.git",
|
||||
"rev": "eb7cd709549bffe170653a50805f1593d66ea81e",
|
||||
"rev": "55b6637eb1de61c743323ec82db1e0cadfee5b32",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "ms-test-suite"
|
||||
@ -31,4 +31,4 @@
|
||||
"branch": "master",
|
||||
"directory": "benchmarker"
|
||||
}
|
||||
]
|
||||
]
|
||||
@ -1 +1 @@
|
||||
1f4be3d1e8fbc9cefb15d72648b5068298d01356
|
||||
6fc6a28236467657b04c41902a5452ebf4d475c2
|
||||
@ -1,10 +1,13 @@
|
||||
check-ms-test-suite:
|
||||
check-ms-test-suite: $(CLASS)/nunitlite.dll
|
||||
@if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug -t:library -warn:1 -r:nunit.framework" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-console.exe -nologo -exclude=MonoBug,BadTest" NUNIT_XML_RESULT=$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug -warn:1" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug:portable -warn:1" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run MONO="$(RUNTIME)" || EXIT_CODE=1; \
|
||||
exit $$EXIT_CODE; \
|
||||
else \
|
||||
echo "*** [ms-test-suite] Getting the repository failed, you probably don't have access to this Xamarin-internal resource. Skipping."; \
|
||||
fi
|
||||
|
||||
$(CLASS)/nunitlite.dll:
|
||||
$(MAKE) -C $(mcs_topdir)/tools/nunit-lite
|
||||
|
||||
47
config.h.in
47
config.h.in
@ -1,5 +1,8 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Define if building universal (internal helper macro) */
|
||||
#undef AC_APPLE_UNIVERSAL_BUILD
|
||||
|
||||
/* GC description */
|
||||
#undef DEFAULT_GC_NAME
|
||||
|
||||
@ -27,9 +30,6 @@
|
||||
/* Disable System.Decimal support */
|
||||
#undef DISABLE_DECIMAL
|
||||
|
||||
/* Disables building in the full table of WAPI messages */
|
||||
#undef DISABLE_FULL_MESSAGES
|
||||
|
||||
/* Disable generics support */
|
||||
#undef DISABLE_GENERICS
|
||||
|
||||
@ -51,6 +51,9 @@
|
||||
/* Disable support debug logging */
|
||||
#undef DISABLE_LOGGING
|
||||
|
||||
/* Disable support for .mdb symbol files. */
|
||||
#undef DISABLE_MDB
|
||||
|
||||
/* Disable String normalization support. */
|
||||
#undef DISABLE_NORMALIZATION
|
||||
|
||||
@ -139,6 +142,9 @@
|
||||
/* Icall symbol map enabled */
|
||||
#undef ENABLE_ICALL_SYMBOL_MAP
|
||||
|
||||
/* Enable interpreter in the runtime. */
|
||||
#undef ENABLE_INTERPRETER
|
||||
|
||||
/* Enable the LLVM back end */
|
||||
#undef ENABLE_LLVM
|
||||
|
||||
@ -148,6 +154,9 @@
|
||||
/* Have GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY */
|
||||
#undef GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY
|
||||
|
||||
/* GLIBC has CPU_COUNT macro in sched.h */
|
||||
#undef GLIBC_HAS_CPU_COUNT
|
||||
|
||||
/* Define to 1 if you have the `accept4' function. */
|
||||
#undef HAVE_ACCEPT4
|
||||
|
||||
@ -193,6 +202,9 @@
|
||||
/* Define to 1 if you have the <checklist.h> header file. */
|
||||
#undef HAVE_CHECKLIST_H
|
||||
|
||||
/* Use classic Windows API support */
|
||||
#undef HAVE_CLASSIC_WINAPI_SUPPORT
|
||||
|
||||
/* Define to 1 if you have the `clock_nanosleep' function. */
|
||||
#undef HAVE_CLOCK_NANOSLEEP
|
||||
|
||||
@ -260,9 +272,6 @@
|
||||
/* dlopen-based dynamic loader available */
|
||||
#undef HAVE_DL_LOADER
|
||||
|
||||
/* BTLS in a shared libraty */
|
||||
#undef HAVE_DYNAMIC_BTLS
|
||||
|
||||
/* Define to 1 if you have the <elf.h> header file. */
|
||||
#undef HAVE_ELF_H
|
||||
|
||||
@ -959,6 +968,9 @@
|
||||
/* Define to 1 if you have the <utime.h> header file. */
|
||||
#undef HAVE_UTIME_H
|
||||
|
||||
/* Don't use UWP Windows API support */
|
||||
#undef HAVE_UWP_WINAPI_SUPPORT
|
||||
|
||||
/* Support for the visibility ("hidden") attribute */
|
||||
#undef HAVE_VISIBILITY_HIDDEN
|
||||
|
||||
@ -1032,12 +1044,23 @@
|
||||
*/
|
||||
#undef LT_OBJDIR
|
||||
|
||||
/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
|
||||
*/
|
||||
#undef MAJOR_IN_MKDEV
|
||||
|
||||
/* Define to 1 if `major', `minor', and `makedev' are declared in
|
||||
<sysmacros.h>. */
|
||||
#undef MAJOR_IN_SYSMACROS
|
||||
|
||||
/* The architecture this is running on */
|
||||
#undef MONO_ARCHITECTURE
|
||||
|
||||
/* Enable the allocation and indexing of arrays greater than Int32.MaxValue */
|
||||
#undef MONO_BIG_ARRAYS
|
||||
|
||||
/* Version of the corlib-runtime interface */
|
||||
#undef MONO_CORLIB_VERSION
|
||||
|
||||
/* The runtime is compiled for cross-compiling mode */
|
||||
#undef MONO_CROSS_COMPILE
|
||||
|
||||
@ -1191,6 +1214,18 @@
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
|
||||
significant byte first (like Motorola and SPARC, unlike Intel). */
|
||||
#if defined AC_APPLE_UNIVERSAL_BUILD
|
||||
# if defined __BIG_ENDIAN__
|
||||
# define WORDS_BIGENDIAN 1
|
||||
# endif
|
||||
#else
|
||||
# ifndef WORDS_BIGENDIAN
|
||||
# undef WORDS_BIGENDIAN
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* 64 bit mode with 4 byte longs and pointers */
|
||||
#undef __mono_ilp32__
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
1f5b54d986e9a0bb2907e076fbde52c66bc7e50d
|
||||
842bd0c99a63529d11a45b65a4788407bb7f14b9
|
||||
@ -1 +1 @@
|
||||
a04424aabfe6acc33f8fe8cc3671eea3e0b4330b
|
||||
7631f31003484344dec75a864d26cb06d71338b2
|
||||
@ -255,6 +255,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -287,7 +288,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -319,6 +319,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -167,8 +167,6 @@ class MonoClassPrinter:
|
||||
return "0x0"
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
if klass ["generic_class"].cast (gdb.lookup_type ("guint64")) != 0:
|
||||
class_name = "{}<{}>".format (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
|
||||
if add_quotes:
|
||||
return "\"{}\"".format (class_name)
|
||||
else:
|
||||
@ -198,7 +196,7 @@ class MonoGenericInstPrinter:
|
||||
inst_args = inst ["type_argv"]
|
||||
inst_str = ""
|
||||
for i in range(0, inst_len):
|
||||
print (inst_args)
|
||||
# print (inst_args)
|
||||
type_printer = MonoTypePrinter (inst_args [i])
|
||||
if i > 0:
|
||||
inst_str = inst_str + ", "
|
||||
@ -240,7 +238,7 @@ class MonoTypePrinter:
|
||||
|
||||
def to_string_inner(self, csharp):
|
||||
try:
|
||||
t = self.val.dereference ()
|
||||
t = self.val.referenced_value ()
|
||||
|
||||
kind = str (t ["type"]).replace ("MONO_TYPE_", "").lower ()
|
||||
info = ""
|
||||
@ -252,9 +250,9 @@ class MonoTypePrinter:
|
||||
info = str(t ["data"]["generic_class"])
|
||||
|
||||
if info != "":
|
||||
return "{{}, {}}".format (kind, info)
|
||||
return "{{{}, {}}}".format (kind, info)
|
||||
else:
|
||||
return "{{}}".format (kind)
|
||||
return "{{{}}}".format (kind)
|
||||
except:
|
||||
#print (sys.exc_info ()[0])
|
||||
#print (sys.exc_info ()[1])
|
||||
@ -278,7 +276,7 @@ class MonoMethodRgctxPrinter:
|
||||
inst_args = inst ["type_argv"]
|
||||
inst_str = ""
|
||||
for i in range(0, inst_len):
|
||||
print (inst_args)
|
||||
# print (inst_args)
|
||||
type_printer = MonoTypePrinter (inst_args [i])
|
||||
if i > 0:
|
||||
inst_str = inst_str + ", "
|
||||
|
||||
@ -177,6 +177,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -209,7 +210,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -241,6 +241,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -237,6 +237,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -269,7 +270,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -301,6 +301,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -177,6 +177,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -209,7 +210,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -241,6 +241,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -237,6 +237,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -269,7 +270,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -301,6 +301,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -177,6 +177,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -209,7 +210,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -241,6 +241,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -237,6 +237,7 @@ CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
CMAKE = @CMAKE@
|
||||
CPP = @CPP@
|
||||
CPPFLAGS = @CPPFLAGS@
|
||||
CSC = @CSC@
|
||||
CXX = @CXX@
|
||||
CXXCPP = @CXXCPP@
|
||||
CXXDEPMODE = @CXXDEPMODE@
|
||||
@ -269,7 +270,6 @@ HAVE_MSGFMT = @HAVE_MSGFMT@
|
||||
HOST_CC = @HOST_CC@
|
||||
INSTALL = @INSTALL@
|
||||
INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_MOBILE_STATIC = @INSTALL_MOBILE_STATIC@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
@ -301,6 +301,7 @@ MAINT = @MAINT@
|
||||
MAKEINFO = @MAKEINFO@
|
||||
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@
|
||||
|
||||
@ -64,6 +64,7 @@ dist-hook:
|
||||
|
||||
clean-local:
|
||||
-rm -Rf html
|
||||
-rm -Rf doxygen-output
|
||||
-rm -f deploy/* convert.exe* AgilityPack.dll*
|
||||
-rm -f $(ASSEMBLED_DOCS)
|
||||
|
||||
@ -100,3 +101,7 @@ convert.exe: convert.cs AgilityPack.dll
|
||||
AgilityPack.dll:
|
||||
$(TOOL_MAKE) AgilityPack.dll
|
||||
|
||||
doxygen:
|
||||
doxygen doxyfile
|
||||
|
||||
.PHONY: doxygen
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user