Imported Upstream version 4.6.0.125
Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
parent
a569aebcfd
commit
e79aa3c0ed
502
COPYING.LIB
502
COPYING.LIB
File diff suppressed because it is too large
Load Diff
@ -1 +0,0 @@
|
||||
1616a4e9a1cdee9faf7dd03612d4a22effdd255b
|
||||
@ -32,7 +32,8 @@ EXTRA_DIST= \
|
||||
mono-uninstalled.pc.in \
|
||||
winconfig.h \
|
||||
code_of_conduct.md \
|
||||
external
|
||||
external \
|
||||
mcs/class/referencesource
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
|
||||
|
||||
@ -163,3 +164,7 @@ update-llvm-version:
|
||||
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
|
||||
|
||||
|
||||
update-solution-files:
|
||||
make update-csproj
|
||||
make package-inputs
|
||||
(cd msvc/scripts; make genproj.exe; mono genproj.exe)
|
||||
|
||||
16
Makefile.in
16
Makefile.in
@ -83,9 +83,9 @@ subdir = .
|
||||
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
|
||||
$(top_srcdir)/configure $(am__configure_deps) \
|
||||
$(srcdir)/config.h.in mkinstalldirs \
|
||||
$(srcdir)/mono-uninstalled.pc.in COPYING.LIB ChangeLog NEWS \
|
||||
compile config.guess config.rpath config.sub install-sh \
|
||||
missing ltmain.sh
|
||||
$(srcdir)/mono-uninstalled.pc.in COPYING.LIB NEWS compile \
|
||||
config.guess config.rpath config.sub install-sh missing \
|
||||
ltmain.sh
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/iconv.m4 \
|
||||
$(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \
|
||||
@ -296,8 +296,6 @@ NM = @NM@
|
||||
NMEDIT = @NMEDIT@
|
||||
OBJDUMP = @OBJDUMP@
|
||||
OBJEXT = @OBJEXT@
|
||||
OPROFILE_CFLAGS = @OPROFILE_CFLAGS@
|
||||
OPROFILE_LIBS = @OPROFILE_LIBS@
|
||||
OTOOL = @OTOOL@
|
||||
OTOOL64 = @OTOOL64@
|
||||
PACKAGE = @PACKAGE@
|
||||
@ -424,7 +422,8 @@ EXTRA_DIST = \
|
||||
mono-uninstalled.pc.in \
|
||||
winconfig.h \
|
||||
code_of_conduct.md \
|
||||
external
|
||||
external \
|
||||
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:
|
||||
@ -1042,6 +1041,11 @@ update-llvm-version:
|
||||
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
|
||||
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
|
||||
|
||||
update-solution-files:
|
||||
make update-csproj
|
||||
make package-inputs
|
||||
(cd msvc/scripts; make genproj.exe; mono genproj.exe)
|
||||
|
||||
# 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.
|
||||
.NOEXPORT:
|
||||
|
||||
82
README.md
82
README.md
@ -3,6 +3,8 @@ create cross platform applications. It is an open source
|
||||
implementation of Microsoft's .NET Framework based on the ECMA
|
||||
standards for C# and the Common Language Runtime.
|
||||
|
||||
The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.org/)
|
||||
|
||||
[](https://gitter.im/mono/mono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
|
||||
1. [Compilation and Installation](#compilation-and-installation)
|
||||
@ -17,28 +19,30 @@ standards for C# and the Common Language Runtime.
|
||||
|
||||
Officially supported architectures:
|
||||
|
||||
| debian-amd64 | debian-i386 | debian-armel | debian-armhf | windows-amd64 |
|
||||
|-------------------------|------------------------|-------------------------|-------------------------|---------------------------|
|
||||
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-armel][5]][6] | [![debian-armhf][7]][8] | [![windows-amd64][9]][10] |
|
||||
| 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][11]][12] |
|
||||
| [![centos-s390x][13]][14] |
|
||||
|
||||
[1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
|
||||
[2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
|
||||
[3]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon
|
||||
[4]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/
|
||||
[5]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/badge/icon
|
||||
[6]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/
|
||||
[7]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/badge/icon
|
||||
[8]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/
|
||||
[9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
|
||||
[10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
|
||||
[11]: https://jenkins.mono-project.com/job/z/label=centos-s390x/badge/icon
|
||||
[12]: https://jenkins.mono-project.com/job/z/label=centos-s390x
|
||||
[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
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/badge/icon
|
||||
[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
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@ -104,6 +108,8 @@ See the man pages for mono(1), mcs(1) and monodis(1) for further details.
|
||||
Directory Roadmap
|
||||
=================
|
||||
|
||||
* `acceptance-tests/` - Optional third party test suites used to validate Mono against a wider range of test cases.
|
||||
|
||||
* `data/` - Configuration files installed as part of the Mono runtime.
|
||||
|
||||
* `docs/` - Technical documents about the Mono runtime.
|
||||
@ -181,7 +187,7 @@ while `mono-sgen` uses the Simple Generational GC.
|
||||
* `--with-gc=[included, boehm, none]` - Selects the default Boehm
|
||||
garbage collector engine to use.
|
||||
|
||||
* *included*: (*slighty modified Boehm GC*) This is the default
|
||||
* *included*: (*slightly modified Boehm GC*) This is the default
|
||||
value for the Boehm GC, and it's the most feature complete, it will
|
||||
allow Mono to use typed allocations and support the debugger.
|
||||
|
||||
@ -194,6 +200,13 @@ Disables the inclusion of a garbage collector.
|
||||
|
||||
* This defaults to `included`.
|
||||
|
||||
* `--with-cooperative-gc`
|
||||
|
||||
* If you pass this flag the Mono runtime is configured to only use
|
||||
the cooperative mode of the garbage collector. If you do not pass
|
||||
this flag, then you can control at runtime the use of the
|
||||
cooperative GC mode by setting the `MONO_ENABLE_COOP` flag.
|
||||
|
||||
* `--with-tls=__thread,pthread`
|
||||
|
||||
* Controls how Mono should access thread local storage,
|
||||
@ -419,8 +432,10 @@ cycle.
|
||||
multiple CPUs to do its work. This helps performance
|
||||
on multi-CPU machines as the work is divided across CPUS.
|
||||
|
||||
* This option is not currently the default as we have
|
||||
not done much testing with Mono.
|
||||
* This option is not currently the default on OSX
|
||||
as it runs into issues there.
|
||||
|
||||
* This option only applies to the Boehm GC.
|
||||
|
||||
* `--enable-dtrace`
|
||||
|
||||
@ -496,3 +511,32 @@ to do at all), first edit `.gitmodules` to point to the new location, then:
|
||||
The desired output diff is a change in `.gitmodules` to reflect the
|
||||
change in the remote URL, and a change in /<submodule> where you see
|
||||
the desired change in the commit hash.
|
||||
|
||||
License
|
||||
=======
|
||||
|
||||
See the LICENSE file for licensing information, and the PATENTS.TXT
|
||||
file for information about Microsoft's patent grant.
|
||||
|
||||
Mono Trademark Use Policy
|
||||
=========================
|
||||
|
||||
The use of trademarks and logos for Mono can be found [here] (http://www.dotnetfoundation.org/legal/mono-tm).
|
||||
|
||||
Maintaining the Class Library Solution Files
|
||||
============================================
|
||||
|
||||
Mono now ships with a solution file that can be used to build the
|
||||
assemblies from an IDE. Either by opening the topmost `net_4_x.sln`
|
||||
file, or to by loading one of the individual `csproj` files located in
|
||||
each directory.
|
||||
|
||||
These are maintained by extracting the configuration information from
|
||||
our Makefiles, which as of May 2016 remain the canonical location for
|
||||
configuration information.
|
||||
|
||||
When changes are made to the Makefiles, a user would need to run the
|
||||
following command to re-generate the solution files at the top level:
|
||||
|
||||
$ make update-solution-files
|
||||
|
||||
|
||||
23
acceptance-tests/Makefile.am
Normal file
23
acceptance-tests/Makefile.am
Normal file
@ -0,0 +1,23 @@
|
||||
ACCEPTANCE_TESTS_PATH=external
|
||||
ROSLYN_PATH=$(ACCEPTANCE_TESTS_PATH)/roslyn
|
||||
CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
|
||||
MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
|
||||
|
||||
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)
|
||||
|
||||
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
|
||||
|
||||
include versions.mk
|
||||
include roslyn.mk
|
||||
include coreclr.mk
|
||||
include ms-test-suite.mk
|
||||
|
||||
check-full: check-roslyn check-coreclr check-ms-test-suite
|
||||
|
||||
clean-local: clean-local-coreclr
|
||||
@ -1 +0,0 @@
|
||||
68b9ff90e7dc4c8e38686a067a75eb9365f9504b
|
||||
@ -1 +1 @@
|
||||
24a4c4858927915808d8266273160d32e9ac9e4d
|
||||
32956102bf8b153420545562e9066c249e538001
|
||||
@ -1,14 +1,35 @@
|
||||
This directory contains acceptance tests, handled by optional non git submodule based submodules. Run the tests via "make check-full" (there are also targets for individual test suites).
|
||||
Acceptance tests
|
||||
================
|
||||
|
||||
The SUBMODULES.json file stores information about the submodules, and make targets are used to check out submodules, check their versions, and update the submodule information.
|
||||
This directory contains acceptance tests, which are third party test suites and frameworks that are used to validate Mono against a wider range of test cases that go beyond the Mono unit tests that run as part of CI.
|
||||
|
||||
By convention, submodules repositories are at the same level as the mono repository.
|
||||
In order to make checking out those test suites optional we don't use traditional git submodules, but instead clone them on demand when needed. The custom submodule repositories are checked out into the acceptance-tests/external/ directory.
|
||||
|
||||
Make targets available:
|
||||
## Usage
|
||||
|
||||
make check-<module> - Checks whenever <module> is checked out and matches the version in the info file.
|
||||
make reset-<module> - Clones <module>if neccesary and checks out the revision specified in the info file.
|
||||
make bump-<module> - Updates the revision stored in the info file for <module>.
|
||||
make bump-current-<module> - Updates the revision stored in the info file for <module> to the current revision.
|
||||
make commit-bump-<module> - Same as make bump-<module>, but commits the change.
|
||||
make commit-bump-current-<module> - Same as make bump-current-<module>, but commits the change.
|
||||
Running all test suites is possible via "make check-full". There are also targets for running individual test suites, see below.
|
||||
|
||||
Some of the test suites require an installed Mono (i.e. they don't work with the in-tree build), those will ask you to pass in the PREFIX variable pointing to the installation directory when invoking make. Note that this directory needs to be writable as we overwrite some files there as part of testing.
|
||||
|
||||
## Individual test suites and targets
|
||||
|
||||
* `make check-ms-test-suite` - Runs tests that were shared with Xamarin, those are not available publically and will be skipped when the repository is not accessible.
|
||||
* `make check-roslyn` - Runs the Roslyn test suite.
|
||||
* `make check-coreclr` - Runs the CoreCLR test suite.
|
||||
* `make coreclr-runtest-coremanglib` - Runs only the CoreMangLib portion of the CoreCLR tests, those tests mostly target the BCL behavior.
|
||||
* `make coreclr-runtest-basic` - Runs only the CoreCLR tests that target runtime behavior and stability.
|
||||
* `make coreclr-compile-tests` - Convenience target that precompiles all the test cases in parallel.
|
||||
* `make coreclr-gcstress` - Runs the CoreCLR GC stress tests.
|
||||
|
||||
## Updating submodules
|
||||
|
||||
The SUBMODULES.json file stores information about the submodules, and make targets are used to check out submodules, check their versions, and update the submodule information:
|
||||
|
||||
* `make validate-<module>` - Checks whenever `<module>` is checked out and matches the version in the info file.
|
||||
* `make reset-<module>` - Clones `<module>` if neccesary and checks out the revision specified in the info file.
|
||||
* `make bump-<module>` - Updates the revision stored in the info file for `<module>`.
|
||||
* `make bump-current-<module>` - Updates the revision stored in the info file for `<module>` to the current revision.
|
||||
* `make commit-bump-<module>` - Same as `make bump-<module>`, but commits the change.
|
||||
* `make commit-bump-current-<module>` - Same as `make bump-current-<module>`, but commits the change.
|
||||
|
||||
Example: when making a change in the CoreCLR submodule (like disabling something on Mono), you'd commit the change there and then run `make bump-current-coreclr` or `make commit-bump-current-coreclr` to update the version in SUBMODULES.json.
|
||||
|
||||
@ -10,7 +10,7 @@
|
||||
{
|
||||
"name": "coreclr",
|
||||
"url": "git://github.com/mono/coreclr.git",
|
||||
"rev": "96cf61f96b42cf9d013e641609cb7787f6e3a71f",
|
||||
"rev": "c7da48acf72c40c0c0ed1a80ebfacea21bb3a271",
|
||||
"remote-branch": "origin/mono",
|
||||
"branch": "mono",
|
||||
"directory": "coreclr"
|
||||
@ -18,7 +18,7 @@
|
||||
{
|
||||
"name": "ms-test-suite",
|
||||
"url": "git@github.com:xamarin/ms-test-suite.git",
|
||||
"rev": "8eb26bd72a38e2c78675db45b13e89237dbdf4f2",
|
||||
"rev": "840653918efed24f00f5e166094f06354cae7255",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "ms-test-suite"
|
||||
|
||||
1
acceptance-tests/coreclr.mk.REMOVED.git-id
Normal file
1
acceptance-tests/coreclr.mk.REMOVED.git-id
Normal file
@ -0,0 +1 @@
|
||||
8f75b05470fe46685d232f3a35933dbc1080fc59
|
||||
10
acceptance-tests/ms-test-suite.mk
Normal file
10
acceptance-tests/ms-test-suite.mk
Normal file
@ -0,0 +1,10 @@
|
||||
check-ms-test-suite:
|
||||
@if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -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)/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
|
||||
24
acceptance-tests/roslyn.mk
Normal file
24
acceptance-tests/roslyn.mk
Normal file
@ -0,0 +1,24 @@
|
||||
check-roslyn:
|
||||
@$(MAKE) validate-roslyn RESET_VERSIONS=1
|
||||
@if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
|
||||
sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
|
||||
export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
|
||||
MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
|
||||
MONO_NUGET_TARGETS_DIR=$$PREFIX/lib/mono/xbuild/Microsoft/NuGet/; \
|
||||
MONO_PORTABLE_TARGETS_DIR=$$PREFIX/lib/mono/xbuild/Microsoft/Portable/v5.0; \
|
||||
if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v5.0" ]; then \
|
||||
mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \
|
||||
mkdir -p $$MONO_NUGET_TARGETS_DIR; \
|
||||
mkdir -p $$MONO_PORTABLE_TARGETS_DIR; \
|
||||
curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
|
||||
unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \
|
||||
cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \
|
||||
cp /tmp/RoslynBuildDependencies/NuGetTargets/* $$MONO_NUGET_TARGETS_DIR; \
|
||||
cp /tmp/RoslynBuildDependencies/PortableTargets/* $$MONO_PORTABLE_TARGETS_DIR; \
|
||||
fi; \
|
||||
cd $(ROSLYN_PATH); \
|
||||
sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
|
||||
sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
|
||||
./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \
|
||||
sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
|
||||
exit $$EXIT_CODE
|
||||
@ -1,127 +1,12 @@
|
||||
.PHONY: validate-versions reset-versions
|
||||
|
||||
CONFIG=SUBMODULES.json
|
||||
|
||||
# usage $(call ValidateVersionTemplate (name,MAKEFILE VAR,repo name))
|
||||
# usage $(call ValidateVersionTemplate (mono,MONO,mono))
|
||||
|
||||
define ValidateVersionTemplate
|
||||
#$(eval REPOSITORY_$(2):=$(shell test -z $(3) && echo $(1) || echo "$(3)"))
|
||||
#$(eval DIRECTORY_$(2):=$(shell python versions.py get-dir $(1)))
|
||||
#$(eval DIRECTORY_$(2):=$(shell test -z $(DIRECTORY_$(2)) && echo $(1) || echo $(DIRECTORY_$(2))))
|
||||
#$(eval MODULE_$(2):=$(shell python versions.py get-url $(1)))
|
||||
#$(eval NEEDED_$(2)_VERSION:=$(shell python versions.py get-rev $(1)))
|
||||
#$(eval $(2)_BRANCH_AND_REMOTE:=$(shell python versions.py get-remote-branch $(1)))
|
||||
|
||||
#$(eval $(2)_VERSION:=$$$$(shell cd $($(2)_PATH) 2>/dev/null && git rev-parse HEAD ))
|
||||
|
||||
#$(eval NEEDED_$(2)_BRANCH:=$(word 2, $(subst /, ,$($(2)_BRANCH_AND_REMOTE))))
|
||||
#$(eval NEEDED_$(2)_REMOTE:=$(word 1, $(subst /, ,$($(2)_BRANCH_AND_REMOTE))))
|
||||
#$(eval $(2)_BRANCH:=$$$$(shell cd $($(2)_PATH) 2>/dev/null && git symbolic-ref --short HEAD 2>/dev/null))
|
||||
|
||||
validate-$(1)::
|
||||
@if test x$$(IGNORE_$(2)_VERSION) = "x"; then \
|
||||
if test ! -d $($(2)_PATH); then \
|
||||
if test x$$(RESET_VERSIONS) != "x"; then \
|
||||
$(MAKE) reset-$(1) || exit 1; \
|
||||
else \
|
||||
echo "Your $(1) checkout is missing, please run 'make reset-$(1)'"; \
|
||||
touch .validate-versions-failure; \
|
||||
fi; \
|
||||
else \
|
||||
if test "x$($(2)_VERSION)" != "x$(NEEDED_$(2)_VERSION)" ; then \
|
||||
if test x$$(RESET_VERSIONS) != "x"; then \
|
||||
$(MAKE) reset-$(1) || exit 1; \
|
||||
else \
|
||||
echo "Your $(1) version is out of date, please run 'make reset-$(1)' (found $($(2)_VERSION), expected $(NEEDED_$(2)_VERSION))"; \
|
||||
test -z "$(BUILD_REVISION)" || $(MAKE) test-$(1); \
|
||||
touch .validate-versions-failure; \
|
||||
fi; \
|
||||
elif test "x$($(2)_BRANCH)" != "x$(NEEDED_$(2)_BRANCH)" ; then \
|
||||
if test x$$(RESET_VERSIONS) != "x"; then \
|
||||
test -z "$(BUILD_REVISION)" || $(MAKE) test-$(1); \
|
||||
$(MAKE) reset-$(1) || exit 1; \
|
||||
else \
|
||||
echo "Your $(1) branch is out of date, please run 'make reset-$(1)' (found $($(2)_BRANCH), expected $(NEEDED_$(2)_BRANCH))"; \
|
||||
touch .validate-versions-failure; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi; \
|
||||
fi
|
||||
|
||||
test-$(1)::
|
||||
@echo $(1)
|
||||
@echo " REPOSITORY_$(2)=$(REPOSITORY_$(2))"
|
||||
@echo " DIRECTORY_$(2)=$(DIRECTORY_$(2))"
|
||||
@echo " MODULE_$(2)=$(MODULE_$(2))"
|
||||
@echo " NEEDED_$(2)_VERSION=$(NEEDED_$(2)_VERSION)"
|
||||
@echo " $(2)_VERSION=$($(2)_VERSION)"
|
||||
@echo " $(2)_BRANCH_AND_REMOTE=$($(2)_BRANCH_AND_REMOTE)"
|
||||
@echo " NEEDED_$(2)_BRANCH=$(NEEDED_$(2)_BRANCH)"
|
||||
@echo " NEEDED_$(2)_REMOTE=$(NEEDED_$(2)_REMOTE)"
|
||||
@echo " $(2)_BRANCH=$($(2)_BRANCH)"
|
||||
@echo " $(2)_PATH=$($(2)_PATH) => $(abspath $($(2)_PATH))"
|
||||
|
||||
reset-$(1)::
|
||||
@if test -d $($(2)_PATH); then \
|
||||
if ! (cd $($(2)_PATH) && git show $(NEEDED_$(2)_VERSION) >/dev/null 2>&1 && git log -1 $(NEEDED_$(2)_REMOTE) >/dev/null 2>&1) ; then \
|
||||
echo "*** git fetch `basename $$($(2)_PATH)`" && (cd $($(2)_PATH) && git fetch); \
|
||||
fi; \
|
||||
else \
|
||||
echo "*** git clone $(MODULE_$(2)) --recursive $(DIRECTORY_$(2))" && (cd `dirname $($(2)_PATH)` && git clone $(MODULE_$(2)) --recursive $(DIRECTORY_$(2)) || exit 1 ); \
|
||||
fi
|
||||
@if test x$$(IGNORE_$(2)_VERSION) = "x"; then \
|
||||
echo "*** [$(1)] git checkout -f" $(NEEDED_$(2)_BRANCH) && (cd $($(2)_PATH) ; git checkout -f $(NEEDED_$(2)_BRANCH) || git checkout -f -b $($(2)_BRANCH_AND_REMOTE)); \
|
||||
echo "*** [$(1)] git reset --hard $(NEEDED_$(2)_VERSION)" && (cd $($(2)_PATH) && git reset --hard $(NEEDED_$(2)_VERSION)); \
|
||||
fi
|
||||
@echo "*** [$(1)] git submodule update --init --recursive" && (cd $($(2)_PATH) && git submodule update --init --recursive)
|
||||
|
||||
print-$(1)::
|
||||
@printf "*** %-16s %-45s %s (%s)\n" "$(DIRECTORY_$(2))" "$(MODULE_$(2))" "$(NEEDED_$(2)_VERSION)" "$(NEEDED_$(2)_BRANCH)"
|
||||
|
||||
.PHONY: validate-$(1) reset-$(1) print-$(1)
|
||||
|
||||
reset-versions:: reset-$(1)
|
||||
validate-versions:: Validate-$(1)
|
||||
print-versions:: print-$(1)
|
||||
|
||||
endef
|
||||
SUBMODULES_CONFIG_FILE = $(top_srcdir)/acceptance-tests/SUBMODULES.json
|
||||
include $(top_srcdir)/scripts/submodules/versions.mk
|
||||
|
||||
$(eval $(call ValidateVersionTemplate,roslyn,ROSLYN))
|
||||
$(eval $(call ValidateVersionTemplate,coreclr,CORECLR))
|
||||
$(eval $(call ValidateVersionTemplate,ms-test-suite,MSTESTSUITE))
|
||||
|
||||
reset-versions::
|
||||
|
||||
validate-versions::
|
||||
@if test -e .validate-versions-failure; then \
|
||||
rm .validate-versions-failure; \
|
||||
echo One or more modules needs update; \
|
||||
exit 1; \
|
||||
else \
|
||||
echo All dependent modules up to date; \
|
||||
fi
|
||||
|
||||
reset:
|
||||
@$(MAKE) validate-versions RESET_VERSIONS=1
|
||||
|
||||
__bump-version-%:
|
||||
@if [ "$(REV)" = "" ]; then echo "Usage: make bump-version-$* REV=<ref>"; exit 1; fi
|
||||
python versions.py set-rev $* $(REV)
|
||||
@if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to pick up $(REV)." | git commit -F - $(CONFIG); fi
|
||||
|
||||
__bump-branch-%:
|
||||
@if [ "$(BRANCH)" = "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
|
||||
@if [ "$(REMOTE_BRANCH)" == "" ]; then echo "Usage: make bump-branch-$* BRANCH=<branch> REMOTE_BRANCH=<remote branch>"; exit 1; fi
|
||||
python versions.py set-branch $* $(BRANCH)
|
||||
python versions.py set-remote-branch $* $(REMOTE_BRANCH)
|
||||
@if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to switch to $(BRANCH) $(REMOTE BRANCH)." | git commit -F - $(CONFIG); fi
|
||||
|
||||
__bump-current-version-%:
|
||||
REV=$(shell cd $(TOP)/../$* && git log -1 --pretty=format:%H); \
|
||||
python versions.py set-rev $* $$REV; \
|
||||
if [ "$(COMMIT)" = "1" ]; then echo "[acceptance-tests] Bump $* to pick up $$REV:" | git commit -F - $(CONFIG); fi
|
||||
|
||||
# Bump the given submodule to the revision given by the REV make variable
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-roslyn: __bump-version-roslyn
|
||||
|
||||
@ -1,52 +0,0 @@
|
||||
#!/usr/bin/env python
|
||||
|
||||
import sys
|
||||
import json
|
||||
|
||||
def find_module(submodules, name):
|
||||
for item in submodules:
|
||||
if item["name"] == name:
|
||||
return item
|
||||
|
||||
print "Not found"
|
||||
sys.exit(1)
|
||||
|
||||
|
||||
if len(sys.argv) < 2:
|
||||
print "Usage: versions.py <command>"
|
||||
sys.exit(1)
|
||||
|
||||
CONFIG_FILE = "SUBMODULES.json"
|
||||
command = sys.argv[1]
|
||||
|
||||
submodules = json.load(open(CONFIG_FILE))
|
||||
|
||||
if command == "get-rev":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
print mod["rev"]
|
||||
elif command == "get-url":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
print mod["url"]
|
||||
elif command == "get-dir":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
print mod["directory"]
|
||||
elif command == "get-remote-branch":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
print mod["remote-branch"]
|
||||
elif command == "set-rev":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
mod["rev"] = sys.argv[3]
|
||||
json.dump(submodules, open(CONFIG_FILE, "w"), indent = 2)
|
||||
elif command == "set-branch":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
mod["branch"] = sys.argv[3]
|
||||
json.dump(submodules, open(CONFIG_FILE, "w"), indent = 2)
|
||||
elif command == "set-remote-branch":
|
||||
mod = find_module(submodules, sys.argv[2])
|
||||
mod["remote-branch"] = sys.argv[3]
|
||||
json.dump(submodules, open(CONFIG_FILE, "w"), indent = 2)
|
||||
elif command == "cat":
|
||||
print json.dumps(submodules, indent = 2)
|
||||
else:
|
||||
print "Unknown command "" + command + ""."
|
||||
sys.exit(1)
|
||||
@ -161,7 +161,9 @@ if test -d $srcdir/eglib; then
|
||||
fi
|
||||
|
||||
|
||||
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
|
||||
echo "MONO_EXTRA_CONFIGURE_FLAGS is $MONO_EXTRA_CONFIGURE_FLAGS"
|
||||
|
||||
conf_flags="$MONO_EXTRA_CONFIGURE_FLAGS --enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
|
||||
|
||||
if test x$NOCONFIGURE = x; then
|
||||
echo Running $srcdir/configure $conf_flags "$@" ...
|
||||
|
||||
99
config.h.in
99
config.h.in
@ -1,8 +1,5 @@
|
||||
/* config.h.in. Generated from configure.ac by autoheader. */
|
||||
|
||||
/* Enable checked build. */
|
||||
#undef CHECKED_BUILD
|
||||
|
||||
/* GC description */
|
||||
#undef DEFAULT_GC_NAME
|
||||
|
||||
@ -36,6 +33,9 @@
|
||||
/* Disable generics support */
|
||||
#undef DISABLE_GENERICS
|
||||
|
||||
/* ... */
|
||||
#undef DISABLE_HW_TRAPS
|
||||
|
||||
/* Icall tables disabled */
|
||||
#undef DISABLE_ICALL_TABLES
|
||||
|
||||
@ -112,15 +112,24 @@
|
||||
/* Disables the verifier */
|
||||
#undef DISABLE_VERIFIER
|
||||
|
||||
/* Enable checked build */
|
||||
#undef ENABLE_CHECKED_BUILD
|
||||
|
||||
/* Enable GC checked build */
|
||||
#undef ENABLE_CHECKED_BUILD_GC
|
||||
|
||||
/* Enable metadata checked build */
|
||||
#undef ENABLE_CHECKED_BUILD_METADATA
|
||||
|
||||
/* Enable thread checked build */
|
||||
#undef ENABLE_CHECKED_BUILD_THREAD
|
||||
|
||||
/* Enable DTrace probes */
|
||||
#undef ENABLE_DTRACE
|
||||
|
||||
/* Extension module enabled */
|
||||
#undef ENABLE_EXTENSION_MODULE
|
||||
|
||||
/* Gsharedvt */
|
||||
#undef ENABLE_GSHAREDVT
|
||||
|
||||
/* Icall export enabled */
|
||||
#undef ENABLE_ICALL_EXPORT
|
||||
|
||||
@ -139,6 +148,9 @@
|
||||
/* Have GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY */
|
||||
#undef GLIBC_BEFORE_2_3_4_SCHED_SETAFFINITY
|
||||
|
||||
/* Define to 1 if you have the `accept4' function. */
|
||||
#undef HAVE_ACCEPT4
|
||||
|
||||
/* Has the 'aintl' function */
|
||||
#undef HAVE_AINTL
|
||||
|
||||
@ -178,12 +190,18 @@
|
||||
/* Define to 1 if you have the <checklist.h> header file. */
|
||||
#undef HAVE_CHECKLIST_H
|
||||
|
||||
/* Define to 1 if you have the `clock_nanosleep' function. */
|
||||
#undef HAVE_CLOCK_NANOSLEEP
|
||||
|
||||
/* Define to 1 if you have the <CommonCrypto/CommonDigest.h> header file. */
|
||||
#undef HAVE_COMMONCRYPTO_COMMONDIGEST_H
|
||||
|
||||
/* Define to 1 if you have the <complex.h> header file. */
|
||||
#undef HAVE_COMPLEX_H
|
||||
|
||||
/* Defaults to concurrent GC */
|
||||
#undef HAVE_CONC_GC_AS_DEFAULT
|
||||
|
||||
/* Define to 1 if you have the `confstr' function. */
|
||||
#undef HAVE_CONFSTR
|
||||
|
||||
@ -506,9 +524,6 @@
|
||||
/* No GC support. */
|
||||
#undef HAVE_NULL_GC
|
||||
|
||||
/* Have oprofile support */
|
||||
#undef HAVE_OPROFILE
|
||||
|
||||
/* Define to 1 if you have the <pathconf.h> header file. */
|
||||
#undef HAVE_PATHCONF_H
|
||||
|
||||
@ -587,6 +602,9 @@
|
||||
/* Define to 1 if you have the `remap_file_pages' function. */
|
||||
#undef HAVE_REMAP_FILE_PAGES
|
||||
|
||||
/* Define to 1 if you have the `sched_getaffinity' function. */
|
||||
#undef HAVE_SCHED_GETAFFINITY
|
||||
|
||||
/* Define to 1 if you have the `sched_getcpu' function. */
|
||||
#undef HAVE_SCHED_GETCPU
|
||||
|
||||
@ -692,6 +710,9 @@
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to 1 if the system has the type `struct cmsghdr'. */
|
||||
#undef HAVE_STRUCT_CMSGHDR
|
||||
|
||||
/* Define to 1 if `d_off' is a member of `struct dirent'. */
|
||||
#undef HAVE_STRUCT_DIRENT_D_OFF
|
||||
|
||||
@ -725,6 +746,21 @@
|
||||
/* Define to 1 if the system has the type `struct pollfd'. */
|
||||
#undef HAVE_STRUCT_POLLFD
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr_in'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR_IN
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr_in6'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR_IN6
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr_storage'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR_STORAGE
|
||||
|
||||
/* Define to 1 if the system has the type `struct sockaddr_un'. */
|
||||
#undef HAVE_STRUCT_SOCKADDR_UN
|
||||
|
||||
/* Define to 1 if the system has the type `struct stat'. */
|
||||
#undef HAVE_STRUCT_STAT
|
||||
|
||||
@ -941,9 +977,42 @@
|
||||
/* Define to 1 if you have the `_finite' function. */
|
||||
#undef HAVE__FINITE
|
||||
|
||||
/* ... */
|
||||
#undef HOST_AMD64
|
||||
|
||||
/* ... */
|
||||
#undef HOST_ARM
|
||||
|
||||
/* ... */
|
||||
#undef HOST_ARM64
|
||||
|
||||
/* ... */
|
||||
#undef HOST_IA64
|
||||
|
||||
/* ... */
|
||||
#undef HOST_MIPS
|
||||
|
||||
/* ... */
|
||||
#undef HOST_POWERPC
|
||||
|
||||
/* ... */
|
||||
#undef HOST_POWERPC64
|
||||
|
||||
/* ... */
|
||||
#undef HOST_S390X
|
||||
|
||||
/* ... */
|
||||
#undef HOST_SPARC
|
||||
|
||||
/* ... */
|
||||
#undef HOST_SPARC64
|
||||
|
||||
/* Host Platform is Win32 */
|
||||
#undef HOST_WIN32
|
||||
|
||||
/* ... */
|
||||
#undef HOST_X86
|
||||
|
||||
/* Define as const if the declaration of iconv() needs const. */
|
||||
#undef ICONV_CONST
|
||||
|
||||
@ -966,12 +1035,12 @@
|
||||
/* The runtime is compiled for cross-compiling mode */
|
||||
#undef MONO_CROSS_COMPILE
|
||||
|
||||
/* Disable banned functions from being used by the runtime */
|
||||
#undef MONO_INSIDE_RUNTIME
|
||||
|
||||
/* The LLVM back end is dynamically loaded */
|
||||
#undef MONO_LLVM_LOADED
|
||||
|
||||
/* native types */
|
||||
#undef MONO_NATIVE_TYPES
|
||||
|
||||
/* AOT cross offsets file */
|
||||
#undef MONO_OFFSETS_FILE
|
||||
|
||||
@ -1104,9 +1173,6 @@
|
||||
/* ... */
|
||||
#undef USE_GCC_ATOMIC_OPS
|
||||
|
||||
/* Use jump tables in JIT */
|
||||
#undef USE_JUMP_TABLES
|
||||
|
||||
/* Use kqueue for the threadpool */
|
||||
#undef USE_KQUEUE_FOR_THREADPOOL
|
||||
|
||||
@ -1119,9 +1185,6 @@
|
||||
/* Version number of package */
|
||||
#undef VERSION
|
||||
|
||||
/* ... */
|
||||
#undef __default_codegen__
|
||||
|
||||
/* 64 bit mode with 4 byte longs and pointers */
|
||||
#undef __mono_ilp32__
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
047d2af192055dda39f35c668102b5948e87c44b
|
||||
ac3c1fec80751ac6a5cc40288f081a109fea4933
|
||||
@ -1 +1 @@
|
||||
2517961607b5dcd9778743fe589d6ff7f167a776
|
||||
7f99d462698fe5c7678472257969149675e4f373
|
||||
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