mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 17:10:20 -10:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b538187892 | ||
|
|
1028e14aef | ||
|
|
62031dcabf | ||
|
|
a6203e5d2d | ||
|
|
b493ada939 | ||
|
|
000780ca82 | ||
|
|
969357ac02 | ||
|
|
fb7bbea8f9 | ||
|
|
1fd01f4fd7 | ||
|
|
e1af6ea5e7 | ||
|
|
288a9254f5 | ||
|
|
d95b5e57c4 | ||
|
|
1d40dbb42e | ||
|
|
5b9b00dd61 | ||
|
|
99f7533b63 | ||
|
|
33a0966d83 | ||
|
|
4d8bdab15e | ||
|
|
4309250dcd | ||
|
|
2334327c43 | ||
|
|
ddb9dc31f3 | ||
|
|
9fca0d8760 | ||
|
|
46ff31252d | ||
|
|
72175aa65a | ||
|
|
0f3df535f2 | ||
|
|
93b43680c0 | ||
|
|
cca6805688 | ||
|
|
82b313a29e | ||
|
|
cedb9d921d | ||
|
|
e613a64b4f | ||
|
|
e2018ed1e7 | ||
|
|
d092c53b97 | ||
|
|
582f242d47 | ||
|
|
ad910039be | ||
|
|
172a5333ba | ||
|
|
f3a2216b65 | ||
|
|
07ac089735 | ||
|
|
d31dbe843a | ||
|
|
a4ac628267 | ||
|
|
4f10cd1027 | ||
|
|
16538b28e3 | ||
|
|
e92217aad3 | ||
|
|
b25c713504 | ||
|
|
ebc0c7c215 | ||
|
|
d851c21b1f | ||
|
|
d4a680b045 | ||
|
|
0d29bd39f1 | ||
|
|
2e6757dae9 | ||
|
|
6a7c7f6853 | ||
|
|
ba63aa3589 | ||
|
|
9d4d9a8668 | ||
|
|
c95a4a2d2c | ||
|
|
5f411d9696 | ||
|
|
c03434f8f4 | ||
|
|
9d69811fd6 | ||
|
|
2389814c3c | ||
|
|
5a3352aba2 | ||
|
|
0a4c7bb91b | ||
|
|
33b8e6c418 | ||
|
|
c060398eae | ||
|
|
095dbce56f | ||
|
|
c2f12ea864 | ||
|
|
d0bb0ce89f | ||
|
|
18080dc75a | ||
|
|
872843aa92 | ||
|
|
3645833a7a | ||
|
|
5e8001a4ff | ||
|
|
639ca72904 | ||
|
|
d68cb85dc6 | ||
|
|
6f5656ea86 | ||
|
|
33f6b1d249 | ||
|
|
8ae8c52383 | ||
|
|
c87ebef727 | ||
|
|
f22c8b706e | ||
|
|
9d43da2ebf | ||
|
|
3737edb881 | ||
|
|
07c8f25fe5 | ||
|
|
335e62c3a0 | ||
|
|
36fe14548c | ||
|
|
6de3d54a24 | ||
|
|
cb54c26f6c | ||
|
|
569bd3bc52 | ||
|
|
1f44e26ab4 | ||
|
|
7b9563bc1c | ||
|
|
615252ca70 | ||
|
|
47fe82d812 | ||
|
|
0fd16dfa23 | ||
|
|
56521df97b | ||
|
|
e129a25c91 | ||
|
|
543b6872fe | ||
|
|
ed7cb7a6b7 | ||
|
|
33a9dca493 | ||
|
|
7008c37886 | ||
|
|
854f3e2952 | ||
|
|
c54cae3345 | ||
|
|
5d60a2b843 | ||
|
|
1f3334fd93 | ||
|
|
23c06f5e54 | ||
|
|
9def5c0a11 | ||
|
|
c903094761 | ||
|
|
462f511222 | ||
|
|
a08e664e4c | ||
|
|
2987232bc1 | ||
|
|
5ddc0c5fdf | ||
|
|
b2ded076c9 | ||
|
|
fa9903bcc1 | ||
|
|
820bff26b3 | ||
|
|
6d28c8f962 | ||
|
|
b2cac0129f | ||
|
|
8c55e41d50 | ||
|
|
ba806e58df | ||
|
|
0e0bf762ed | ||
|
|
46e3bd5099 | ||
|
|
67c1e412e2 | ||
|
|
b705cec3c7 | ||
|
|
a18994cc41 | ||
|
|
efe1fdeb9d | ||
|
|
993fc87b3f | ||
|
|
737ecd1033 | ||
|
|
09855094c1 | ||
|
|
419d3136fe | ||
|
|
97101d40aa | ||
|
|
4785686a4d | ||
|
|
61c25c4e10 | ||
|
|
99fedb1741 | ||
|
|
32ae8ad528 | ||
|
|
c1ef203b2c | ||
|
|
a7160188e5 | ||
|
|
ef73a4955d | ||
|
|
769481d834 | ||
|
|
4e47c8dfdc | ||
|
|
c4492e0949 | ||
|
|
ab6962b183 | ||
|
|
ad1a10e4a4 | ||
|
|
ecf6b88205 | ||
|
|
f3577389f6 | ||
|
|
9a4c8f3398 | ||
|
|
f42debee5e | ||
|
|
9ca82d47ee | ||
|
|
ce195600a3 | ||
|
|
da473eaff5 | ||
|
|
858aa226dc | ||
|
|
fd09fd9d44 | ||
|
|
12a2142852 | ||
|
|
c7b237f1be | ||
|
|
0ebfd3e385 | ||
|
|
50d84a3719 | ||
|
|
3e566852dc | ||
|
|
61fa43b909 | ||
|
|
196ea0219b | ||
|
|
b7db3364a0 | ||
|
|
20ae78fcc8 | ||
|
|
a5af7f28dc | ||
|
|
869e019e15 | ||
|
|
3ddda667e1 | ||
|
|
599f3dd3af | ||
|
|
efdd8353ed | ||
|
|
cf3e776887 | ||
|
|
38ffddd6c7 | ||
|
|
f2943b182a | ||
|
|
584b77e402 | ||
|
|
34bb601d18 | ||
|
|
b759166b96 | ||
|
|
b7015d6fd2 | ||
|
|
68f94932b7 | ||
|
|
de3c8c587a | ||
|
|
766778b545 | ||
|
|
3693fb14f4 | ||
|
|
98a3dd7f34 | ||
|
|
32ba15ee0b | ||
|
|
0931f21c4c | ||
|
|
85e13e6e2f | ||
|
|
d835b7d55f | ||
|
|
1d946e0f38 | ||
|
|
bfa85bcaaa | ||
|
|
ecd24fa6b5 | ||
|
|
eee8ff7cfc | ||
|
|
99a992605f | ||
|
|
13aa6b7199 | ||
|
|
3472efcdf9 | ||
|
|
1029de3147 | ||
|
|
2859780927 | ||
|
|
61ab3f7a34 | ||
|
|
6d5d7b57f2 | ||
|
|
f710b2c8e5 | ||
|
|
e50ce8ad66 | ||
|
|
b818777705 | ||
|
|
05ed822a48 | ||
|
|
0a5fdb5841 | ||
|
|
13183bc82b | ||
|
|
147e34f254 | ||
|
|
561092003c | ||
|
|
6cdbc561fc | ||
|
|
0dba58a734 | ||
|
|
c0af9ad2cc | ||
|
|
88b6094e06 | ||
|
|
4fbdeebbe8 | ||
|
|
bd8731da01 | ||
|
|
ea838e84f1 | ||
|
|
c3ae712ab1 | ||
|
|
7af9ad8cdb | ||
|
|
5921faad1c | ||
|
|
4bad0d6765 | ||
|
|
b0aaec8e96 | ||
|
|
e0b0a87e65 | ||
|
|
b8fb7b5e18 | ||
|
|
8a20f0dfff | ||
|
|
04529e90e2 | ||
|
|
83d7bc1a0c | ||
|
|
d1c10f8693 | ||
|
|
e9b1c90e9d | ||
|
|
59e6eb29e6 | ||
|
|
5053d17e50 |
No files matched your search
@@ -1,7 +1,3 @@
|
||||
<!--
|
||||
If you are new to the project get yourself familiar with https://www.mono-project.com/community/bugs/make-a-good-bug-report/ before filling the issue
|
||||
-->
|
||||
|
||||
## Steps to Reproduce
|
||||
|
||||
1.
|
||||
@@ -12,19 +8,19 @@ If you are new to the project get yourself familiar with https://www.mono-projec
|
||||
You may drag & drop the attachment (repro code/solution, screenshot, etc.) onto the issue.
|
||||
-->
|
||||
|
||||
### Current Behavior
|
||||
## Current Behavior
|
||||
|
||||
<!--
|
||||
What is the current behavior?
|
||||
-->
|
||||
|
||||
### Expected Behavior
|
||||
## Expected Behavior
|
||||
|
||||
<!--
|
||||
Please describe the behavior you are expecting
|
||||
-->
|
||||
|
||||
## On which platforms did you notice this
|
||||
### On which platforms did you notice this
|
||||
|
||||
[ ] macOS
|
||||
[ ] Linux
|
||||
@@ -36,12 +32,14 @@ Please describe the behavior you are expecting
|
||||
You can use `mono --version` or About dialog to obtain this information.
|
||||
-->
|
||||
|
||||
## Stacktrace
|
||||
### Stacktrace
|
||||
|
||||
```
|
||||
Please paste the stack trace here if available.
|
||||
```
|
||||
|
||||
<!--
|
||||
|
||||
You can join us at https://gitter.im/mono/mono to discuss your reported issue
|
||||
|
||||
-->
|
||||
+1
-2
@@ -90,7 +90,6 @@ stamp-h.in
|
||||
*.swp
|
||||
*.o
|
||||
.deps
|
||||
.libs
|
||||
|
||||
# Libtool
|
||||
libtool.m4
|
||||
@@ -131,4 +130,4 @@ mono-*.tar.*
|
||||
tmpinst-dir.stamp
|
||||
msvc/scripts/inputs/
|
||||
extensions-config.h
|
||||
*.mlpd
|
||||
|
||||
Vendored
+1
-1
@@ -87,5 +87,5 @@
|
||||
}
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
"version": 3
|
||||
}
|
||||
+1
-1
@@ -102,7 +102,7 @@
|
||||
/msvc/*profiler* @alexrp
|
||||
/msvc/scripts @akoeplinger @kg
|
||||
|
||||
/packaging/ @alexischr @akoeplinger @luhenry @directhex
|
||||
/packaging/ @alexischr @akoeplinger @luhenry
|
||||
/packaging/MacSDK/msbuild.py @radical @akoeplinger
|
||||
|
||||
/runtime @akoeplinger @marek-safar @luhenry
|
||||
|
||||
+3
-11
@@ -11,9 +11,9 @@ else
|
||||
tools_dir = tools
|
||||
endif
|
||||
|
||||
SUBDIRS = mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests
|
||||
SUBDIRS = po $(libgc_dir) mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
|
||||
# Keep in sync with SUBDIRS
|
||||
DIST_SUBDIRS = m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
|
||||
DIST_SUBDIRS = m4 po $(libgc_dir) mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
|
||||
|
||||
all: update_submodules
|
||||
|
||||
@@ -42,13 +42,6 @@ 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 -rf `find $(top_distdir)/external -path '*\.libs'`
|
||||
rm -rf `find $(top_distdir)/external -path '*\.deps'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.o'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.so'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.lo'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.Plo'`
|
||||
rm -f `find $(top_distdir)/external -name '\.dirstamp'`
|
||||
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/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
@@ -133,7 +126,6 @@ package-inputs:
|
||||
(echo " <project dir=\"$$1\" library=\"$$2\">"; \
|
||||
read boot; echo " <boot>$$boot</boot>"; \
|
||||
read flags; echo " <flags>$$flags</flags>"; \
|
||||
read sources;echo " <sources>$$sources</sources>"; \
|
||||
read output; echo " <output>$$output</output>"; \
|
||||
read built; echo " <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
|
||||
read libou; echo " <library_output>$$libou</library_output>"; \
|
||||
@@ -152,7 +144,7 @@ update-llvm-version:
|
||||
|
||||
|
||||
update-solution-files:
|
||||
cd msvc/scripts && $(MAKE) genproj.exe || exit $$?;
|
||||
(pushd msvc/scripts; rm genproj.exe; $(MAKE) genproj.exe; popd)
|
||||
$(MAKE) update-csproj
|
||||
$(MAKE) package-inputs
|
||||
(cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS))
|
||||
|
||||
@@ -3,7 +3,7 @@ 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](https://www.dotnetfoundation.org/)
|
||||
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)
|
||||
|
||||
@@ -30,7 +30,6 @@ The Mono project is part of the [.NET Foundation](https://www.dotnetfoundation.o
|
||||
| Windows | i386 | [![windows-i386][17]][18] |
|
||||
| CentOS | s390x (cs) | [![centos-s390x][19]][20] |
|
||||
| Debian 9 | ppc64el (cs) | [![debian-9-ppc64el][21]][22]|
|
||||
| AIX | ppc64 (cs) | [![aix-ppc64][23]][24] |
|
||||
|
||||
_(cs) = community supported architecture_
|
||||
|
||||
@@ -56,8 +55,6 @@ _(cs) = community supported architecture_
|
||||
[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el
|
||||
[23]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=aix-ppc64/badge/icon
|
||||
[24]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=aix-ppc64
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@@ -66,15 +63,15 @@ Building the Software
|
||||
---------------------
|
||||
|
||||
Please see our guides for building Mono on
|
||||
[Mac OS X](https://www.mono-project.com/docs/compiling-mono/mac/),
|
||||
[Linux](https://www.mono-project.com/docs/compiling-mono/linux/) and
|
||||
[Windows](https://www.mono-project.com/docs/compiling-mono/windows/).
|
||||
[Mac OS X](http://www.mono-project.com/docs/compiling-mono/mac/),
|
||||
[Linux](http://www.mono-project.com/docs/compiling-mono/linux/) and
|
||||
[Windows](http://www.mono-project.com/docs/compiling-mono/windows/).
|
||||
|
||||
Note that building from Git assumes that you already have Mono installed,
|
||||
so please download and [install the latest Mono release](https://www.mono-project.com/download/)
|
||||
so please download and [install the latest Mono release](http://www.mono-project.com/download/)
|
||||
before trying to build from Git. This is required because the Mono build
|
||||
relies on a working Mono C# compiler to compile itself
|
||||
(also known as [bootstrapping](https://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
|
||||
(also known as [bootstrapping](http://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
|
||||
|
||||
If you don't have a working Mono installation
|
||||
---------------------------------------------
|
||||
@@ -203,9 +200,9 @@ Contributing to Mono
|
||||
====================
|
||||
|
||||
Before submitting changes to Mono, please review the [contribution
|
||||
guidelines](https://www.mono-project.com/community/contributing/).
|
||||
guidelines](http://www.mono-project.com/community/contributing/).
|
||||
Please pay particular attention to the [Important
|
||||
Rules](https://www.mono-project.com/community/contributing/#important-rules)
|
||||
Rules](http://www.mono-project.com/community/contributing/#important-rules)
|
||||
section.
|
||||
|
||||
Reporting bugs
|
||||
@@ -215,7 +212,7 @@ To submit bug reports, please [open an issue on the mono GitHub repo](https://gi
|
||||
|
||||
Please use the search facility to ensure the same bug hasn't already
|
||||
been submitted and follow our
|
||||
[guidelines](https://www.mono-project.com/community/bugs/make-a-good-bug-report/)
|
||||
[guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
|
||||
on how to make a good bug report.
|
||||
|
||||
Configuration Options
|
||||
@@ -244,12 +241,12 @@ Disables the inclusion of a Boehm garbage collector.
|
||||
|
||||
* This defaults to `included`.
|
||||
|
||||
* `--enable-cooperative-suspend`
|
||||
* `--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_SUSPEND` flag.
|
||||
cooperative GC mode by setting the `MONO_ENABLE_COOP` flag.
|
||||
|
||||
* `--with-tls=__thread,pthread`
|
||||
|
||||
@@ -435,7 +432,7 @@ for Mono. The LLVM code generator and optimizer will be
|
||||
used instead of Mono's built-in code generator for both
|
||||
Just in Time and Ahead of Time compilations.
|
||||
|
||||
* See https://www.mono-project.com/docs/advanced/mono-llvm/ for the
|
||||
* See http://www.mono-project.com/docs/advanced/mono-llvm/ for the
|
||||
full details and up-to-date information on this feature.
|
||||
|
||||
* You will need to have an LLVM built that Mono can link
|
||||
@@ -504,7 +501,7 @@ also, see the man page.
|
||||
|
||||
* This configures the Mono compiler to generate code
|
||||
suitable to be used by Google's Native Client:
|
||||
https://code.google.com/p/nativeclient/
|
||||
http://code.google.com/p/nativeclient/
|
||||
|
||||
* Currently this is used with Mono's AOT engine as
|
||||
Native Client does not support JIT engines yet.
|
||||
@@ -578,7 +575,7 @@ file for information about Microsoft's patent grant.
|
||||
Mono Trademark Use Policy
|
||||
=========================
|
||||
|
||||
The use of trademarks and logos for Mono can be found [here](https://www.dotnetfoundation.org/legal/mono-tm).
|
||||
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
|
||||
============================================
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace System.Runtime.Loader
|
||||
{
|
||||
public static class AssemblyExtensions
|
||||
{
|
||||
public static Type[] GetTypes(this Assembly assembly)
|
||||
{
|
||||
return assembly.GetTypes ();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ 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 profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
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
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
{
|
||||
"name": "roslyn",
|
||||
"url": "git://github.com/mono/roslyn.git",
|
||||
"rev": "7a840bd5697ef6ea41f554a09d837636fba9d88d",
|
||||
"rev": "1d9895045041925490038c5df0d8f947d8dcbd7f",
|
||||
"remote-branch": "origin/mono-testing",
|
||||
"branch": "mono-testing",
|
||||
"directory": "roslyn"
|
||||
@@ -10,7 +10,7 @@
|
||||
{
|
||||
"name": "coreclr",
|
||||
"url": "git://github.com/mono/coreclr.git",
|
||||
"rev": "f3d9c9f742f9dcb5faf40080db5e7f464dab7e7c",
|
||||
"rev": "83d8279997d8ce4ad344ff9b937b2d13d074dcaa",
|
||||
"remote-branch": "origin/mono",
|
||||
"branch": "mono",
|
||||
"directory": "coreclr"
|
||||
|
||||
@@ -2162,6 +2162,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleepsilon.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleequals1.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleequals2.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doublegethashcode.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleiconvertibletoboolean.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleiconvertibletobyte.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleiconvertibletodatetime.cs \
|
||||
@@ -3241,6 +3242,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/security/securityexception/securityexceptionctor3.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/security/securityexception/securityexceptiontostring.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleepsilon.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singlegethashcode.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleisinfinity.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleisnan.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleisnegativeinfinity.cs \
|
||||
@@ -3689,8 +3691,9 @@ CORECLR_STRESSTEST_RUNNER_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/GC/Stress/Framework/RFLogging.cs \
|
||||
$(CORECLR_PATH)/tests/src/GC/Stress/Framework/DetourHelpers.cs \
|
||||
$(CORECLR_PATH)/tests/src/GC/Stress/Framework/LoaderClass.cs \
|
||||
GCStressTests/AssemblyLoadContext.cs
|
||||
|
||||
GCStressTests/AssemblyLoadContext.cs \
|
||||
GCStressTests/AssemblyExtensions.cs
|
||||
|
||||
CORECLR_TESTLIBRARY_CS_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/TestFramework.cs \
|
||||
$(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/Utilities.cs \
|
||||
@@ -3712,7 +3715,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/readytorun/main.cs \
|
||||
$(CORECLR_PATH)/tests/src/readytorun/test.cs
|
||||
|
||||
|
||||
# relies on a referenced managed or native assembly, to complicated here:
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/Regressions/assemblyref/assem.cs \
|
||||
@@ -3852,7 +3855,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/datetime/cfdatetimetools.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/datetime/datetimeisdaylightsavingtime.cs
|
||||
|
||||
|
||||
# relies on delegatedefinitions.cs helper
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/multicastdelegate/multicastdelegatector.cs \
|
||||
@@ -3960,7 +3963,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/public/testclass.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/tests/bindingtarget.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/tests/testclass.cs
|
||||
|
||||
|
||||
# samples (should probably be removed upstream)
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/hosting/samples/hosting/usercode/usercode.cs \
|
||||
@@ -4966,6 +4969,7 @@ CORECLR_TEST_IL_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/ddb/118414/118414.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/ddb/127931/127931.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/vsw/102974/test.il \
|
||||
@@ -5057,9 +5061,6 @@ CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/coverage/oldtests/lcliimpl.il
|
||||
|
||||
# We use an r4 for r4-r8 stack merge so it loses precision
|
||||
CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
|
||||
|
||||
# FIXME: these tests are baselined, i.e. we don't have time to investigate
|
||||
# them right now but want to make sure we don't introduce new regressions
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
check-roslyn:
|
||||
@$(MAKE) validate-roslyn RESET_VERSIONS=1
|
||||
cd $(ROSLYN_PATH); \
|
||||
./build.sh --restore --build --test --mono || exit; \
|
||||
./mono-testing.sh "$(XUNIT)" || exit; \
|
||||
echo "done"
|
||||
+3
-5
@@ -89,11 +89,9 @@ if test x$NOCONFIGURE = x && test -z "$*"; then
|
||||
echo
|
||||
fi
|
||||
|
||||
am_opt="--add-missing --copy --gnu -Wno-portability -Wno-obsolete"
|
||||
|
||||
case $CC in
|
||||
xlc )
|
||||
am_opt="$am_opt --include-deps";;
|
||||
am_opt=--include-deps;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -144,8 +142,8 @@ if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
echo "Running automake $am_opt ..."
|
||||
automake $am_opt ||
|
||||
echo "Running automake --gnu $am_opt ..."
|
||||
automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
|
||||
{ echo "**Error**: automake failed."; exit 1; }
|
||||
echo "Running autoconf ..."
|
||||
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
|
||||
|
||||
+448
-1345
File diff suppressed because it is too large.
Load diff
+1
-3
@@ -11,9 +11,6 @@
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Security.Cryptography.Native.Apple" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="osx" />
|
||||
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
@@ -43,4 +40,5 @@
|
||||
<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="System.Native" target="__Internal"/>
|
||||
</configuration>
|
||||
+12
-12
@@ -53,7 +53,7 @@ def stringify_class_name(ns, name):
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "{0}.{1}".format (ns, name)
|
||||
return "{}.{}".format (ns, name)
|
||||
|
||||
class ArrayPrinter:
|
||||
"Print a C# array"
|
||||
@@ -66,7 +66,7 @@ class ArrayPrinter:
|
||||
def to_string(self):
|
||||
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
|
||||
length = obj ['max_length']
|
||||
return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
|
||||
return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
|
||||
|
||||
class ObjectPrinter:
|
||||
"Print a C# object"
|
||||
@@ -96,7 +96,7 @@ class ObjectPrinter:
|
||||
return (field.name, self.obj [field.name])
|
||||
except:
|
||||
# Superclass
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
|
||||
|
||||
def children(self):
|
||||
# FIXME: It would be easier if gdb.Value would support iteration itself
|
||||
@@ -109,7 +109,7 @@ class ObjectPrinter:
|
||||
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
|
||||
if class_name [-2:len(class_name)] == "[]":
|
||||
return {}.__iter__ ()
|
||||
gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
|
||||
return self._iterator(obj.cast (gdb_type))
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
@@ -129,12 +129,12 @@ class ObjectPrinter:
|
||||
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
|
||||
if class_ns != "":
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
|
||||
except:
|
||||
# Maybe there is no debug info for that type
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
#return obj.cast (gdb_type)
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
return class_name
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
@@ -154,9 +154,9 @@ class MonoMethodPrinter:
|
||||
val = self.val.dereference ()
|
||||
klass = val ["klass"].dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
|
||||
return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
|
||||
class MonoClassPrinter:
|
||||
"Print a MonoClass structure"
|
||||
@@ -169,9 +169,9 @@ class MonoClassPrinter:
|
||||
return "0x0"
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"{0}\"".format (class_name)
|
||||
return "\"{}\"".format (class_name)
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
|
||||
def lookup_pretty_printer(val):
|
||||
t = str (val.type)
|
||||
@@ -245,4 +245,4 @@ exec_file = gdb.current_objfile ().filename
|
||||
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
|
||||
exec_file = os.readlink (exec_file)
|
||||
exec_dir = os.path.dirname (exec_file)
|
||||
gdb.execute ("source {0}/{1}-gdbinit".format (exec_dir, os.path.basename (exec_file)))
|
||||
gdb.execute ("source {}/{}-gdbinit".format (exec_dir, os.path.basename (exec_file)))
|
||||
+16
-16
@@ -48,7 +48,7 @@ def stringify_class_name(ns, name):
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "{0}.{1}".format (ns, name)
|
||||
return "{}.{}".format (ns, name)
|
||||
|
||||
class ArrayPrinter:
|
||||
"Print a C# array"
|
||||
@@ -61,7 +61,7 @@ class ArrayPrinter:
|
||||
def to_string(self):
|
||||
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
|
||||
length = obj ['max_length']
|
||||
return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
|
||||
class ObjectPrinter:
|
||||
"Print a C# object"
|
||||
@@ -91,7 +91,7 @@ class ObjectPrinter:
|
||||
return (field.name, self.obj [field.name])
|
||||
except:
|
||||
# Superclass
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
|
||||
|
||||
def children(self):
|
||||
# FIXME: It would be easier if gdb.Value would support iteration itself
|
||||
@@ -105,7 +105,7 @@ class ObjectPrinter:
|
||||
if class_name [-2:len(class_name)] == "[]":
|
||||
return {}.__iter__ ()
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
|
||||
return self._iterator(obj.cast (gdb_type))
|
||||
except:
|
||||
return {}.__iter__ ()
|
||||
@@ -127,12 +127,12 @@ class ObjectPrinter:
|
||||
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
|
||||
if class_ns != "":
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
|
||||
except:
|
||||
# Maybe there is no debug info for that type
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
#return obj.cast (gdb_type)
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
return class_name
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
@@ -152,9 +152,9 @@ class MonoMethodPrinter:
|
||||
val = self.val.dereference ()
|
||||
klass = val ["klass"].dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
|
||||
return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
|
||||
class MonoClassPrinter:
|
||||
"Print a MonoClass structure"
|
||||
@@ -168,11 +168,11 @@ class MonoClassPrinter:
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
if add_quotes:
|
||||
return "\"{0}\"".format (class_name)
|
||||
return "\"{}\"".format (class_name)
|
||||
else:
|
||||
return class_name
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
|
||||
def to_string(self):
|
||||
try:
|
||||
@@ -220,7 +220,7 @@ class MonoGenericClassPrinter:
|
||||
method_inst_str = ""
|
||||
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
|
||||
method_inst_str = str(method_inst)
|
||||
return "{0}, [{1}], [{2}]>".format (container_str, class_inst_str, method_inst_str)
|
||||
return "{}, [{}], [{}]>".format (container_str, class_inst_str, method_inst_str)
|
||||
|
||||
def to_string(self):
|
||||
try:
|
||||
@@ -250,9 +250,9 @@ class MonoTypePrinter:
|
||||
info = str(t ["data"]["generic_class"])
|
||||
|
||||
if info != "":
|
||||
return "{{{0}, {1}}}".format (kind, info)
|
||||
return "{{{}, {}}}".format (kind, info)
|
||||
else:
|
||||
return "{{{0}}}".format (kind)
|
||||
return "{{{}}}".format (kind)
|
||||
except:
|
||||
#print (sys.exc_info ()[0])
|
||||
#print (sys.exc_info ()[1])
|
||||
@@ -281,7 +281,7 @@ class MonoMethodRgctxPrinter:
|
||||
if i > 0:
|
||||
inst_str = inst_str + ", "
|
||||
inst_str = inst_str + type_printer.to_string ()
|
||||
return "MRGCTX[{0}, [{1}]]".format (klass_printer.to_string(), inst_str)
|
||||
return "MRGCTX[{}, [{}]]".format (klass_printer.to_string(), inst_str)
|
||||
|
||||
class MonoVTablePrinter:
|
||||
"Print a MonoVTable structure"
|
||||
@@ -296,7 +296,7 @@ class MonoVTablePrinter:
|
||||
klass = vtable ["klass"]
|
||||
klass_printer = MonoClassPrinter (klass)
|
||||
|
||||
return "vtable({0})".format (klass_printer.to_string ())
|
||||
return "vtable({})".format (klass_printer.to_string ())
|
||||
|
||||
def lookup_pretty_printer(val):
|
||||
t = str (val.type)
|
||||
|
||||
Vendored
+1
-1
Submodule external/api-snapshot updated: 0d0099c3d6...7d24404abd.
Vendored
+1
-1
Submodule external/binary-reference-assemblies updated: 9334822c58...c7ca004a74.
Vendored
+1
-1
Submodule external/bockbuild updated: 276398e269...b46c84105b.
Vendored
+1
-1
Submodule external/boringssl updated: 3d87996698...345755cb49.
Vendored
+1
-1
Submodule external/cecil updated: e5d5fa4a73...b6c50e3d34.
Vendored
+1
-1
Submodule external/corefx updated: 7524de0039...871e5d71e7.
Vendored
+1
-1
Submodule external/corert updated: 1b7d4a1e4b...d8bc0e6412.
Vendored
+1
-1
Submodule external/ikdasm updated: 471d5827c9...e3eecbfab8.
Vendored
+1
-1
Submodule external/linker updated: e6760e6f54...d18d497504.
Vendored
+1
-1
Submodule external/nuget-buildtasks updated: 9955847957...b2c30bc81b.
Vendored
+1
-1
Submodule external/nunit-lite updated: cff3321322...00e259a4bd.
Vendored
+1
-1
Submodule external/roslyn-binaries updated: 249709faa5...0542d0d56f.
Vendored
+1
-1
Submodule external/xunit-binaries updated: bb583470c7...9df2dda529.
@@ -1,11 +1,9 @@
|
||||
|
||||
AM_CPPFLAGS = $(GLIB_CFLAGS)
|
||||
|
||||
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
|
||||
|
||||
lib_LTLIBRARIES = libikvm-native.la
|
||||
|
||||
libikvm_native_la_SOURCES = jni.c os.c jni.h
|
||||
|
||||
libikvm_native_la_LDFLAGS = -avoid-version
|
||||
libikvm_native_la_LIBADD = $(glib_libs)
|
||||
libikvm_native_la_LIBADD = $(GLIB_LIBS)
|
||||
+4
-5
@@ -74,13 +74,12 @@ if test x$NOCONFIGURE = x && test -z "$*"; then
|
||||
echo
|
||||
fi
|
||||
|
||||
am_opt="--add-missing --copy --gnu -Wno-obsolete"
|
||||
|
||||
case $CC in
|
||||
xlc )
|
||||
am_opt="$am_opt --include-deps";;
|
||||
am_opt=--include-deps;;
|
||||
esac
|
||||
|
||||
|
||||
if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
|
||||
if test -z "$NO_LIBTOOLIZE" ; then
|
||||
echo "Running libtoolize..."
|
||||
@@ -105,8 +104,8 @@ if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
echo "Running automake $am_opt ..."
|
||||
automake $am_opt ||
|
||||
echo "Running automake --gnu $am_opt ..."
|
||||
automake --add-missing --gnu -Wno-obsolete $am_opt ||
|
||||
{ echo "**Error**: automake failed."; exit 1; }
|
||||
echo "Running autoconf ..."
|
||||
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
|
||||
|
||||
+9
-37
@@ -42,6 +42,11 @@
|
||||
# define GC_CONST
|
||||
# endif
|
||||
|
||||
# ifdef __cplusplus
|
||||
extern "C" {
|
||||
# endif
|
||||
|
||||
|
||||
/* Define word and signed_word to be unsigned and signed types of the */
|
||||
/* size as char * or void *. There seems to be no way to do this */
|
||||
/* even semi-portably. The following is probably no better/worse */
|
||||
@@ -61,10 +66,6 @@
|
||||
typedef __int64 GC_signed_word;
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* Public read-only variables */
|
||||
|
||||
GC_API GC_word GC_gc_no;/* Counter incremented per collection. */
|
||||
@@ -500,17 +501,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb));
|
||||
#endif
|
||||
|
||||
#if defined(__linux__) || defined(__GLIBC__)
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# include <features.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
|
||||
&& !defined(__ia64__)
|
||||
# ifndef GC_HAVE_BUILTIN_BACKTRACE
|
||||
@@ -974,17 +965,7 @@ GC_API void (*GC_is_visible_print_proc)
|
||||
|
||||
#if !defined(GC_USE_LD_WRAP) && \
|
||||
(defined(GC_PTHREADS) || defined(GC_SOLARIS_THREADS) || defined(GC_DARWIN_THREADS) || defined(GC_MACOSX_THREADS))
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# include "gc_pthread_redirects.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
# if defined(PCR) || defined(GC_SOLARIS_THREADS) || \
|
||||
@@ -1004,17 +985,8 @@ extern void GC_thr_init(void); /* Needed for Solaris/X86 */
|
||||
#endif /* THREADS && !SRC_M3 */
|
||||
|
||||
#if defined(GC_WIN32_THREADS) && !defined(__CYGWIN32__) && !defined(__CYGWIN__)
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# include <windows.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
# ifdef GC_INSIDE_DLL
|
||||
BOOL WINAPI GC_DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved);
|
||||
# endif
|
||||
@@ -1109,10 +1081,6 @@ extern "C" {
|
||||
GC_API void GC_win32_free_heap ();
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#if ( defined(_AMIGA) && !defined(GC_AMIGA_MAKINGLIB) )
|
||||
/* Allocation really goes through GC_amiga_allocwrapper_do */
|
||||
# include "gc_amiga_redirects.h"
|
||||
@@ -1122,4 +1090,8 @@ extern "C" {
|
||||
# include "gc_local_alloc.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} /* end of extern "C" */
|
||||
#endif
|
||||
|
||||
#endif /* _GC_H */
|
||||
@@ -44,10 +44,6 @@
|
||||
# include "gc.h"
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* The following allocators signal an out of memory condition with */
|
||||
/* return GC_oom_fn(bytes); */
|
||||
|
||||
@@ -114,8 +110,4 @@ extern int GC_gcj_debug_kind;
|
||||
GC_gcj_malloc_ignore_off_page(s,d)
|
||||
# endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* GC_GCJ_H */
|
||||
@@ -49,10 +49,6 @@
|
||||
#ifndef GC_LOCAL_ALLOC_H
|
||||
#define GC_LOCAL_ALLOC_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* We assume ANSI C for this interface. */
|
||||
|
||||
GC_PTR GC_local_malloc(size_t bytes);
|
||||
@@ -66,10 +62,6 @@ GC_PTR GC_local_malloc_atomic(size_t bytes);
|
||||
void * ptr_to_struct_containing_descr);
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# ifdef GC_DEBUG
|
||||
/* We don't really use local allocation in this case. */
|
||||
# define GC_LOCAL_MALLOC(s) GC_debug_malloc(s,GC_EXTRAS)
|
||||
|
||||
@@ -15,11 +15,6 @@
|
||||
/* facility in thr_keycreate. Alternatively, keep a redundant pointer */
|
||||
/* to thread specific data on the thread stack. */
|
||||
# include <thread.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int GC_thr_create(void *stack_base, size_t stack_size,
|
||||
void *(*start_routine)(void *), void *arg, long flags,
|
||||
thread_t *new_thread);
|
||||
@@ -31,22 +26,11 @@ extern "C" {
|
||||
# define thr_join GC_thr_join
|
||||
# define thr_suspend GC_thr_suspend
|
||||
# define thr_continue GC_thr_continue
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* GC_SOLARIS_THREADS */
|
||||
|
||||
#if defined(GC_SOLARIS_PTHREADS)
|
||||
|
||||
# include <pthread.h>
|
||||
# include <signal.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern int GC_pthread_create(pthread_t *new_thread,
|
||||
const pthread_attr_t *attr,
|
||||
void * (*thread_execp)(void *), void *arg);
|
||||
@@ -55,11 +39,6 @@ extern "C" {
|
||||
# define pthread_join GC_pthread_join
|
||||
# define pthread_create GC_pthread_create
|
||||
# define pthread_detach GC_pthread_detach
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(GC_SOLARIS_PTHREADS) || defined(GC_SOLARIS_THREADS)
|
||||
@@ -72,10 +51,6 @@ extern "C" {
|
||||
# include <pthread.h>
|
||||
# include <signal.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int GC_pthread_create(pthread_t *new_thread,
|
||||
const pthread_attr_t *attr,
|
||||
void *(*start_routine)(void *), void *arg);
|
||||
@@ -112,10 +87,6 @@ extern "C" {
|
||||
# define dlopen GC_dlopen
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
#endif /* GC_xxxxx_THREADS */
|
||||
|
||||
#endif /* GC_PTHREAD_REDIRECTS_H */
|
||||
@@ -43,17 +43,7 @@
|
||||
*
|
||||
*/
|
||||
# ifdef THREADS
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
void GC_noop1 GC_PROTO((word));
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# ifdef PCR_OBSOLETE /* Faster, but broken with multiple lwp's */
|
||||
# include "th/PCR_Th.h"
|
||||
# include "th/PCR_ThCrSec.h"
|
||||
|
||||
@@ -366,10 +366,6 @@ void GC_print_callers GC_PROTO((struct callinfo info[NFRAMES]));
|
||||
# define BZERO(x,n) bzero((char *)(x),(int)(n))
|
||||
# endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#if defined(DARWIN)
|
||||
# if defined(POWERPC)
|
||||
# define GC_MACH_THREAD_STATE_FLAVOR PPC_THREAD_STATE
|
||||
@@ -417,18 +413,7 @@ extern "C" {
|
||||
* Stop and restart mutator threads.
|
||||
*/
|
||||
# ifdef PCR
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# include "th/PCR_ThCtl.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
|
||||
# define STOP_WORLD() \
|
||||
PCR_ThCtl_SetExclusiveMode(PCR_ThCtl_ExclusiveMode_stopNormal, \
|
||||
PCR_allSigsBlocked, \
|
||||
@@ -1330,7 +1315,7 @@ void GC_initiate_gc GC_PROTO((void));
|
||||
/* If the mark state is invalid, this */
|
||||
/* becomes full colleection. Otherwise */
|
||||
/* it's partial. */
|
||||
void GC_push_all (void* bottom, void* top);
|
||||
void GC_push_all GC_PROTO((ptr_t bottom, ptr_t top));
|
||||
/* Push everything in a range */
|
||||
/* onto mark stack. */
|
||||
void GC_push_selected GC_PROTO(( \
|
||||
@@ -1975,10 +1960,6 @@ void GC_err_puts GC_PROTO((GC_CONST char *s));
|
||||
/* some other reason. */
|
||||
# endif /* PARALLEL_MARK */
|
||||
|
||||
#ifdef __cplusplus
|
||||
} // extern "C"
|
||||
#endif
|
||||
|
||||
# if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS)
|
||||
/* We define the thread suspension signal here, so that we can refer */
|
||||
/* to it in the dirty bit implementation, if necessary. Ideally we */
|
||||
|
||||
+4
-6
@@ -1191,13 +1191,11 @@ void GC_mark_init()
|
||||
* Should only be used if there is no possibility of mark stack
|
||||
* overflow.
|
||||
*/
|
||||
void GC_push_all(void_bottom, void_top)
|
||||
void* void_bottom;
|
||||
void* void_top;
|
||||
void GC_push_all(bottom, top)
|
||||
ptr_t bottom;
|
||||
ptr_t top;
|
||||
{
|
||||
ptr_t bottom = (ptr_t)void_bottom;
|
||||
ptr_t top = (ptr_t)void_top;
|
||||
word length;
|
||||
register word length;
|
||||
|
||||
bottom = (ptr_t)(((word) bottom + ALIGNMENT-1) & ~(ALIGNMENT-1));
|
||||
top = (ptr_t)(((word) top) & ~(ALIGNMENT-1));
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
/Makefile
|
||||
/Makefile.in
|
||||
/llvm_config.mk
|
||||
+22
-48
@@ -1,56 +1,30 @@
|
||||
#
|
||||
# Conditional submodule for llvm
|
||||
#
|
||||
# make reset-llvm will checkout a version of llvm which is suitable for this version of mono
|
||||
# into $top_srcdir/llvm/llvm.
|
||||
#
|
||||
|
||||
EXTRA_DIST=SUBMODULES.json build.mk build_llvm_config.sh
|
||||
LLVM_PATH=llvm
|
||||
|
||||
if ENABLE_LLVM
|
||||
SUBMODULES_CONFIG_FILE = $(top_srcdir)/llvm/SUBMODULES.json
|
||||
include $(top_srcdir)/scripts/submodules/versions.mk
|
||||
|
||||
if HOST_WIN32
|
||||
llvm_config=llvm-config.exe
|
||||
else
|
||||
llvm_config=llvm-config
|
||||
endif
|
||||
$(eval $(call ValidateVersionTemplate,llvm,LLVM))
|
||||
|
||||
if HAVE_ZLIB
|
||||
llvm_extra_libs=-lz
|
||||
else
|
||||
llvm_extra_libs=
|
||||
endif
|
||||
# Bump the given submodule to the revision given by the REV make variable
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-llvm: __bump-version-llvm
|
||||
|
||||
if INTERNAL_LLVM
|
||||
# Bump the given submodule to the branch given by the BRANCH/REMOTE_BRANCH make variables
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-branch-llvm: __bump-branch-llvm
|
||||
|
||||
all-local: configure-llvm build-llvm install-llvm llvm_config.mk
|
||||
# Bump the given submodule to its current GIT version
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-current-llvm: __bump-current-version-llvm
|
||||
|
||||
clean-local: clean-llvm clean-llvm-config
|
||||
clean-local:
|
||||
$(RM) -r $(LLVM_PATH)
|
||||
|
||||
$(mono_build_root)/llvm/llvm_config.mk: install-llvm
|
||||
$(top_srcdir)/llvm/build_llvm_config.sh "$(top_srcdir)/llvm/usr/bin/$(llvm_config)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" > $@
|
||||
|
||||
else
|
||||
all-local: llvm_config.mk
|
||||
|
||||
clean-local: clean-llvm-config
|
||||
|
||||
$(mono_build_root)/llvm/llvm_config.mk: $(top_srcdir)/llvm/Makefile.am
|
||||
$(top_srcdir)/llvm/build_llvm_config.sh "$(EXTERNAL_LLVM_CONFIG)" "$(LLVM_CODEGEN_LIBS)" "$(llvm_extra_libs)" > $@
|
||||
endif
|
||||
|
||||
llvm_config.mk: $(mono_build_root)/llvm/llvm_config.mk
|
||||
|
||||
clean-llvm-config:
|
||||
- rm -rf llvm_config.mk
|
||||
|
||||
else
|
||||
all-local:
|
||||
|
||||
clean-local:
|
||||
endif
|
||||
|
||||
# Override this so we don't try to re-copy llvm when we install mono
|
||||
install:
|
||||
|
||||
if TARGET_WASM
|
||||
LLVM_TARGET=wasm32
|
||||
else
|
||||
LLVM_TARGET=
|
||||
endif
|
||||
|
||||
include build.mk
|
||||
EXTRA_DIST=SUBMODULES.json
|
||||
@@ -2,9 +2,9 @@
|
||||
{
|
||||
"name": "llvm",
|
||||
"url": "git://github.com/mono/llvm.git",
|
||||
"rev": "349752c464c5fc93b32e7d45825f2890c85c8b7d",
|
||||
"remote-branch": "origin/release_60",
|
||||
"branch": "release_60",
|
||||
"rev": "9f79399f87282524fee099b328bd8cbf07929daf",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "llvm"
|
||||
}
|
||||
]
|
||||
@@ -1,89 +0,0 @@
|
||||
#
|
||||
# Conditional submodule for llvm
|
||||
#
|
||||
# make reset-llvm will checkout a version of llvm which is suitable for this version of mono
|
||||
# into $top_srcdir/llvm/llvm.
|
||||
#
|
||||
# Input variables
|
||||
# - LLVM_TARGET: if set to wasm32 will trigger a 32bits build that enable the experimental WebAssembly backend
|
||||
#
|
||||
|
||||
top_srcdir ?= $(abspath $(CURDIR)/..)
|
||||
|
||||
LLVM_PATH ?= $(abspath $(top_srcdir)/external/llvm)
|
||||
LLVM_BUILD ?= $(abspath $(top_srcdir)/llvm/build)
|
||||
LLVM_PREFIX ?= $(abspath $(top_srcdir)/llvm/usr)
|
||||
|
||||
# FIXME: URL should be http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-$(NEEDED_LLVM_BRANCH)/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz
|
||||
LLVM_DOWNLOAD_LOCATION = "http://xamjenkinsartifact.blob.core.windows.net/build-package-osx-llvm-release60/llvm-osx64-$(NEEDED_LLVM_VERSION).tar.gz"
|
||||
|
||||
CMAKE := $(or $(CMAKE),$(shell which cmake))
|
||||
NINJA := $(shell which ninja)
|
||||
|
||||
SUBMODULES_CONFIG_FILE = $(top_srcdir)/llvm/SUBMODULES.json
|
||||
include $(top_srcdir)/scripts/submodules/versions.mk
|
||||
|
||||
$(eval $(call ValidateVersionTemplate,llvm,LLVM))
|
||||
|
||||
# Bump the given submodule to the revision given by the REV make variable
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-llvm: __bump-version-llvm
|
||||
|
||||
# Bump the given submodule to the branch given by the BRANCH/REMOTE_BRANCH make variables
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-branch-llvm: __bump-branch-llvm
|
||||
|
||||
# Bump the given submodule to its current GIT version
|
||||
# If COMMIT is 1, commit the change
|
||||
bump-current-llvm: __bump-current-version-llvm
|
||||
|
||||
$(LLVM_BUILD) $(LLVM_PREFIX):
|
||||
mkdir -p $@
|
||||
|
||||
$(LLVM_PATH):
|
||||
$(MAKE) -f build.mk reset-llvm
|
||||
|
||||
$(LLVM_PATH)/CMakeLists.txt: | $(LLVM_PATH)
|
||||
|
||||
EXTRA_LLVM_ARGS = $(if $(filter $(LLVM_TARGET),wasm32), -DLLVM_BUILD_32_BITS=On -DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="WebAssembly",)
|
||||
|
||||
# -DLLVM_ENABLE_LIBXML2=Off is needed because xml2 is not used and it breaks 32-bit builds on 64-bit Linux hosts
|
||||
$(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile): $(LLVM_PATH)/CMakeLists.txt | $(LLVM_BUILD)
|
||||
cd $(LLVM_BUILD) && $(CMAKE) \
|
||||
$(if $(NINJA),-G Ninja) \
|
||||
-DCMAKE_INSTALL_PREFIX="$(LLVM_PREFIX)" \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DLLVM_BUILD_TESTS=Off \
|
||||
-DLLVM_INCLUDE_TESTS=Off \
|
||||
-DLLVM_BUILD_EXAMPLES=Off \
|
||||
-DLLVM_INCLUDE_EXAMPLES=Off \
|
||||
-DLLVM_TOOLS_TO_BUILD="opt;llc;llvm-config;llvm-dis" \
|
||||
-DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" \
|
||||
$(EXTRA_LLVM_ARGS) \
|
||||
-DLLVM_ENABLE_ASSERTIONS=$(if $(INTERNAL_LLVM_ASSERTS),On,Off) \
|
||||
-DLLVM_ENABLE_LIBXML2=Off \
|
||||
-DHAVE_FUTIMENS=0 \
|
||||
$(LLVM_CMAKE_ARGS) \
|
||||
$(dir $<)
|
||||
|
||||
.PHONY: configure-llvm
|
||||
configure-llvm: $(LLVM_BUILD)/$(if $(NINJA),build.ninja,Makefile)
|
||||
|
||||
# The DESTDIR fix is to prevent the build from trying to install this out-of-build-tree
|
||||
# as the DESTDIR hasn't been created when we're building mono
|
||||
|
||||
.PHONY: build-llvm
|
||||
build-llvm: configure-llvm
|
||||
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE)) -C $(LLVM_BUILD)
|
||||
|
||||
.PHONY: install-llvm
|
||||
install-llvm: build-llvm | $(LLVM_PREFIX)
|
||||
DESTDIR="" $(if $(NINJA),$(NINJA),$(MAKE)) -C $(LLVM_BUILD) install
|
||||
|
||||
.PHONY: download-llvm
|
||||
download-llvm:
|
||||
(wget --no-verbose -O - $(LLVM_DOWNLOAD_LOCATION) || curl -L $(LLVM_DOWNLOAD_LOCATION)) | tar -xzf - -C $(dir $(LLVM_PREFIX))
|
||||
|
||||
.PHONY: clean-llvm
|
||||
clean-llvm:
|
||||
$(RM) -r $(LLVM_BUILD) $(LLVM_PREFIX)
|
||||
@@ -1,172 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
llvm_config=$1
|
||||
llvm_codegen_libs="$2"
|
||||
llvm_extra_libs="${@:3}"
|
||||
|
||||
use_llvm_config=1
|
||||
llvm_host_win32=0
|
||||
llvm_host_win32_wsl=0
|
||||
llvm_host_win32_cygwin=0
|
||||
|
||||
function win32_format_path {
|
||||
local formatted_path=$1
|
||||
if [[ $llvm_host_win32_wsl = 1 ]] && [[ $1 != "/mnt/"* ]]; then
|
||||
# if path is not starting with /mnt under WSL it could be a windows path, convert using wslpath.
|
||||
formatted_path="$(wslpath -a "$1")"
|
||||
elif [[ $llvm_host_win32_cygwin = 1 ]] && [[ $1 != "/cygdrive/"* ]]; then
|
||||
# if path is not starting with /cygdrive under CygWin it could be a windows path, convert using cygpath.
|
||||
formatted_path="$(cygpath -a "$1")"
|
||||
fi
|
||||
echo "$formatted_path"
|
||||
}
|
||||
|
||||
if [[ $llvm_config = *".exe" ]]; then
|
||||
llvm_host_win32=1
|
||||
# llvm-config is a windows binary. Check if we are running CygWin or WSL since then we might still be able to run llvm-config.exe
|
||||
host_uname="$(uname -a)"
|
||||
case "$host_uname" in
|
||||
*Microsoft*)
|
||||
use_llvm_config=1
|
||||
llvm_host_win32_wsl=1
|
||||
;;
|
||||
CYGWIN*)
|
||||
use_llvm_config=1
|
||||
llvm_host_win32_cygwin=1
|
||||
;;
|
||||
*)
|
||||
use_llvm_config=0
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ $llvm_host_win32 = 1 ]]; then
|
||||
llvm_config=$(win32_format_path "$llvm_config")
|
||||
fi
|
||||
|
||||
if [[ $use_llvm_config = 1 ]]; then
|
||||
llvm_api_version=`$llvm_config --mono-api-version` || "0"
|
||||
with_llvm=`$llvm_config --prefix`
|
||||
llvm_config_cflags=`$llvm_config --cflags`
|
||||
llvm_system=`$llvm_config --system-libs`
|
||||
llvm_core_components=`$llvm_config --libs analysis core bitwriter`
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_old_jit=`$llvm_config --libs mcjit jit 2>>/dev/null`
|
||||
else
|
||||
llvm_old_jit=`$llvm_config --libs mcjit 2>>/dev/null`
|
||||
fi
|
||||
llvm_new_jit=`$llvm_config --libs orcjit 2>>/dev/null`
|
||||
|
||||
if [[ ! -z $llvm_codegen_libs ]]; then
|
||||
llvm_extra=`$llvm_config --libs $llvm_codegen_libs`
|
||||
fi
|
||||
|
||||
# When building for Windows subsystem using WSL or CygWin the path returned from llvm-config.exe
|
||||
# could be a Windows style path, make sure to format it into a path usable for WSL/CygWin.
|
||||
if [[ $llvm_host_win32 = 1 ]]; then
|
||||
with_llvm=$(win32_format_path "$with_llvm")
|
||||
fi
|
||||
fi
|
||||
|
||||
# When cross compiling for Windows on system not capable of running Windows binaries, llvm-config.exe can't be used to query for
|
||||
# LLVM parameters. In that scenario we will need to fallback to default values.
|
||||
if [[ $llvm_host_win32 = 1 ]] && [[ $use_llvm_config = 0 ]]; then
|
||||
# Assume we have llvm-config sitting in llvm-install-root/bin directory, get llvm-install-root directory.
|
||||
with_llvm="$(dirname $llvm_config)"
|
||||
with_llvm="$(dirname $with_llvm)"
|
||||
llvm_config_path=$with_llvm/include/llvm/Config/llvm-config.h
|
||||
|
||||
# llvm-config.exe --mono-api-version
|
||||
llvm_api_version=`awk '/MONO_API_VERSION/ { print $3 }' $llvm_config_path`
|
||||
|
||||
# llvm-config.exe --cflags, returned information currently not used.
|
||||
llvm_config_cflags=
|
||||
|
||||
# llvm-config.exe --system-libs
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_system="-limagehlp -lpsapi -lshell32"
|
||||
else
|
||||
llvm_system="-lpsapi -lshell32 -lole32 -luuid -ladvapi32"
|
||||
fi
|
||||
|
||||
# llvm-config.exe --libs analysis core bitwriter
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_core_components="-lLLVMBitWriter -lLLVMAnalysis -lLLVMTarget -lLLVMMC -lLLVMCore -lLLVMSupport"
|
||||
else
|
||||
llvm_core_components="-lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle"
|
||||
fi
|
||||
|
||||
# llvm-config.exe --libs mcjit jit
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_old_jit="-lLLVMJIT -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMExecutionEngine -lLLVMMC -lLLVMCore -lLLVMSupport"
|
||||
else
|
||||
# Current build of LLVM 60 for cross Windows builds doesn't support LLVM JIT.
|
||||
llvm_old_jit=
|
||||
fi
|
||||
|
||||
# LLVM 36 doesn't support new JIT and LLVM 60 is build without LLVM JIT support for cross Windows builds.
|
||||
llvm_new_jit=
|
||||
|
||||
# Check codegen libs and add needed libraries.
|
||||
case "$llvm_codegen_libs" in
|
||||
*x86codegen*)
|
||||
# llvm-config.exe --libs x86codegen
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_extra="-lLLVMX86CodeGen -lLLVMX86Desc -lLLVMX86Info -lLLVMObject -lLLVMBitReader -lLLVMMCDisassembler -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMTarget -lLLVMMC -lLLVMCore -lLLVMSupport"
|
||||
else
|
||||
llvm_extra="-lLLVMX86CodeGen -lLLVMGlobalISel -lLLVMX86Desc -lLLVMX86Info -lLLVMMCDisassembler -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMCodeGen -lLLVMTarget -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMMC -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMSupport -lLLVMDemangle"
|
||||
fi
|
||||
;;
|
||||
*armcodegen*)
|
||||
# llvm-config.exe --libs armcodegen
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_extra="-lLLVMARMCodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMTarget -lLLVMCore -lLLVMARMDesc -lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMMC -lLLVMSupport"
|
||||
else
|
||||
llvm_extra="-lLLVMARMCodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMCodeGen -lLLVMTarget -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMARMDesc -lLLVMMCDisassembler -lLLVMARMInfo -lLLVMARMAsmPrinter -lLLVMARMUtils -lLLVMMC -lLLVMSupport -lLLVMDemangle"
|
||||
fi
|
||||
;;
|
||||
*aarch64codegen*)
|
||||
# llvm-config.exe --libs aarch64codegen
|
||||
if [[ $llvm_api_version -lt 600 ]]; then
|
||||
llvm_extra="-lLLVMAArch64CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMTarget -lLLVMCore -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMMC -lLLVMAArch64Utils -lLLVMSupport"
|
||||
else
|
||||
llvm_extra="-lLLVMAArch64CodeGen -lLLVMGlobalISel -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMDebugInfoCodeView -lLLVMDebugInfoMSF -lLLVMCodeGen -lLLVMTarget -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMBitWriter -lLLVMAnalysis -lLLVMProfileData -lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMCore -lLLVMBinaryFormat -lLLVMAArch64Desc -lLLVMAArch64Info -lLLVMAArch64AsmPrinter -lLLVMMC -lLLVMAArch64Utils -lLLVMSupport -lLLVMDemangle"
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
llvm_extra=$llvm_codegen_libs
|
||||
esac
|
||||
fi
|
||||
|
||||
if [[ $llvm_config_cflags = *"stdlib=libc++"* ]]; then
|
||||
llvm_libc_c="-stdlib=libc++"
|
||||
llvm_libc_link="-lc++"
|
||||
else
|
||||
llvm_libc_c=""
|
||||
llvm_libc_link="-lstdc++"
|
||||
fi
|
||||
|
||||
if [[ $llvm_host_win32 = 1 ]]; then
|
||||
host_cxxflag_additions="-std=gnu++11"
|
||||
host_cflag_additions="-DNDEBUG"
|
||||
else
|
||||
host_cxxflag_additions="-std=c++11"
|
||||
host_cflag_additions=""
|
||||
fi
|
||||
|
||||
if [[ ! -z $llvm_extra_libs ]]; then
|
||||
llvm_extra="$llvm_extra $llvm_extra_libs"
|
||||
fi
|
||||
|
||||
# llvm-config --clfags adds warning and optimization flags we don't want
|
||||
cflags_additions="-I$with_llvm/include -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -DLLVM_API_VERSION=$llvm_api_version $llvm_libc_c $host_cflag_additions"
|
||||
|
||||
cxxflag_additions="-fno-rtti -fexceptions $host_cxxflag_additions"
|
||||
|
||||
ldflags="-L$with_llvm/lib"
|
||||
|
||||
llvm_lib_components="$llvm_core_components $llvm_old_jit $llvm_new_jit $llvm_extra"
|
||||
|
||||
echo "LLVM_CFLAGS_INTERNAL=$cflags_additions"
|
||||
echo "LLVM_CXXFLAGS_INTERNAL=$cflags_additions $cxxflag_additions"
|
||||
echo "LLVM_LDFLAGS_INTERNAL=$ldflags"
|
||||
echo "LLVM_LIBS_INTERNAL=$llvm_lib_components $ldflags $llvm_system $llvm_libc_link"
|
||||
@@ -1,40 +0,0 @@
|
||||
# Usage:
|
||||
# AC_MONO_APPLE_TARGET(target-name, action-if-found, action-if-not-found)
|
||||
#
|
||||
# Checks whether `target-name` is defined in "TargetConditionals.h"
|
||||
#
|
||||
AC_DEFUN([AC_MONO_APPLE_TARGET], [
|
||||
AC_MONO_APPLE_AVAILABLE([$1], [for $1], [$1 == 1], $2, $3)
|
||||
])
|
||||
|
||||
|
||||
# Usage:
|
||||
# AC_MONO_APPLE_AVAILABLE(name, message, conditional, action-if-found, action-if-not-found)
|
||||
#
|
||||
# Checks for `conditional` using "TargetConditionals.h" and "AvailabilityMacros.h"
|
||||
#
|
||||
AC_DEFUN([AC_MONO_APPLE_AVAILABLE], [
|
||||
# cache the compilation check
|
||||
AC_CACHE_CHECK([$2], [ac_cv_apple_available_[]$1], [
|
||||
AC_TRY_COMPILE([
|
||||
#include "TargetConditionals.h"
|
||||
#include "AvailabilityMacros.h"
|
||||
],[
|
||||
#if !($3)
|
||||
#error failed
|
||||
#endif
|
||||
], [
|
||||
ac_cv_apple_available_[]$1=yes
|
||||
], [
|
||||
ac_cv_apple_available_[]$1=no
|
||||
])
|
||||
])
|
||||
# keep the actions out of the cache check because they need to be always executed.
|
||||
if test x$ac_cv_apple_available_[]$1 = xyes; then
|
||||
$1=yes
|
||||
[$4]
|
||||
else
|
||||
$1=no
|
||||
[$5]
|
||||
fi
|
||||
])
|
||||
@@ -2,17 +2,12 @@
|
||||
.SH NAME
|
||||
Mono CIL strip
|
||||
.SH SYNOPSIS
|
||||
.B mono-cil-strip [options] assembly [output-assembly]
|
||||
.B mono-cil-strip assembly [output-assembly]
|
||||
.SH DESCRIPTION
|
||||
mono-cil-strip is a tool which takes an assembly, and empty its method bodies.
|
||||
This is useful to reduce an assembly size when an assembly has already been
|
||||
compiled using Mono's Ahead Of Time compiler (AOT), where the CIL code is no
|
||||
longer necessary, but the metadata still is.
|
||||
.SH OPTIONS
|
||||
The following options are available:
|
||||
.TP
|
||||
.I "-q"
|
||||
Only output errors.
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2008 Novell, Inc (http://www.novell.com)
|
||||
.SH MAILING LISTS
|
||||
|
||||
@@ -335,9 +335,6 @@ format.
|
||||
.SS Options
|
||||
The AOT profiler supports the following options:
|
||||
.TP
|
||||
\fBduration\fR=\fInum\fR
|
||||
Profile only NUM seconds of runtime and then write the data.
|
||||
.TP
|
||||
\fBhelp\fR
|
||||
Print usage instructions.
|
||||
.TP
|
||||
|
||||
+16
-84
@@ -214,20 +214,6 @@ and
|
||||
.I llvm
|
||||
options. This feature is experimental.
|
||||
.TP
|
||||
.I llvmopts=[options]
|
||||
Use this option to override the built-in set of flags passed to the
|
||||
LLVM optimizer. The list of possible flags that can be passed can be
|
||||
obtained by calling the bundled
|
||||
.I opt
|
||||
program that comes with Mono.
|
||||
.TP
|
||||
.I llvmllc=[options]
|
||||
Use this option to override the built-in set of flags passed to the
|
||||
LLVM static compiler (llc). The list of possible flags that can be passed can be
|
||||
obtained by calling the bundled
|
||||
.I llc
|
||||
program that comes with Mono.
|
||||
.TP
|
||||
.I llvm-outfile=[filename]
|
||||
Gives the path for the temporary LLVM bitcode file created during AOT.
|
||||
.I dedup
|
||||
@@ -381,9 +367,6 @@ Prints additional information about type loading failures.
|
||||
.TP
|
||||
.I write-symbols,no-write-symbols
|
||||
Instructs the AOT compiler to emit (or not emit) debug symbol information.
|
||||
.TP
|
||||
.I no-opt
|
||||
Instructs the AOT compiler tot no call opt when compiling with LLVM.
|
||||
.PP
|
||||
For more information about AOT, see: http://www.mono-project.com/docs/advanced/aot/
|
||||
.RE
|
||||
@@ -601,11 +584,6 @@ Controls whether the runtime should attempt to inline (the default),
|
||||
or not inline methods invocations
|
||||
.ne
|
||||
.RE
|
||||
\fB--response=FILE\fR
|
||||
Provides a response file, this instructs the Mono command to read
|
||||
other command line options from the specified file, as if the
|
||||
options had been specified on the command line. Useful when you have
|
||||
very long command lines.
|
||||
.TP
|
||||
\fB--runtime=VERSION\fR
|
||||
Mono supports different runtime versions. The version used depends on the program
|
||||
@@ -1188,33 +1166,19 @@ If set, tells mono to attempt using native asynchronous I/O services. If not
|
||||
set, a default select/poll implementation is used. Currently epoll and kqueue
|
||||
are supported.
|
||||
.TP
|
||||
\fBMONO_THREADS_SUSPEND\fR
|
||||
Selects a mechanism that Mono will use to suspend threads. May be set to
|
||||
"preemptive", "coop", or "hybrid". Threads may need to be suspended by the
|
||||
debugger, or using some .NET threading APIs, and most commonly when the SGen
|
||||
garbage collector needs to stop all threads during a critical phase of garbage
|
||||
collection. Preemptive mode is the mode that Mono has used historically, going
|
||||
back to the Boehm days, where the garbage collector would run at any point and
|
||||
suspend execution of all threads as required to perform a garbage collection.
|
||||
The cooperative mode on the other hand requires the cooperation of all threads
|
||||
to stop at a safe point. This makes for an easier to debug garbage collector.
|
||||
As of Mono 4.3.0 it is a work in progress, and while it works, it has not been
|
||||
used extensively. This option enables the feature and allows us to find spots
|
||||
that need to be tuned for this mode of operation. Hybrid mode is a combination
|
||||
of the two that retains better compatability with scenarios where Mono is
|
||||
embedded in another application: threads that are running managed code or code
|
||||
that comprises the Mono runtime will be cooperatively suspended, while threads
|
||||
running embedder code will be preemptively suspended.
|
||||
|
||||
Alternatively, coop and hybrid mode can be enabled at compile time by using the
|
||||
--enable-cooperative-suspend or --enable-hybrid-suspend flags, respectively,
|
||||
when calling configure. The \fBMONO_THREADS_SUSPEND\fR environment variable
|
||||
takes priority over the compiled default.
|
||||
.TP
|
||||
\fBMONO_ENABLE_COOP_SUSPEND\fR
|
||||
This environment variable is obsolete, but retained for backward compatibility.
|
||||
Use \fBMONO_THREADS_SUSPEND\fR set to "coop" instead. Note that if configure flags
|
||||
were provided to enable cooperative or hybrid suspend, this variable is ignored.
|
||||
\fBMONO_ENABLE_COOP\fR
|
||||
This makes the Mono runtime and the SGen garbage collector run in cooperative
|
||||
mode as opposed to run on preemptive mode. Preemptive mode is the mode
|
||||
that Mono has used historically, going back to the Boehm days, where the
|
||||
garbage collector would run at any point and suspend execution of all
|
||||
threads as required to perform a garbage collection. The cooperative mode
|
||||
on the other hand requires the cooperation of all threads to stop at a
|
||||
safe point. This makes for an easier to debug garbage collector. As
|
||||
of Mono 4.3.0 it is a work in progress, and while it works, it has not
|
||||
been used extensively. This option enabled the feature and allows us to
|
||||
find spots that need to be tuned for this mode of operation. Alternatively,
|
||||
this mode can be enabled at compile time by using the --with-cooperative-gc
|
||||
flag when calling configure.
|
||||
.TP
|
||||
\fBMONO_ENV_OPTIONS\fR
|
||||
This environment variable allows you to pass command line arguments to
|
||||
@@ -1638,32 +1602,6 @@ home directories that might be shared over the network.
|
||||
If set, extra checks are made during IO operations. Currently, this
|
||||
includes only advisory locks around file writes.
|
||||
.TP
|
||||
\fBMONO_TLS_PROVIDER\fR
|
||||
This environment variable controls which TLS/SSL provider Mono will
|
||||
use. The options are usually determined by the operating system where
|
||||
Mono was compiled and the configuration options that were used for
|
||||
it.
|
||||
.RS
|
||||
.ne 8
|
||||
.TP
|
||||
.I default
|
||||
Uses the default TLS stack that the Mono runtime was configured with.
|
||||
Usually this is configured to use Apple's SSL stack on Apple
|
||||
platforms, and Boring SSL on other platforms.
|
||||
.TP
|
||||
.I apple
|
||||
Forces the use of the Apple SSL stack, only works on Apple platforms.
|
||||
.TP
|
||||
.I btls
|
||||
Forces the use of the BoringSSL stack. See
|
||||
https://opensource.google.com/projects/boringssl for more information
|
||||
about this stack.
|
||||
.TP
|
||||
.I legacy
|
||||
This is the old Mono stack, which only supports SSL and TLS up to
|
||||
version 1.0. It is deprecated and will be removed in the future.
|
||||
.RE
|
||||
.TP
|
||||
\fBMONO_TLS_SESSION_CACHE_TIMEOUT\fR
|
||||
The time, in seconds, that the SSL/TLS session cache will keep it's entry to
|
||||
avoid a new negotiation between the client and a server. Negotiation are very
|
||||
@@ -1716,8 +1654,8 @@ Currently, the following options are supported:
|
||||
Enables small structs alignment to 4/8 bytes.
|
||||
.TP
|
||||
\fBarm-use-fallback-tls\fR
|
||||
When this option is set on ARM, a fallback thread local store will be used instead
|
||||
of the default fast thread local storage primitives.
|
||||
When this option is set on ARM, a fallback TLS will be used instead
|
||||
of the default fast TLS.
|
||||
.TP
|
||||
\fBbreak-on-unverified\fR
|
||||
If this variable is set, when the Mono VM runs into a verification
|
||||
@@ -1846,12 +1784,6 @@ This option will suspend the program when an exception occurs.
|
||||
.TP
|
||||
\fBsuspend-on-unhandled\fR
|
||||
This option will suspend the program when an unhandled exception occurs.
|
||||
.TP
|
||||
\fBthread-dump-dir=DIR\fR
|
||||
Use DIR for storage thread dumps created by SIGQUIT.
|
||||
.TP
|
||||
\fBverbose-gdb\fR
|
||||
Make gdb output on native crashes more verbose.
|
||||
.ne
|
||||
.RE
|
||||
.TP
|
||||
@@ -1933,7 +1865,7 @@ for example, to see managed frame names on gdb backtraces.
|
||||
\fBMONO_VERBOSE_METHOD\fR
|
||||
Enables the maximum JIT verbosity for the specified method. This is
|
||||
very helpfull to diagnose a miscompilation problems of a specific
|
||||
method. This can be a semicolon-separated list of method names to
|
||||
method. This can be a comma-separated list of method names to
|
||||
match. If the name is simple, this applies to any method with that
|
||||
name, otherwise you can use a mono method description (see the section
|
||||
METHOD DESCRIPTIONS).
|
||||
|
||||
+1
-1
@@ -12,9 +12,9 @@ TestResult-*.xml
|
||||
TestResult*.xml
|
||||
.dep_dirs-*
|
||||
apidiff/*
|
||||
csprojdiff/*
|
||||
errors/*.log
|
||||
errors/dummy.xml
|
||||
class/Mono.Data.Sqlite/test.db
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-8.cs
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-0-9.cs
|
||||
class/RabbitMQ.Client/docs/specs/autogenerated-api-qpid-0-8.cs
|
||||
|
||||
+2
-14
@@ -152,13 +152,9 @@ MONO_API_ASSEMBLIES_IGNORED := $(addprefix $(topdir)class/lib/$(PROFILE)/, Mono.
|
||||
MONO_API_ASSEMBLIES := $(filter-out $(MONO_API_ASSEMBLIES_IGNORED), $(wildcard $(topdir)class/lib/$(PROFILE)/*.dll)) $(wildcard $(topdir)class/lib/$(PROFILE)/Facades/*.dll)
|
||||
MONO_API_ASSEMBLIES_CS := $(MONO_API_ASSEMBLIES:$(topdir)class/lib/$(PROFILE)/%.dll=$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs)
|
||||
|
||||
apidiff/ignored-attr.txt:
|
||||
$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt
|
||||
@mkdir -p $(dir $@)
|
||||
@echo "T:System.Runtime.CompilerServices.CompilerGeneratedAttribute" > $@
|
||||
|
||||
$(MONO_API_SNAPSHOT_PROFILE_PATH)%.cs: $(topdir)class/lib/$(PROFILE)/%.dll $(GENAPI) $(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt apidiff/ignored-attr.txt
|
||||
@mkdir -p $(dir $@)
|
||||
$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -excludeAttributesList:apidiff/ignored-attr.txt -assembly:$< || echo "Couldn't process assembly." > $@
|
||||
$(Q) MONO_PATH=$(topdir)class/lib/$(BUILD_TOOLS_PROFILE) $(RUNTIME) $(GENAPI) -libPath:$(topdir)class/lib/$(PROFILE),$(topdir)class/lib/$(PROFILE)/Facades -out:$(dir $@) -headerFile:$(MONO_API_SNAPSHOT_PATH)profiles/license-header.txt -assemblyAttributes -typeForwardedTo -assemblyVersion -assembly:$< || echo "Couldn't process assembly." > $@
|
||||
|
||||
mono-api-current: $(MONO_API_ASSEMBLIES_CS)
|
||||
|
||||
@@ -179,11 +175,3 @@ mono-api-diff:
|
||||
@mkdir -p apidiff
|
||||
$(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Public API Diff/g" -e "s/@description@/If the changes are intentional, run <code>make -C mcs mono-api-diff<\/code> locally and commit changes in external\/api-snapshot./g" diff.html.in > apidiff/index.html
|
||||
$(Q) if [ -s temp.patch ]; then echo "Error: Found public API differences, see mcs/apidiff/index.html. If the changes are intentional, please go to external/api-snapshot and commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi
|
||||
|
||||
mono-csproj-diff:
|
||||
@echo "Generating csproj diff..."
|
||||
$(Q) git add -A "*.csproj" $(topdir)../bcl.sln
|
||||
$(Q) git diff --no-renames HEAD "*.csproj" $(topdir)../bcl.sln > $(abspath $(topdir))/temp.patch
|
||||
@mkdir -p csprojdiff
|
||||
$(Q) sed -e "/@diffdata@/r temp.patch" -e "/@diffdata@/d" -e "s/@title@/Project Files Diff/g" -e "s/@description@/Use <code>@monojenkins commit csproj<\/code> to commit them./g" diff.html.in > csprojdiff/index.html
|
||||
$(Q) if [ -s temp.patch ]; then echo "Error: Found csproj differences, see mcs/csprojdiff/index.html. If the changes are intentional, please commit them."; rm -f temp.patch; exit 1; else echo "No differences found."; rm -f temp.patch; fi
|
||||
+5
-8
@@ -2,7 +2,7 @@ thisdir = build
|
||||
SUBDIRS =
|
||||
include ../build/rules.make
|
||||
|
||||
BUILT_FILES = common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs
|
||||
BUILT_FILES = common/Consts.cs
|
||||
|
||||
all-local install-local test-local run-test-local csproj-local run-test-ondotnet-local uninstall-local doc-update-local: $(BUILT_FILES)
|
||||
@:
|
||||
@@ -10,15 +10,12 @@ all-local install-local test-local run-test-local csproj-local run-test-ondotnet
|
||||
clean-local:
|
||||
-rm -f $(BUILT_FILES) deps/*
|
||||
|
||||
$(topdir)/class/lib/$(PROFILE_DIRECTORY):
|
||||
mkdir -p $@
|
||||
|
||||
common/Consts.cs $(topdir)/class/lib/$(PROFILE_DIRECTORY)/Consts.cs: common/Consts.cs.in $(wildcard config.make) | $(topdir)/class/lib/$(PROFILE_DIRECTORY)
|
||||
common/Consts.cs: common/Consts.cs.in $(wildcard config.make)
|
||||
test -n '$(MONO_VERSION)'
|
||||
test -n '$(MONO_CORLIB_VERSION)'
|
||||
sed -e 's,@''MONO_VERSION@,$(MONO_VERSION),' -e 's,@''MONO_CORLIB_VERSION@,$(MONO_CORLIB_VERSION),' $< > $@
|
||||
|
||||
PLATFORMS = macos linux win32 unix
|
||||
PLATFORMS = darwin linux win32
|
||||
PROFILES = \
|
||||
basic \
|
||||
build \
|
||||
@@ -36,14 +33,14 @@ COMMON_SRCS = \
|
||||
AssemblyRef.cs
|
||||
|
||||
DISTFILES = \
|
||||
README.makefiles.md \
|
||||
README.makefiles \
|
||||
README.platforms \
|
||||
README.configury \
|
||||
config-default.make \
|
||||
corcompare.make \
|
||||
corcompare-api.xsl \
|
||||
executable.make \
|
||||
gensources.cs \
|
||||
gensources.sh \
|
||||
library.make \
|
||||
rules.make \
|
||||
tests.make \
|
||||
|
||||
@@ -1,25 +1,25 @@
|
||||
# The MCS makefiles
|
||||
|
||||
Author: Peter Williams <[email protected]>
|
||||
The MCS makefiles (-*- outline -*-)
|
||||
Peter Williams <[email protected]>
|
||||
|
||||
The new makefiles try to abstract building on Windows and Linux. They
|
||||
try to provide a consistent set of ways to express the things that our
|
||||
build system needs to let us do, specifically:
|
||||
|
||||
* Build recursively
|
||||
* Build libraries and executables easily
|
||||
* Let developers use different runtimes and class libaries
|
||||
* Make distributions easily
|
||||
* Provide a framework for testing
|
||||
* Build platform-independently whenever possible
|
||||
* Generate, update, and build monodoc documentation.
|
||||
* Build recursively
|
||||
* Build libraries and executables easily
|
||||
* Let developers use different runtimes and class libaries
|
||||
* Make distributions easily
|
||||
* Provide a framework for testing
|
||||
* Build platform-independently whenever possible
|
||||
* Generate, update, and build monodoc documentation.
|
||||
|
||||
Makefile structure
|
||||
==================
|
||||
|
||||
|
||||
** Makefile structure
|
||||
|
||||
A general makefile looks like this:
|
||||
|
||||
```
|
||||
========================================
|
||||
thisdir = class/Mono.My.Library
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
@@ -50,60 +50,59 @@ doc-update-local:
|
||||
|
||||
my_test_program.exe: my_test_source.cs
|
||||
$(CSCOMPILE) /target:exe /out:$@ $<
|
||||
```
|
||||
========================================
|
||||
|
||||
Each makefile follows the same pattern: it does some setup, includes
|
||||
the standard make rules, and provides rules for eight standard targets:
|
||||
`all`, `install`, `test`, `run-test`, `clean`, `dist`, and `doc-update`.
|
||||
all, install, test, run-test, clean, dist, and doc-update.
|
||||
|
||||
"Some setup" is defining two variables: `$(thisdir)` and
|
||||
`$(SUBDIRS)`. `$(thisdir)` is the directory that the makefile lives in,
|
||||
relative to the top directory (ie, `class/corlib`) and `$(SUBDIRS)`
|
||||
"Some setup" is defining two variables: $(thisdir) and
|
||||
$(SUBDIRS). $(thisdir) is the directory that the makefile lives in,
|
||||
relative to the top directory (ie, class/corlib) and $(SUBDIRS)
|
||||
defines the subdirectories that should be built in.
|
||||
|
||||
The eight targets do the following:
|
||||
|
||||
* `all-local` builds whatever someone would expect to be built
|
||||
when they just type `make'` Most likely `Foo.dll` or `Foo.exe`
|
||||
* all-local builds whatever someone would expect to be built
|
||||
when they just type 'make'. Most likely Foo.dll or Foo.exe
|
||||
|
||||
* `install-local` installs whatever got built by `all-local`.
|
||||
* install-local installs whatever got built by all-local.
|
||||
|
||||
* `test-local` _builds_ the test programs or libraries but does
|
||||
_not_ run them.
|
||||
* test-local _builds_ the test programs or libraries but does
|
||||
_not_ run them.
|
||||
|
||||
* `run-test-local` actually runs the tests. It shouldn't
|
||||
necessarily exit in an error if the test fails, but should make that
|
||||
situation obvious. It should only run tests that take care of
|
||||
themselves automatically; interactive tests should have an individual
|
||||
target. The idea is that `make run-test` from the toplevel should be
|
||||
able to proceed unsupervised and test everything that can be tested in
|
||||
such a manner.
|
||||
* run-test-local actually runs the tests. It shouldn't
|
||||
necessarily exit in an error if the test fails, but should make that
|
||||
situation obvious. It should only run tests that take care of
|
||||
themselves automatically; interactive tests should have an individual
|
||||
target. The idea is that 'make run-test' from the toplevel should be
|
||||
able to proceed unsupervised and test everything that can be tested in
|
||||
such a manner.
|
||||
|
||||
* `run-xunit-test-local` this is a variation of the above, but it runs the
|
||||
tests that were built with Xunit instead of NUnit.
|
||||
* run-test-ondotnet-local is a variant of run-test-local. It is used only to validate if our tests themselves works fine under Microsoft runtime (on Windows). Basically, in this target, we should not use $(TEST_RUNTIME) to test our libraries.
|
||||
|
||||
* `run-test-ondotnet-local` is a variant of `run-test-local`. It is used only to validate if our tests themselves works fine under Microsoft runtime (on Windows). Basically, in this target, we should not use $(TEST_RUNTIME) to test our libraries.
|
||||
* clean-local removes built files; 'make clean' should leave
|
||||
only files that go into a distribution tarball. (But it is not necessarily
|
||||
true that all files that go into a tarball need to be left after a make clean.)
|
||||
|
||||
* `clean-local` removes built files; `make clean` should leave
|
||||
only files that go into a distribution tarball. (But it is not
|
||||
necessarily true that all files that go into a tarball need to be left
|
||||
after a make clean.)
|
||||
* dist-local copies files into the distribution tree, which is
|
||||
given by the variable $(distdir). dist-local always depends on the
|
||||
target 'dist-default'. See ** 'make dist' below.
|
||||
|
||||
* `dist-local` copies files into the distribution tree, which is
|
||||
given by the variable `$(distdir)`. `dist-local` always depends on the
|
||||
target `dist-default`. See ** `make dist` below.
|
||||
* doc-update-local should generate or update monodoc documentation,
|
||||
if appropriate. This is usually only appropriate for libraries. It's
|
||||
defined as a standard target so that it can easily be run recursively
|
||||
across all libraries within the module.
|
||||
|
||||
* `doc-update-local` should generate or update monodoc documentation,
|
||||
if appropriate. This is usually only appropriate for libraries. It's
|
||||
defined as a standard target so that it can easily be run recursively
|
||||
across all libraries within the module.
|
||||
|
||||
Build configuration
|
||||
===================
|
||||
|
||||
|
||||
|
||||
** Build configuration
|
||||
|
||||
In general, MCS needs to be able to build relying only on the
|
||||
existence of a runtime and core libraries (`mscorlib`, `System`,
|
||||
`System.Xml`). So there shouldn't be any checking for libraries or
|
||||
existence of a runtime and core libraries (corlib, System,
|
||||
System.Xml). So there shouldn't be any checking for libraries or
|
||||
whatnot; MCS should be able to build out of the box. We try to keep
|
||||
platform detection and feature testing (ie, for HP/UX echo) inside
|
||||
the makefiles; right now, there's no configuration script, and it'd
|
||||
@@ -116,37 +115,41 @@ customize their builds to suit their needs. To allow this, the
|
||||
Makefile rules are set up to allow people to override pretty much any
|
||||
important variable.
|
||||
|
||||
Configuration variables are given defaults in `config-default.make`;
|
||||
`rules.make` optionally includes `$(topdir)/build/config.make`, so you
|
||||
Configuration variables are given defaults in `config-default.make';
|
||||
`rules.make' optionally includes `$(topdir)/build/config.make', so you
|
||||
can customize your build without CVS trying to commit your modified
|
||||
`config-default.make` all the time. Platform-specific variables are
|
||||
defined in `$(topdir)/build/platforms/$(BUILD_PLATFORM).make`, where
|
||||
`$(BUILD_PLATFORM)` is detected in `config-default.make`. (Currently, the only
|
||||
choices are `linux.make` and `win32.make`)
|
||||
`config-default.make' all the time. Platform-specific variables are
|
||||
defined in `$(topdir)/build/platforms/$(BUILD_PLATFORM).make', where
|
||||
$(BUILD_PLATFORM) is detected in config-default.make. (Currently, the only
|
||||
choices are linux.make and win32.make.)
|
||||
|
||||
The best way to learn what the configuration variables are is to read
|
||||
`config.make` and `platform.make`. There aren't too many and hopefully
|
||||
`config.make' and `platform.make'. There aren't too many and hopefully
|
||||
they should be self-explanatory; see the numerous examples below for
|
||||
more information if you're confused.
|
||||
|
||||
Recommendations for platform specifics
|
||||
--------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
** Recommendations for platform specifics
|
||||
|
||||
If you find yourself needing a platform-specific customization, try
|
||||
and express it in terms of a feature, rather than a platform test. In
|
||||
other words, this is good:
|
||||
|
||||
```
|
||||
========================================
|
||||
run-test-local: my-test.exe
|
||||
ifdef PLATFORM_NEEDS_CRAZY_CRAP
|
||||
crazy-crap
|
||||
endif
|
||||
$(RUNTIME) my-test.exe
|
||||
```
|
||||
========================================
|
||||
|
||||
and this is bad:
|
||||
|
||||
```
|
||||
========================================
|
||||
run-test-local: my-test.exe
|
||||
ifdef WINDOWS
|
||||
crazy-crap
|
||||
@@ -156,7 +159,7 @@ ifdef AMIGA
|
||||
endif
|
||||
endif
|
||||
$(RUNTIME) my-test.exe
|
||||
```
|
||||
========================================
|
||||
|
||||
The latter accumulates and gets unpleasant and it sucks. Granted,
|
||||
right now we only have two platforms, so it's not a big deal, but it's
|
||||
@@ -165,79 +168,88 @@ do the various corlib building hacks for examples of how we've done
|
||||
platform-specificity. It certainly isn't pretty, but at least it's a
|
||||
little structured.
|
||||
|
||||
Saving effort
|
||||
=============
|
||||
|
||||
The point of the build system is to abstract things and take
|
||||
|
||||
|
||||
|
||||
|
||||
** Saving effort
|
||||
|
||||
The point of the build system is to abstract things and take
|
||||
care of all the easy stuff. So if you find yourself writing a
|
||||
Makefile, know that there's probably already infrastructure to do what
|
||||
you want. Here are all the common cases I can think of.
|
||||
you want. Here are all the common cases I can think of ...
|
||||
|
||||
Compiling C# code? use:
|
||||
-----------------------
|
||||
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
* Compiling C# code? use:
|
||||
|
||||
========================================
|
||||
my-program.exe: my-source.cs
|
||||
$(CSCOMPILE) /target:exe /out:$@ $^
|
||||
```
|
||||
========================================
|
||||
|
||||
or
|
||||
or
|
||||
|
||||
```
|
||||
========================================
|
||||
my-lib.dll: my-source.cs
|
||||
$(CSCOMPILE) /target:library /out:$@ $^
|
||||
```
|
||||
========================================
|
||||
|
||||
Note the `$@` and `$^` variables. The former means "the name of the
|
||||
Note the '$@' and '$^' variables. The former means "the name of the
|
||||
file that I am trying to make" and the latter means "all the
|
||||
dependencies of the file I am trying to make." USE THESE VARIABLES
|
||||
AGGRESSIVELY. Say that you add a new source to your program:
|
||||
|
||||
```
|
||||
========================================
|
||||
my-program.exe: my-source.cs my-new-source.cs
|
||||
$(CSCOMPILE) /target:exe /out:$@ $^
|
||||
```
|
||||
========================================
|
||||
|
||||
Because of the $^ variable, you don't need to remember to add another
|
||||
file to the command line. Similarly, if you rename your program, you
|
||||
won't need to remember to change the rule:
|
||||
|
||||
```
|
||||
========================================
|
||||
MonoVaporizer.exe: my-source.cs my-new-source.cs
|
||||
$(CSCOMPILE) /target:exe /out:$@ $^
|
||||
```
|
||||
========================================
|
||||
|
||||
will still work. Another useful variable is $<, which means "the first
|
||||
dependency of whatever I'm building." If you order your dependencies
|
||||
carefully it can be extremely useful.
|
||||
|
||||
Just building an executable?
|
||||
----------------------------
|
||||
|
||||
Then use:
|
||||
|
||||
```
|
||||
|
||||
|
||||
* Just building an executable? use:
|
||||
|
||||
========================================
|
||||
PROGRAM = myprogram.exe
|
||||
LOCAL_MCS_FLAGS = /r:System.Xml.dll
|
||||
|
||||
include ../build/executable.make
|
||||
```
|
||||
========================================
|
||||
|
||||
executable.make builds a program in the current directory. Its name is
|
||||
held in `$(PROGRAM)`, and its sources are listed in the file
|
||||
`$(PROGRAM).sources`. It might seem to make more sense to just list the
|
||||
held in $(PROGRAM), and its sources are listed in the file
|
||||
$(PROGRAM).sources. It might seem to make more sense to just list the
|
||||
program's sources in the Makefile, but when we build on Windows we
|
||||
need to change slashes around, which is much easier to do if the
|
||||
sources are listed in a file. The variable `$(LOCAL_MCS_FLAGS)` changes
|
||||
the flags given to the compiler; it is included in `$(CSCOMPILE)` so you
|
||||
sources are listed in a file. The variable $(LOCAL_MCS_FLAGS) changes
|
||||
the flags given to the compiler; it is included in $(CSCOMPILE) so you
|
||||
don't need to worry about it.
|
||||
|
||||
`executable.make` does a lot for you: it builds the program in 'make
|
||||
all-local', installs the program in `$(prefix)/bin`, distributes the
|
||||
executable.make does a lot for you: it builds the program in 'make
|
||||
all-local', installs the program in $(prefix)/bin, distributes the
|
||||
sources, and defines empty test targets. Now, if your program has a
|
||||
test, set the variable `HAS_TEST`:
|
||||
test, set the variable HAS_TEST:
|
||||
|
||||
```
|
||||
========================================
|
||||
PROGRAM = myprogram.exe
|
||||
LOCAL_MCS_FLAGS = /r:System.Xml.dll
|
||||
HAS_TEST = yes
|
||||
@@ -250,30 +262,30 @@ run-test-local: mytester.exe
|
||||
|
||||
mytester.exe: mytester.cs
|
||||
$(CSCOMPILE) /target:exe /out:$@ mytester.cs
|
||||
```
|
||||
========================================
|
||||
|
||||
If your program has NUnit tests, set the variable `HAS_NUNIT_TEST`:
|
||||
If your program has NUnit tests, set the variable HAS_NUNIT_TEST:
|
||||
|
||||
```
|
||||
========================================
|
||||
PROGRAM = myprogram.exe
|
||||
LOCAL_MCS_FLAGS = /r:System.Xml.dll
|
||||
HAS_NUNIT_TEST = yes
|
||||
include ../build/executable.make
|
||||
```
|
||||
========================================
|
||||
|
||||
`HAS_NUNIT_TEST` tests follow `library.make` NUnit test conventions:
|
||||
the files should be in a subdirectory called `Test/`, and if
|
||||
your program is called `myprogram.exe`, they should be listed in
|
||||
`myprogram_test.dll.sources`. The names in that files should *not* have
|
||||
the `Test/` prefix. `make test'`will build `myprogram_test_$(PROFILE).dll`
|
||||
HAS_NUNIT_TEST tests follow library.make NUnit test conventions:
|
||||
the files should be in a subdirectory called Test/, and if
|
||||
your program is called myprogram.exe, they should be listed in
|
||||
myprogram_test.dll.sources. The names in that files should *not* have
|
||||
the Test/ prefix. 'make test' will build myprogram_test_$(PROFILE).dll
|
||||
in the current directory, automatically supplying the flags to
|
||||
reference the original program and `NUnit.Framework.dll`.
|
||||
reference the original program and NUnit.Framework.dll.
|
||||
|
||||
If your program has 'built sources', that is, source files generated
|
||||
from other files (say, generated by jay), define a variable called
|
||||
`BUILT_SOURCES` and do *not* list the sources in `$(PROGRAM).sources`:
|
||||
BUILT_SOURCES and do *not* list the sources in $(PROGRAM).sources:
|
||||
|
||||
```
|
||||
========================================
|
||||
PROGRAM = myprogram.exe
|
||||
LOCAL_MCS_FLAGS = /r:System.Xml.dll
|
||||
BUILT_SOURCES = parser.cs
|
||||
@@ -283,96 +295,100 @@ include ../build/executable.make
|
||||
|
||||
parser.cs: parser.jay
|
||||
$(topdir)/jay/jay $< > $@
|
||||
```
|
||||
========================================
|
||||
|
||||
`executable.make` will automatically delete the `$(BUILT_SOURCES)` files
|
||||
on `make clean`. Since this situation is a common occurrence and jay
|
||||
executable.make will automatically delete the $(BUILT_SOURCES) files
|
||||
on 'make clean'. Since this situation is a common occurrence and jay
|
||||
happens to leave behind y.output files, you can also define a variable
|
||||
called `$(CLEAN_FILES)` that lists extra files to be deleted when
|
||||
`make clean` is called. (That's in addition to your executable and the built sources).
|
||||
called $(CLEAN_FILES) that lists extra files to be deleted when 'make clean' is
|
||||
called. (That's in addition to your executable and the built sources).
|
||||
|
||||
Buildling a library? Use
|
||||
------------------------
|
||||
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
* Buildling a library? Use
|
||||
|
||||
========================================
|
||||
LIBRARY = Mono.MyLib.dll
|
||||
LIB_MCS_FLAGS = /unsafe
|
||||
TEST_MCS_FLAGS = /r:System.Xml.dll
|
||||
|
||||
include ../../build/library.make
|
||||
```
|
||||
========================================
|
||||
|
||||
Where you library is called `$(LIBRARY)`; it will be put into
|
||||
`$(topdir)/class/lib`. `LIB_MCS_FLAGS` is the set of MCS flags to use when
|
||||
Where you library is called $(LIBRARY); it will be put into
|
||||
$(topdir)/class/lib. LIB_MCS_FLAGS is the set of MCS flags to use when
|
||||
compiling the library; in addition, a global set of flags called
|
||||
`$(LIBRARY_FLAGS)` is added (that variable is defined in
|
||||
`config-defaults.make`), as well as the usual `$(LOCAL_MCS_FLAGS)`.
|
||||
$(LIBRARY_FLAGS) is added (that variable is defined in
|
||||
config-defaults.make), as well as the usual $(LOCAL_MCS_FLAGS).
|
||||
|
||||
As in `executable.make`, the sources for your library are listed in
|
||||
`$(LIBRARY).sources`. Note: these source lists should have Unix forward
|
||||
As in executable.make, the sources for your library are listed in
|
||||
$(LIBRARY).sources. Note: these source lists should have Unix forward
|
||||
slashes and Unix newlines (\n, not \r\n.) If you get an error about
|
||||
"touch: need a filename", that means your .sources file doesn't end in
|
||||
a newline. It should.
|
||||
|
||||
Now `library.make` also assumes that your library has an NUnit2 test
|
||||
harness. The files should be in a subdirectory called `Test/`, and if
|
||||
your library is called `Mono.Foo.dll`, they should be listed in
|
||||
`Mono.Foo_test.dll.sources`. The names in that files should *not* have
|
||||
the `Test/` prefix. `make test` will build `Mono.Foo_test.dll` in the
|
||||
Now library.make also assumes that your library has an NUnit2 test
|
||||
harness. The files should be in a subdirectory called Test/, and if
|
||||
your library is called Mono.Foo.dll, they should be listed in
|
||||
Mono.Foo_test.dll.sources. The names in that files should *not* have
|
||||
the Test/ prefix. 'make test' will build Mono.Foo_test.dll in the
|
||||
current directory, automatically supplying the flags to reference the
|
||||
original library and `NUnit.Framework.dll`.
|
||||
original library and NUnit.Framework.dll.
|
||||
|
||||
If you don't have a test, just do this:
|
||||
|
||||
```
|
||||
========================================
|
||||
LIBRARY = Mono.MyLib.dll
|
||||
LIB_MCS_FLAGS = /unsafe
|
||||
NO_TEST = yes
|
||||
|
||||
include ../../build/library.make
|
||||
```
|
||||
========================================
|
||||
|
||||
and feel ashamed. Every good library has a test suite!
|
||||
|
||||
Extra flags needed to compile the test library should be listed in
|
||||
$(TEST_MCS_FLAGS); often you will have a line like this:
|
||||
|
||||
```
|
||||
========================================
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
|
||||
```
|
||||
========================================
|
||||
|
||||
Again, `library.make` does a lot for you: it builds the dll, it
|
||||
Again, library.make does a lot for you: it builds the dll, it
|
||||
generates makefile fragments to track the dependencies, it installs
|
||||
the library, it builds the test dll on `make test`, it runs
|
||||
`$(TEST_HARNESS)` on it on `make run-test`, it removes the appropriate
|
||||
the library, it builds the test dll on 'make test', it runs
|
||||
$(TEST_HARNESS) on it on 'make run-test', it removes the appropriate
|
||||
files on 'make clean', and it distributes all the source files on
|
||||
`make dist`. (`TEST_HARNESS` defaults to be `nunit-console.exe` but it may
|
||||
be overridden to, say, `nunit-gtk`). If you have extra files to
|
||||
distribute when using either `library.make` or `executable.make`, use the
|
||||
variable `$(EXTRA_DISTFILES)`:
|
||||
'make dist'. (TEST_HARNESS defaults to be nunit-console.exe but it may
|
||||
be overridden to, say, nunit-gtk). If you have extra files to
|
||||
distribute when using either library.make or executable.make, use the
|
||||
variable $(EXTRA_DISTFILES):
|
||||
|
||||
```
|
||||
========================================
|
||||
EXTRA_DISTFILES = \
|
||||
Test/testcase1.in \
|
||||
Test/testcase1.out \
|
||||
README
|
||||
```
|
||||
========================================
|
||||
|
||||
Again, `library.make` and `executable.make` do the right things so that we
|
||||
Again, library.make and executable.make do the right things so that we
|
||||
can build on Windows, doing some trickery to invert slashes and
|
||||
overcome command-line length limitations. Use them unless you have a
|
||||
really good reason not to. If you're building a bunch of small
|
||||
executables, check out `tools/Makefile` or `tools/security/Makefile`; if
|
||||
executables, check out tools/Makefile or tools/security/Makefile; if
|
||||
all the files are in the current directory, changing slashes isn't a
|
||||
big deal, and command-line lengths won't be a problem, so
|
||||
executable.make isn't necessary (and indeed it won't work, since it
|
||||
can only build one .exe in a directory).
|
||||
|
||||
If you're building a library, `library.make` is highly recommended; the
|
||||
If you're building a library, library.make is highly recommended; the
|
||||
only DLL that doesn't use it is corlib, because building corlib is a
|
||||
fair bit more complicated than it should be. Oh well.
|
||||
|
||||
`library.make` also automatically supports generating and updating
|
||||
library.make also automatically supports generating and updating
|
||||
monodoc documentation. Documentation is stored within the
|
||||
Documentation directory (a sibling to the Test directory), and is
|
||||
generated/updated whenever the doc-update target is executed.
|
||||
@@ -380,15 +396,19 @@ Assembling of the documentation so that the monodoc browser can
|
||||
display the documentation is handled separately within the mcs/docs
|
||||
all-local target; see mcs/docs/Makefile for details.
|
||||
|
||||
Running a C# program? Use $(RUNTIME)
|
||||
------------------------------------
|
||||
|
||||
```
|
||||
|
||||
|
||||
|
||||
|
||||
* Running a C# program? Use $(RUNTIME)
|
||||
|
||||
========================================
|
||||
run-test-local: myprog.exe
|
||||
$(RUNTIME) myprog.exe
|
||||
```
|
||||
========================================
|
||||
|
||||
`$(RUNTIME)` might be empty (if you're on windows), so don't expect to
|
||||
$(RUNTIME) might be empty (if you're on windows), so don't expect to
|
||||
be able to give it any arguments. If you're on a platform which has an
|
||||
interpreter or jitter, $(RUNTIME_FLAGS) is included in $(RUNTIME), so
|
||||
set that variable.
|
||||
@@ -398,8 +418,7 @@ just "mono --debug".
|
||||
|
||||
|
||||
|
||||
Calling the compiler directly? Use $(MCS).
|
||||
------------------------------------------
|
||||
* Calling the compiler directly? Use $(MCS).
|
||||
|
||||
Really, you should use $(CSCOMPILE) whenever possible, but $(MCS) is
|
||||
out there. $(BOOTSTRAP_MCS) is the C# compiler that we use to build
|
||||
@@ -407,15 +426,17 @@ mcs.exe; on Linux, we then use mcs.exe to build everything else, but
|
||||
on Windows, we use csc.exe to build everything. Only use
|
||||
$(BOOTSTRAP_MCS) if you know what you're doing.
|
||||
|
||||
Compiling C code? Use $(CCOMPILE)
|
||||
---------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
* Compiling C code? Use $(CCOMPILE)
|
||||
|
||||
To give it flags, set $(LOCAL_CFLAGS). As with compiling C#, the
|
||||
variable $(CFLAGS) will automatically be included on the command line.
|
||||
|
||||
|
||||
Compiling resources with resgen
|
||||
-------------------------------
|
||||
* Compiling resources with resgen
|
||||
|
||||
If you have a resource that should be compiled with resgen and
|
||||
included in your assembly, you can use the RESOURCES_DEFS variable.
|
||||
@@ -426,8 +447,7 @@ the file name, like this:
|
||||
RESOURCE_DEFS = Messages,TextResources.resx Errors,ErrorList.txt
|
||||
|
||||
|
||||
Documentation-related needs? Use $(MDOC)
|
||||
----------------------------------------
|
||||
* Documentation-related needs? Use $(MDOC)
|
||||
|
||||
$(MDOC) is a front-end to the monodoc documentation system, supporting
|
||||
documentation generation, updating, importing from Microsoft XML
|
||||
@@ -438,16 +458,20 @@ documentation to various other output formats such as static HTML.
|
||||
It is currently only used for library.make's doc-update-local target
|
||||
and for assembling documentation within $topdir/docs.
|
||||
|
||||
Installing files? Use $(MKINSTALLDIRS), $(INSTALL_DATA) or $(INSTALL_BIN), $(prefix), and $(DESTDIR).
|
||||
-----------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
* Installing files? Use $(MKINSTALLDIRS), $(INSTALL_DATA) or
|
||||
$(INSTALL_BIN), $(prefix), and $(DESTDIR).
|
||||
|
||||
Every time a file is installed the commands should look like this:
|
||||
|
||||
```
|
||||
========================================
|
||||
install-local:
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(prefix)/my/dir
|
||||
$(INSTALL_DATA) myfile $(DESTDIR)$(prefix)/my/dir
|
||||
```
|
||||
========================================
|
||||
|
||||
This way the directory is created recursively if needed (admittedly, we could
|
||||
probably rely on mkdir -p), the file is given the correct permissions,
|
||||
@@ -456,19 +480,22 @@ and we can support $(DESTDIR) installs. We use $(DESTDIR) to make
|
||||
monocharge tarballs, and it's useful otherwise, so try and use it
|
||||
consistently.
|
||||
|
||||
'make dist'? Use $(DISTFILES)
|
||||
-----------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
* 'make dist'? Use $(DISTFILES)
|
||||
|
||||
The 'dist-default' target will copy the files listed in $(DISTFILES)
|
||||
into the distribution directory, as well as Makefile and ChangeLog if
|
||||
they exist. This is almost always all that you need, so ideally your
|
||||
make dist support should only be:
|
||||
|
||||
```
|
||||
========================================
|
||||
DISTFILES = README Test/thoughts.txt
|
||||
|
||||
dist-local: dist-default
|
||||
```
|
||||
========================================
|
||||
|
||||
DISTFILES will cope correctly with files in subdirectories, by the
|
||||
way. Note that if you put a nonexistant file or a directory in
|
||||
@@ -476,10 +503,10 @@ DISTFILES it will *not* complain; it will just ignore it.
|
||||
|
||||
If you want to test your 'make dist' code, you can try
|
||||
|
||||
```
|
||||
========================================
|
||||
$ cd class/Mono.MyClass
|
||||
$ make dist-local distdir=TEST
|
||||
```
|
||||
========================================
|
||||
|
||||
And your files should be copied into TEST/ in the current directory.
|
||||
There is a toplevel 'make distcheck' target, which will build a dist
|
||||
@@ -489,21 +516,28 @@ files originally in the tarball: they should be the same. But this
|
||||
takes about 15 minutes to run on my 1.1 Ghz computer, so it's not for
|
||||
the faint of heart.
|
||||
|
||||
Lots of files? Use $(wildcard *.foo)
|
||||
------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
* Lots of files? Use $(wildcard *.foo)
|
||||
|
||||
When specifying the sources to a library or executable, wildcards are
|
||||
not encouraged; in fact they're not allowed if you use library.make or
|
||||
executable.make. But there are times when they're useful, eg:
|
||||
|
||||
```
|
||||
========================================
|
||||
DISTFILES = $(wildcard Test/*.in) $(wildcard Test/*.out)
|
||||
```
|
||||
========================================
|
||||
|
||||
Just so you know that `make` has this feature.
|
||||
Just so you know that 'make' has this feature.
|
||||
|
||||
Referencing files in other directories? Use $(topdir).
|
||||
------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* Referencing files in other directories? Use $(topdir).
|
||||
|
||||
$(topdir) is the path to the top directory from the current build
|
||||
directory. Basically it's a sequence of ../.. computed from the value
|
||||
@@ -511,15 +545,19 @@ that you give $(thisdir) at the top of your Makefile. Try to reference
|
||||
things from $(topdir), so your code can be moved or cut-and-pasted
|
||||
around with a minimum of fuss.
|
||||
|
||||
Conditional building? Use ifdef/ifndef/endif
|
||||
--------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
* Conditional building? Use ifdef/ifndef/endif
|
||||
|
||||
Now in general we want to avoid conditional building, but sometimes
|
||||
something doesn't work on Linux or already exists on Windows or
|
||||
whatnot. (See below on recommended form for how to build
|
||||
platform-specifically.) GNU Make supports the following construction:
|
||||
|
||||
```
|
||||
========================================
|
||||
BUILD_EXPERIMENTAL = yes
|
||||
|
||||
ifdef BUILD_EXPERIMENTAL
|
||||
@@ -529,13 +567,13 @@ experimental_stuff =
|
||||
endif
|
||||
|
||||
all-local: my-sane.exe $(experimental_stuff)
|
||||
```
|
||||
========================================
|
||||
|
||||
'ifdef' means 'if the variable is set to nonempty', so you could have
|
||||
|
||||
```
|
||||
========================================
|
||||
BUILD_EXPERIMENTAL = colorless green ideas sleep furiously
|
||||
```
|
||||
========================================
|
||||
|
||||
and Make would be happy. I hope that the meaning of 'ifndef' should be
|
||||
obvious. If you want to only sometimes build a target, the above
|
||||
@@ -546,8 +584,10 @@ If you want to see why conditionals aren't nice, take a look at
|
||||
library.make or class/corlib/Makefile.
|
||||
|
||||
|
||||
'Private' directories that shouldn't be built by default? Use DIST_ONLY_SUBDIRS
|
||||
--------------------------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
* 'Private' directories that shouldn't be built by default? Use DIST_ONLY_SUBDIRS
|
||||
|
||||
Several of the MCS class libraries have demo or experimental
|
||||
implementations that depend on things not included with MCS (say,
|
||||
@@ -573,7 +613,7 @@ a demo app using Gtk# called MyFancyDemo. The Makefile rules might
|
||||
look like this:
|
||||
|
||||
class/Mono.MyFancyLib/Makefile
|
||||
```
|
||||
========================================
|
||||
thisdir = class/Mono.MyFancyLib
|
||||
SUBDIRS =
|
||||
DIST_ONLY_SUBDIRS = MyFancyDemo
|
||||
@@ -584,10 +624,10 @@ LIB_MCS_FLAGS = /r:System.dll
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
|
||||
|
||||
include ../../build/library.make
|
||||
```
|
||||
========================================
|
||||
|
||||
class/Mono.MyFancyLib/MyFancyDemo/Makefile
|
||||
```
|
||||
========================================
|
||||
thisdir = class/Mono.MyFancyLib/MyFancyDemo
|
||||
SUBDIRS =
|
||||
include ../../../build/rules.make
|
||||
@@ -596,41 +636,36 @@ PROGRAM = FancyDemo.exe
|
||||
LOCAL_MCS_FLAGS = /r:gtk-sharp.dll
|
||||
|
||||
include ../../../build/executable.make
|
||||
```
|
||||
========================================
|
||||
|
||||
|
||||
|
||||
|
||||
Special recursion needs?
|
||||
------------------------
|
||||
* Special recursion needs?
|
||||
|
||||
By default, rules.make defines the all, install, clean, etc. targets
|
||||
to look something like this:
|
||||
|
||||
```
|
||||
all: all-recursive
|
||||
$(MAKE) all-local
|
||||
```
|
||||
|
||||
Sometimes that doesn't cut it; say for example you want to check for
|
||||
something before doing a lengthy recursive build (see
|
||||
$(topdir)/Makefile) or you have a something like this
|
||||
|
||||
```
|
||||
class/MyLibrary:
|
||||
Build MyLibrary.dll
|
||||
class/MyLibrary/Test:
|
||||
Build TestMyLibrary.exe
|
||||
```
|
||||
|
||||
`make clean test` will fail here, because the build will happen in
|
||||
the Test subdirectory first, so there will be no `MyLibrary.dll` to link
|
||||
'make clean test' will fail here, because the build will happen in
|
||||
the Test subdirectory first, so there will be no MyLibrary.dll to link
|
||||
against. (Unless you write a nasty evil relative path rule which is
|
||||
strongly discouraged.)
|
||||
|
||||
Anyway, to solve this problem you can do
|
||||
|
||||
```
|
||||
========================================
|
||||
thisdir = class/MyLibrary
|
||||
SUBDIRS = Test
|
||||
include ../../build/rules.make
|
||||
@@ -641,15 +676,17 @@ all-recursive: all-local
|
||||
|
||||
test-recursive: test-local
|
||||
...
|
||||
```
|
||||
========================================
|
||||
|
||||
|
||||
A few implementation details
|
||||
----------------------------
|
||||
|
||||
|
||||
|
||||
** A few implementation details
|
||||
|
||||
The way rules.make does its recursion is very standard; it maps
|
||||
`{all,install,clean,dist,test}` to `$@-recursive`, which executes that rule
|
||||
in each directory in `$(SUBDIRS)`, and then calls `$@-local` bin the current
|
||||
{all,install,clean, dist,test} to $@-recursive, which executes that rule
|
||||
in each directory in $(SUBDIRS), and then calls $@-local in the current
|
||||
directory. So something that gets built in a subdirectory cannot rely on
|
||||
something that gets built in its parent directory. If this is a problem,
|
||||
see the previous section. Note that the recursive rule for 'dist' is
|
||||
@@ -660,53 +697,61 @@ Note that even a directory that doesn't, for example, have any tests
|
||||
must still define test-local; otherwise 'make test' run from the
|
||||
toplevel directory will break.
|
||||
|
||||
Flags for Tools
|
||||
---------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
** Flags for Tools
|
||||
|
||||
We want to make it so that the user can specify certain flags to
|
||||
always be given to a tool, so there's a general way of implementing
|
||||
FLAGS variables:
|
||||
|
||||
* `$(foo_FLAGS)` remains unset or defaulted to something
|
||||
sensible; the user can provide overrides this way.
|
||||
* $(foo_FLAGS) remains unset or defaulted to something
|
||||
sensible; the user can provide overrides this way.
|
||||
|
||||
* `$(LOCAL_foo_FLAGS)` is set in a specific Makefile to
|
||||
provide necessary values.
|
||||
* $(LOCAL_foo_FLAGS) is set in a specific Makefile to
|
||||
provide necessary values.
|
||||
|
||||
* `$(PLATFORM_foo_FLAGS)` is set in the platform configuration
|
||||
to provide platform-specific values.
|
||||
* $(PLATFORM_foo_FLAGS) is set in the platform configuration
|
||||
to provide platform-specific values.
|
||||
|
||||
* `$(PROFILE_foo_FLAGS)` is set in the profile configuration
|
||||
to provide profile-specific values.
|
||||
* $(PROFILE_foo_FLAGS) is set in the profile configuration
|
||||
to provide profile-specific values.
|
||||
|
||||
* `$(USE_foo_FLAGS)` is defined to be the combination of all of
|
||||
the above, and it's what is actually passed to $(foo).
|
||||
* $(USE_foo_FLAGS) is defined to be the combination of all of
|
||||
the above, and it's what is actually passed to $(foo).
|
||||
|
||||
`$(MCS_FLAGS)` and `$(CFLAGS)` follow this model. If you end up finding
|
||||
$(MCS_FLAGS) and $(CFLAGS) follow this model. If you end up finding
|
||||
that another tool is used commonly (hm, jay...), please follow this form.
|
||||
|
||||
Portability tips
|
||||
----------------
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
** Portability tips
|
||||
|
||||
Always use the icky Windows /argument way of passing parameters to the C#
|
||||
compiler so that csc can be used.
|
||||
|
||||
Always use `/r:foo.dll`, not `/r:foo`. Windows requires the former.
|
||||
Always use /r:foo.dll, not /r:foo. Windows requires the former.
|
||||
|
||||
Use `/r:$(corlib)`, not `/r:corlib`.
|
||||
Use /r:$(corlib), not /r:corlib.
|
||||
|
||||
If you're writing shell script code as part of a make rule, remember
|
||||
that Windows has command-line length limits. So something like
|
||||
|
||||
```
|
||||
========================================
|
||||
mytool $(all_the_sources_to_corlib)
|
||||
```
|
||||
========================================
|
||||
|
||||
Is probably going to cause problems. As I understand it,
|
||||
|
||||
```
|
||||
========================================
|
||||
for f in $(all_the_sources_to_corlib) ; do ...
|
||||
```
|
||||
========================================
|
||||
|
||||
is ok, since the shell itself doesn't have those limitations. Other
|
||||
than that, you should still try to write fairly portable shell
|
||||
@@ -719,10 +764,9 @@ will be ports to more Unices as time goes on.
|
||||
|
||||
|
||||
|
||||
Misc
|
||||
----
|
||||
** Misc
|
||||
|
||||
We still don't use `/d:NET_1_1`; it causes some build problems right
|
||||
We still don't use /d:NET_1_1 ; it causes some build problems right
|
||||
now.
|
||||
|
||||
There's a hack in class/System.Data/Makefile to work around a very
|
||||
@@ -38,7 +38,7 @@ static class Consts
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
public const string MonoCorlibVersion = "@MONO_CORLIB_VERSION@";
|
||||
public const int MonoCorlibVersion = @MONO_CORLIB_VERSION@;
|
||||
|
||||
#if MOBILE
|
||||
// Versions of .NET Framework for Silverlight 4.0
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
using System;
|
||||
|
||||
interface II
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
class X
|
||||
{
|
||||
static void Foo (II a = default (II), II b = default, II c = (II) null)
|
||||
class X {
|
||||
// Check installed compiler
|
||||
static void Generic<T> ()
|
||||
{
|
||||
// we use 'var' all around in the compiler sources
|
||||
var x = new X ();
|
||||
}
|
||||
|
||||
void DefaultParametersAvailable (int i = 3)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -41,7 +42,7 @@ class X
|
||||
|
||||
Version min_mono_version;
|
||||
#if __MonoCS__
|
||||
min_mono_version = new Version (5, 19);
|
||||
min_mono_version = new Version (5, 13);
|
||||
#else
|
||||
min_mono_version = new Version (5, 10);
|
||||
#endif
|
||||
|
||||
@@ -32,10 +32,10 @@ mono_libdir = $(exec_prefix)/lib
|
||||
sysconfdir = $(prefix)/etc
|
||||
#RUNTIME = mono
|
||||
RUNTIME = false
|
||||
MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)
|
||||
MONO_PATH_TOP = $(topdir)/class/lib/$(PROFILE_DIRECTORY)/
|
||||
MONO_PATH_TESTS = $(MONO_PATH_TOP)/tests
|
||||
TEST_MONO_PATH = $(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)$(PLATFORM_PATH_SEPARATOR).
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
TEST_MONO_PATH = $(MONO_PATH_TOP)$(PLATFORM_PATH_SEPARATOR)$(MONO_PATH_TESTS)
|
||||
TEST_RUNTIME = MONO_PATH="$(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR).$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) --debug
|
||||
|
||||
# In case you want to add MCS_FLAGS, this lets you not have to
|
||||
# keep track of the default value
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
API_INFO = $(MONO_PATH) $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/mono-api-info.exe
|
||||
API_DIFF = $(MONO_PATH) $(RUNTIME) $(topdir)/class/lib/$(PROFILE)/mono-api-diff.exe
|
||||
API_DIFF = $(MONO_PATH) $(RUNTIME) $(topdir)/tools/corcompare/mono-api-diff.exe
|
||||
TRANSFORM = $(MONO_PATH) $(RUNTIME) $(topdir)/tools/corcompare/transform.exe
|
||||
|
||||
OBJECTS = $(topdir)/build/corcompare/$(LIBRARY_NAME:.dll=.html)
|
||||
|
||||
@@ -191,7 +191,6 @@ csproj-local:
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo $(is_boot); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(patsubst %,-r:%,$(LIB_REFS)); \
|
||||
echo $(sourcefile); \
|
||||
echo $(PROGRAM); \
|
||||
echo $(BUILT_SOURCES_cmdline); \
|
||||
echo $(build_lib); \
|
||||
|
||||
@@ -1,710 +0,0 @@
|
||||
using System;
|
||||
using System.Text;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Reflection;
|
||||
|
||||
public static class Program {
|
||||
public static int Main (string[] _args) {
|
||||
var args = new List<string> (_args);
|
||||
bool useStdout = false, showHelp = false, strictMode = false;
|
||||
string baseDir = null;
|
||||
|
||||
for (int i = 0; i < args.Count; i++) {
|
||||
var arg = args[i];
|
||||
if (!arg.StartsWith ("-"))
|
||||
continue;
|
||||
|
||||
string argValue = null;
|
||||
var offset = arg.IndexOf(':');
|
||||
if (offset >= 0) {
|
||||
argValue = arg.Substring (offset + 1);
|
||||
arg = arg.Substring (0, offset);
|
||||
}
|
||||
|
||||
switch (arg) {
|
||||
case "-?":
|
||||
case "--help":
|
||||
case "-h":
|
||||
showHelp = true;
|
||||
break;
|
||||
case "--trace":
|
||||
if (argValue != null)
|
||||
SourcesParser.TraceLevel = int.Parse(argValue);
|
||||
else
|
||||
SourcesParser.TraceLevel = 1;
|
||||
break;
|
||||
case "--stdout":
|
||||
useStdout = true;
|
||||
break;
|
||||
case "--strict":
|
||||
strictMode = true;
|
||||
break;
|
||||
case "--basedir":
|
||||
baseDir = argValue;
|
||||
break;
|
||||
default:
|
||||
Console.Error.WriteLine ($"// Unrecognized switch {arg}. Aborting.");
|
||||
return 1;
|
||||
}
|
||||
|
||||
args.RemoveAt (i);
|
||||
i--;
|
||||
}
|
||||
|
||||
if ((args.Count < 3) || (args.Count > 4))
|
||||
showHelp = true;
|
||||
|
||||
if (showHelp) {
|
||||
Console.Error.WriteLine ("Usage: mcs/build/gensources.exe [options] (outputFileName|--stdout) libraryDirectoryAndName platformName profileName");
|
||||
Console.Error.WriteLine ("or mcs/build/gensources.exe [options] (outputFileName|--stdout) (--baseDir:<dir>) sourcesFile exclusionsFile");
|
||||
Console.Error.WriteLine ("You can specify * for platformName and profileName to read all sources files");
|
||||
Console.Error.WriteLine ("Available options:");
|
||||
Console.Error.WriteLine ("--help -h -?");
|
||||
Console.Error.WriteLine (" Show command line info");
|
||||
Console.Error.WriteLine ("--trace:n");
|
||||
Console.Error.WriteLine (" Enable diagnostic output, at tracing level n (1-4)");
|
||||
Console.Error.WriteLine ("--stdout");
|
||||
Console.Error.WriteLine (" Writes results to standard output (omit outputFileName if you use this)");
|
||||
Console.Error.WriteLine ("--strict");
|
||||
Console.Error.WriteLine (" Produces an error exit code if files or directories are invalid/missing or other warnings occur");
|
||||
Console.Error.WriteLine ("--basedir:<dir>");
|
||||
Console.Error.WriteLine (" Sets the base directory when reading a single sources/exclusions pair (default is the directory containing the sources file)");
|
||||
return 1;
|
||||
}
|
||||
|
||||
var myAssembly = Assembly.GetExecutingAssembly ();
|
||||
var codeBase = new Uri (myAssembly.CodeBase);
|
||||
var executablePath = Path.GetFullPath (codeBase.LocalPath);
|
||||
var executableDirectory = Path.GetDirectoryName (executablePath);
|
||||
|
||||
var outFile = Path.GetFullPath (args[0]);
|
||||
|
||||
var platformsFolder = Path.Combine (executableDirectory, "platforms");
|
||||
var profilesFolder = Path.Combine (executableDirectory, "profiles");
|
||||
if (!Directory.Exists (platformsFolder) || !Directory.Exists (profilesFolder)) {
|
||||
Console.Error.WriteLine ($"// Platforms and/or profiles folders are missing: '{platformsFolder}' '{profilesFolder}'. Aborting.");
|
||||
return 1;
|
||||
}
|
||||
|
||||
var parser = new SourcesParser (platformsFolder, profilesFolder);
|
||||
|
||||
ParseResult result;
|
||||
|
||||
if (args.Count == 3) {
|
||||
var sourcesFile = Path.GetFullPath (args[1]);
|
||||
var excludesFile = Path.GetFullPath (args[2]);
|
||||
var directory = Path.GetDirectoryName (sourcesFile);
|
||||
if ((Path.GetDirectoryName (excludesFile) != directory) && (baseDir == null)) {
|
||||
Console.Error.WriteLine ("// Sources and exclusions files are in different directories. Aborting.");
|
||||
return 1;
|
||||
}
|
||||
|
||||
result = parser.Parse (baseDir ?? directory, sourcesFile, excludesFile);
|
||||
|
||||
if (SourcesParser.TraceLevel > 0)
|
||||
Console.Error.WriteLine ($"// Writing sources from {sourcesFile} minus {excludesFile}, to {outFile}.");
|
||||
} else if (args.Count == 4) {
|
||||
if (baseDir != null)
|
||||
Console.Error.WriteLine ($"// WARNING: baseDir has no effect in this mode");
|
||||
|
||||
var libraryFullName = Path.GetFullPath (args[1]);
|
||||
var platformName = args[2].Trim ();
|
||||
var profileName = args[3].Trim ();
|
||||
var libraryDirectory = Path.GetDirectoryName (libraryFullName);
|
||||
var libraryName = Path.GetFileName (libraryFullName);
|
||||
result = parser.Parse (libraryDirectory, libraryName, platformName, profileName);
|
||||
|
||||
if (SourcesParser.TraceLevel > 0)
|
||||
Console.Error.WriteLine ($"// Writing sources for platform {platformName} and profile {profileName}, relative to {libraryDirectory}, to {outFile}.");
|
||||
} else {
|
||||
throw new Exception ();
|
||||
}
|
||||
|
||||
var fileNames = result.GetMatches ()
|
||||
.OrderBy (e => e.RelativePath, StringComparer.Ordinal)
|
||||
.Select (e => e.RelativePath)
|
||||
.Distinct ()
|
||||
.ToList ();
|
||||
|
||||
var unexpectedEmptyResult = (fileNames.Count == 0);
|
||||
|
||||
// HACK: We have sources files that are literally empty, so as long as *some* sources files were
|
||||
// parsed during this invocation and they are all empty, producing no matching file names is not
|
||||
// an error.
|
||||
if ((result.SourcesFiles.Count > 0) && result.SourcesFiles.Values.All(sf => sf.Sources.Count == 0))
|
||||
unexpectedEmptyResult = false;
|
||||
|
||||
if ((result.ErrorCount > 0) || unexpectedEmptyResult) {
|
||||
Console.Error.WriteLine ($"// gensources produced {result.ErrorCount} error(s) and a set of {fileNames.Count} filename(s)");
|
||||
Console.Error.WriteLine ($"// Invoked with '{Environment.CommandLine}'");
|
||||
Console.Error.WriteLine ($"// Working directory was '{Environment.CurrentDirectory}'");
|
||||
|
||||
if (strictMode) {
|
||||
// HACK: Make ignores non-zero exit codes so we need to delete the sources file ???
|
||||
if (!useStdout && File.Exists (outFile))
|
||||
File.Delete (outFile);
|
||||
|
||||
return result.ErrorCount + 1;
|
||||
}
|
||||
}
|
||||
|
||||
TextWriter output;
|
||||
if (useStdout)
|
||||
output = Console.Out;
|
||||
else
|
||||
output = new StreamWriter (outFile);
|
||||
|
||||
using (output) {
|
||||
foreach (var fileName in fileNames)
|
||||
output.WriteLine (fileName);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
public class SourcesFile {
|
||||
public readonly string FileName;
|
||||
public readonly bool IsExclusion;
|
||||
|
||||
public readonly List<ParseEntry> Sources = new List<ParseEntry> ();
|
||||
public readonly List<ParseEntry> Exclusions = new List<ParseEntry> ();
|
||||
public readonly List<SourcesFile> Includes = new List<SourcesFile> ();
|
||||
|
||||
public SourcesFile (string fileName, bool isExclusion) {
|
||||
FileName = fileName;
|
||||
IsExclusion = isExclusion;
|
||||
}
|
||||
}
|
||||
|
||||
public struct ParseEntry {
|
||||
public string Directory;
|
||||
public string Pattern;
|
||||
}
|
||||
|
||||
public struct MatchEntry {
|
||||
public SourcesFile SourcesFile;
|
||||
public string RelativePath;
|
||||
}
|
||||
|
||||
public class TargetParseResult {
|
||||
public (string hostPlatform, string profile) Key;
|
||||
public SourcesFile Sources, Exclusions;
|
||||
public bool IsFallback;
|
||||
|
||||
public override string ToString () {
|
||||
var fallbackString = IsFallback ? " fallback" : "";
|
||||
return $"{Key}{fallbackString} -> [{Sources?.FileName}, {Exclusions?.FileName}]";
|
||||
}
|
||||
}
|
||||
|
||||
public class ParseResult {
|
||||
public readonly string LibraryDirectory;
|
||||
|
||||
public readonly Dictionary<(string hostPlatform, string profile), TargetParseResult> TargetDictionary = new Dictionary<(string hostPlatform, string profile), TargetParseResult> ();
|
||||
|
||||
public readonly Dictionary<string, SourcesFile> SourcesFiles = new Dictionary<string, SourcesFile> ();
|
||||
public readonly Dictionary<string, SourcesFile> ExclusionFiles = new Dictionary<string, SourcesFile> ();
|
||||
|
||||
// FIXME: This is a bad spot for this value but enumerators don't have outparam support
|
||||
public int ErrorCount = 0;
|
||||
|
||||
public ParseResult (string libraryDirectory) {
|
||||
LibraryDirectory = Path.GetFullPath (libraryDirectory);
|
||||
}
|
||||
|
||||
public IEnumerable<TargetParseResult> Targets {
|
||||
get {
|
||||
return TargetDictionary.Values;
|
||||
}
|
||||
}
|
||||
|
||||
private string GetRelativePath (string fullPath, string relativeToDirectory) {
|
||||
fullPath = fullPath.Replace ("\\", "/");
|
||||
relativeToDirectory = relativeToDirectory.Replace ("\\", "/");
|
||||
|
||||
if (!relativeToDirectory.EndsWith ("/"))
|
||||
relativeToDirectory += "/";
|
||||
|
||||
try {
|
||||
var dirUri = new Uri (relativeToDirectory);
|
||||
var pathUri = new Uri (fullPath);
|
||||
|
||||
var relativePath = Uri.UnescapeDataString (
|
||||
dirUri.MakeRelativeUri (pathUri).OriginalString
|
||||
).Replace ("/", SourcesParser.DirectorySeparator)
|
||||
.Replace (SourcesParser.DirectorySeparator + SourcesParser.DirectorySeparator, SourcesParser.DirectorySeparator);
|
||||
|
||||
return relativePath;
|
||||
} catch (Exception) {
|
||||
Console.Error.WriteLine ($"// Parse error when treating '{fullPath}' as a URI relative to directory '{relativeToDirectory}'");
|
||||
ErrorCount += 1;
|
||||
return fullPath;
|
||||
}
|
||||
|
||||
/*
|
||||
if (SourcesParser.TraceLevel >= 4)
|
||||
Console.Error.WriteLine ($"// {fullPath} -> {relativePath}");
|
||||
*/
|
||||
}
|
||||
|
||||
public IEnumerable<MatchEntry> EnumerateMatches (
|
||||
SourcesFile sourcesFile,
|
||||
IEnumerable<ParseEntry> entries,
|
||||
bool forExclusionsList
|
||||
) {
|
||||
var patternChars = new [] { '*', '?' };
|
||||
|
||||
var isFirstError = true;
|
||||
|
||||
foreach (var entry in entries) {
|
||||
var absolutePath = Path.GetFullPath (Path.Combine (entry.Directory, entry.Pattern));
|
||||
var absoluteDirectory = Path.GetDirectoryName (absolutePath);
|
||||
var absolutePattern = Path.GetFileName (absolutePath);
|
||||
|
||||
if (SourcesParser.TraceLevel >= 4) {
|
||||
if ((absolutePattern != entry.Pattern) || (absoluteDirectory != entry.Directory))
|
||||
Console.Error.WriteLine ($"// {entry.Directory} / {entry.Pattern} -> {absoluteDirectory} / {absolutePattern}");
|
||||
}
|
||||
|
||||
if (!Directory.Exists (absoluteDirectory)) {
|
||||
if (isFirstError) {
|
||||
isFirstError = false;
|
||||
Console.Error.WriteLine ($"// Error(s) in file {sourcesFile.FileName}:");
|
||||
}
|
||||
|
||||
if (forExclusionsList) {
|
||||
Console.Error.WriteLine ($"(ignored) Directory does not exist: '{Path.GetFullPath (absoluteDirectory)}'");
|
||||
} else {
|
||||
Console.Error.WriteLine ($"Directory does not exist: '{Path.GetFullPath (absoluteDirectory)}'");
|
||||
ErrorCount += 1;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (absolutePattern.IndexOfAny (patternChars) >= 0) {
|
||||
var matchingFiles = Directory.GetFiles (absoluteDirectory, absolutePattern);
|
||||
if (matchingFiles.Length == 0) {
|
||||
if (SourcesParser.TraceLevel > 0)
|
||||
Console.Error.WriteLine ($"// No matches for pattern '{absolutePattern}'");
|
||||
}
|
||||
|
||||
foreach (var fileName in matchingFiles) {
|
||||
var relativePath = GetRelativePath (fileName, LibraryDirectory);
|
||||
yield return new MatchEntry {
|
||||
SourcesFile = sourcesFile,
|
||||
RelativePath = relativePath,
|
||||
};
|
||||
}
|
||||
} else {
|
||||
if (!File.Exists (absolutePath)) {
|
||||
if (isFirstError) {
|
||||
isFirstError = false;
|
||||
Console.Error.WriteLine ($"// Error(s) in file {sourcesFile.FileName}:");
|
||||
}
|
||||
|
||||
if (forExclusionsList) {
|
||||
Console.Error.WriteLine ($"(ignored) File does not exist: '{absolutePath}'");
|
||||
} else {
|
||||
Console.Error.WriteLine ($"File does not exist: '{absolutePath}'");
|
||||
ErrorCount += 1;
|
||||
}
|
||||
} else {
|
||||
var relativePath = GetRelativePath (absolutePath, LibraryDirectory);
|
||||
yield return new MatchEntry {
|
||||
SourcesFile = sourcesFile,
|
||||
RelativePath = relativePath,
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private IEnumerable<MatchEntry> GetMatchesFromFile (
|
||||
SourcesFile sourcesFile, HashSet<string> excludedFiles = null
|
||||
) {
|
||||
if (sourcesFile == null)
|
||||
yield break;
|
||||
|
||||
if (excludedFiles == null)
|
||||
excludedFiles = new HashSet<string> (StringComparer.Ordinal);
|
||||
|
||||
foreach (var m in EnumerateMatches (sourcesFile, sourcesFile.Exclusions, true))
|
||||
excludedFiles.Add (m.RelativePath);
|
||||
|
||||
foreach (var include in sourcesFile.Includes) {
|
||||
foreach (var m in GetMatchesFromFile (include, excludedFiles))
|
||||
yield return m;
|
||||
}
|
||||
|
||||
// FIXME: This is order-sensitive
|
||||
foreach (var entry in EnumerateMatches (sourcesFile, sourcesFile.Sources, false)) {
|
||||
if (excludedFiles.Contains (entry.RelativePath)) {
|
||||
if (SourcesParser.TraceLevel >= 3)
|
||||
Console.Error.WriteLine ($"// Excluding {entry.RelativePath}");
|
||||
continue;
|
||||
}
|
||||
|
||||
yield return entry;
|
||||
}
|
||||
}
|
||||
|
||||
public IEnumerable<MatchEntry> GetMatches (TargetParseResult target = null) {
|
||||
var excludedFiles = new HashSet<string> (StringComparer.Ordinal);
|
||||
|
||||
if (target == null) {
|
||||
if (TargetDictionary.Count == 0)
|
||||
yield break;
|
||||
|
||||
target = Targets.First ();
|
||||
}
|
||||
|
||||
if (target == null)
|
||||
throw new ArgumentNullException ("target");
|
||||
|
||||
if (SourcesParser.TraceLevel >= 3)
|
||||
Console.Error.WriteLine ($"// Scanning sources file tree for {target.Key}");
|
||||
|
||||
int count = 0;
|
||||
foreach (var m in GetMatchesFromFile (target.Exclusions, excludedFiles))
|
||||
excludedFiles.Add (m.RelativePath);
|
||||
|
||||
foreach (var m in GetMatchesFromFile (target.Sources, excludedFiles)) {
|
||||
count++;
|
||||
yield return m;
|
||||
}
|
||||
|
||||
if (SourcesParser.TraceLevel >= 3)
|
||||
Console.Error.WriteLine ($"// Scan complete. Generated {count} successful matches.");
|
||||
}
|
||||
}
|
||||
|
||||
public class SourcesParser {
|
||||
public static readonly string DirectorySeparator = new String (Path.DirectorySeparatorChar, 1);
|
||||
public static int TraceLevel = 0;
|
||||
|
||||
private class State {
|
||||
public ParseResult Result;
|
||||
public string HostPlatform;
|
||||
public string ProfileName;
|
||||
|
||||
public int SourcesFilesParsed, ExclusionsFilesParsed;
|
||||
}
|
||||
|
||||
public readonly string[] AllHostPlatformNames;
|
||||
public readonly string[] AllProfileNames;
|
||||
|
||||
private int ParseDepth = 0;
|
||||
|
||||
public SourcesParser (
|
||||
string platformsFolder, string profilesFolder
|
||||
) {
|
||||
AllHostPlatformNames = Directory.GetFiles (platformsFolder, "*.make")
|
||||
.Select (Path.GetFileNameWithoutExtension)
|
||||
.ToArray ();
|
||||
AllProfileNames = Directory.GetFiles (profilesFolder, "*.make")
|
||||
.Select (Path.GetFileNameWithoutExtension)
|
||||
.ToArray ();
|
||||
}
|
||||
|
||||
public ParseResult Parse (string libraryDirectory, string sourcesFileName, string exclusionsFileName) {
|
||||
var state = new State {
|
||||
Result = new ParseResult (libraryDirectory)
|
||||
};
|
||||
|
||||
var tpr = new TargetParseResult {
|
||||
Key = (hostPlatform: null, profile: null)
|
||||
};
|
||||
|
||||
var parsedTarget = ParseIntoTarget (state, tpr, sourcesFileName, exclusionsFileName, null, overrideDirectory: libraryDirectory);
|
||||
|
||||
PrintSummary (state, sourcesFileName);
|
||||
return state.Result;
|
||||
}
|
||||
|
||||
public ParseResult Parse (string libraryDirectory, string libraryName, string hostPlatform, string profile) {
|
||||
var state = new State {
|
||||
Result = new ParseResult (libraryDirectory),
|
||||
ProfileName = profile,
|
||||
HostPlatform = hostPlatform
|
||||
};
|
||||
|
||||
var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
|
||||
var ok = TryParseTargetInto (state, testPath);
|
||||
|
||||
if (ok) {
|
||||
PrintSummary (state, testPath);
|
||||
return state.Result;
|
||||
}
|
||||
|
||||
state.HostPlatform = null;
|
||||
|
||||
testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
|
||||
ok = TryParseTargetInto (state, testPath);
|
||||
|
||||
if (ok) {
|
||||
PrintSummary (state, testPath);
|
||||
return state.Result;
|
||||
}
|
||||
|
||||
testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_defaultprofile_{libraryName}");
|
||||
ok = TryParseTargetInto (state, testPath);
|
||||
|
||||
if (ok) {
|
||||
PrintSummary (state, testPath);
|
||||
return state.Result;
|
||||
}
|
||||
|
||||
state.ProfileName = null;
|
||||
|
||||
testPath = Path.Combine (libraryDirectory, libraryName);
|
||||
ok = TryParseTargetInto (state, testPath);
|
||||
|
||||
PrintSummary (state, testPath);
|
||||
|
||||
return state.Result;
|
||||
}
|
||||
|
||||
private void StripFallbackTargetsOrDefaultTarget (
|
||||
State state, TargetParseResult defaultTarget, List<TargetParseResult> fallbackTargets, int maximumCount
|
||||
) {
|
||||
if (fallbackTargets.Count == maximumCount) {
|
||||
// If we didn't find any platform specific targets, remove them and just leave one single
|
||||
// platform-specific target entry
|
||||
foreach (var target in fallbackTargets)
|
||||
state.Result.TargetDictionary.Remove (target.Key);
|
||||
} else if (defaultTarget != null) {
|
||||
// Otherwise, strip the non-platform-specific target
|
||||
state.Result.TargetDictionary.Remove (defaultTarget.Key);
|
||||
}
|
||||
}
|
||||
|
||||
public ParseResult Parse (string libraryDirectory, string libraryName) {
|
||||
var state = new State {
|
||||
Result = new ParseResult (libraryDirectory)
|
||||
};
|
||||
|
||||
string originalTestPath = Path.Combine (libraryDirectory, libraryName);
|
||||
var defaultTarget = ParseTarget (state, originalTestPath, null);
|
||||
var profileFallbackTargets = new List<TargetParseResult> ();
|
||||
|
||||
foreach (var profile in AllProfileNames) {
|
||||
state.ProfileName = profile;
|
||||
state.HostPlatform = null;
|
||||
|
||||
var testPath = Path.Combine (libraryDirectory, $"{profile}_{libraryName}");
|
||||
var profileTarget = ParseTarget (state, testPath, defaultTarget);
|
||||
if ((profileTarget != null) && profileTarget.IsFallback)
|
||||
profileFallbackTargets.Add (profileTarget);
|
||||
|
||||
var fallbackTargets = new List<TargetParseResult> ();
|
||||
|
||||
foreach (var hostPlatform in AllHostPlatformNames) {
|
||||
state.HostPlatform = hostPlatform;
|
||||
|
||||
testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{profile}_{libraryName}");
|
||||
var target = ParseTarget (state, testPath, profileTarget ?? defaultTarget);
|
||||
if ((target != null) && target.IsFallback)
|
||||
fallbackTargets.Add (target);
|
||||
}
|
||||
|
||||
StripFallbackTargetsOrDefaultTarget (state, profileTarget, fallbackTargets, AllHostPlatformNames.Length);
|
||||
}
|
||||
|
||||
StripFallbackTargetsOrDefaultTarget (state, defaultTarget, profileFallbackTargets, AllProfileNames.Length);
|
||||
|
||||
var platformFallbackTargets = new List<TargetParseResult> ();
|
||||
|
||||
var ambiguousSourcesNames = new List<string> ();
|
||||
|
||||
foreach (var hostPlatform in AllHostPlatformNames) {
|
||||
state.ProfileName = null;
|
||||
state.HostPlatform = hostPlatform;
|
||||
|
||||
var testPath = Path.Combine (libraryDirectory, $"{hostPlatform}_defaultprofile_{libraryName}");
|
||||
var target = ParseTarget (state, testPath, defaultTarget);
|
||||
if ((target != null) && target.IsFallback)
|
||||
platformFallbackTargets.Add (target);
|
||||
|
||||
if ((target == null) || target.IsFallback) {
|
||||
var oldTestPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{libraryName}.sources");
|
||||
if (File.Exists (oldTestPath))
|
||||
ambiguousSourcesNames.Add (oldTestPath);
|
||||
|
||||
oldTestPath = Path.Combine (libraryDirectory, $"{hostPlatform}_{libraryName}.exclude.sources");
|
||||
if (File.Exists (oldTestPath))
|
||||
ambiguousSourcesNames.Add (oldTestPath);
|
||||
}
|
||||
}
|
||||
|
||||
StripFallbackTargetsOrDefaultTarget (state, defaultTarget, platformFallbackTargets, AllHostPlatformNames.Length);
|
||||
|
||||
foreach (var path in ambiguousSourcesNames) {
|
||||
if (!state.Result.SourcesFiles.ContainsKey (path) && !state.Result.ExclusionFiles.ContainsKey (path)) {
|
||||
Console.Error.WriteLine ($"// The file '{path}' was found but not used by sources parsing. Did you mean hostPlatform_defaultprofile_{libraryName}?");
|
||||
state.Result.ErrorCount += 1;
|
||||
}
|
||||
}
|
||||
|
||||
PrintSummary (state, originalTestPath);
|
||||
|
||||
return state.Result;
|
||||
}
|
||||
|
||||
private void PrintSummary (State state, string testPath) {
|
||||
if (TraceLevel > 0)
|
||||
Console.Error.WriteLine ($"// Parsed {state.SourcesFilesParsed} sources file(s) and {state.ExclusionsFilesParsed} exclusions file(s) from path '{testPath}'.");
|
||||
}
|
||||
|
||||
private void HandleMetaDirective (
|
||||
State state, SourcesFile file,
|
||||
string pathDirectory, string includeDirectory,
|
||||
bool asExclusionsList, string directive
|
||||
) {
|
||||
var include = "#include ";
|
||||
if (directive.StartsWith (include)) {
|
||||
var includeName = directive.Substring (include.Length).Trim ();
|
||||
var fileName = Path.Combine (includeDirectory, includeName);
|
||||
if (!File.Exists (fileName)) {
|
||||
Console.Error.WriteLine ($"// Include does not exist: {fileName}");
|
||||
state.Result.ErrorCount++;
|
||||
return;
|
||||
}
|
||||
|
||||
var newFile = ParseSingleFile (state, fileName, asExclusionsList, overrideDirectory: pathDirectory);
|
||||
if (newFile == null) {
|
||||
Console.Error.WriteLine ($"// Failed to parse included file: {fileName}");
|
||||
state.Result.ErrorCount++;
|
||||
return;
|
||||
}
|
||||
|
||||
file.Includes.Add (newFile);
|
||||
}
|
||||
}
|
||||
|
||||
private bool TryParseTargetInto (State state, string prefix) {
|
||||
var result = ParseTarget (state, prefix, null);
|
||||
return (result != null);
|
||||
}
|
||||
|
||||
private TargetParseResult ParseTarget (State state, string prefix, TargetParseResult fallbackTarget) {
|
||||
// FIXME: We determine the prefix for the pair of sources and exclusions,
|
||||
// which may not match intended behavior:
|
||||
// if linux_net_4_x_foo.sources is present, but linux_net_4_x_foo.exclude.sources is not present,
|
||||
// should net_4_x_foo.exclude.sources be used as a fallback? Maybe it should.
|
||||
// This won't do that though.
|
||||
|
||||
var tpr = new TargetParseResult {
|
||||
Key = (hostPlatform: state.HostPlatform, profile: state.ProfileName)
|
||||
};
|
||||
|
||||
var sourcesFileName = prefix + ".sources";
|
||||
var exclusionsFileName = prefix + ".exclude.sources";
|
||||
|
||||
return ParseIntoTarget (state, tpr, sourcesFileName, exclusionsFileName, fallbackTarget);
|
||||
}
|
||||
|
||||
private TargetParseResult ParseIntoTarget (
|
||||
State state, TargetParseResult tpr,
|
||||
string sourcesFileName, string exclusionsFileName,
|
||||
TargetParseResult fallbackTarget, string overrideDirectory = null
|
||||
) {
|
||||
if (!File.Exists (sourcesFileName)) {
|
||||
if (fallbackTarget != null) {
|
||||
if (TraceLevel >= 2)
|
||||
Console.Error.WriteLine($"// Not found: {sourcesFileName}, falling back to {fallbackTarget}");
|
||||
tpr.Sources = fallbackTarget.Sources;
|
||||
tpr.Exclusions = fallbackTarget.Exclusions;
|
||||
tpr.IsFallback = true;
|
||||
state.Result.TargetDictionary.Add (tpr.Key, tpr);
|
||||
return tpr;
|
||||
} else {
|
||||
if (TraceLevel >= 1)
|
||||
Console.Error.WriteLine($"// Not found: {sourcesFileName}");
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
tpr.Sources = ParseSingleFile (state, sourcesFileName, false, overrideDirectory: overrideDirectory);
|
||||
|
||||
if (File.Exists (exclusionsFileName))
|
||||
tpr.Exclusions = ParseSingleFile (state, exclusionsFileName, true, overrideDirectory: overrideDirectory);
|
||||
|
||||
state.Result.TargetDictionary.Add (tpr.Key, tpr);
|
||||
return tpr;
|
||||
}
|
||||
|
||||
private SourcesFile ParseSingleFile (State state, string fileName, bool asExclusionsList, string overrideDirectory = null) {
|
||||
var fileTable = asExclusionsList ? state.Result.ExclusionFiles : state.Result.SourcesFiles;
|
||||
|
||||
var nullStr = "<none>";
|
||||
|
||||
if (fileTable.ContainsKey (fileName)) {
|
||||
if (TraceLevel >= 2)
|
||||
Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName} (already parsed)");
|
||||
|
||||
return fileTable[fileName];
|
||||
} else {
|
||||
if (TraceLevel >= 2)
|
||||
Console.Error.WriteLine ($"// {new String (' ', ParseDepth * 2)}{fileName} [{state.HostPlatform ?? nullStr}] [{state.ProfileName ?? nullStr}]");
|
||||
}
|
||||
|
||||
ParseDepth += 1;
|
||||
|
||||
var includeDirectory = Path.GetDirectoryName (fileName);
|
||||
var pathDirectory = overrideDirectory ?? includeDirectory;
|
||||
var result = new SourcesFile (fileName, asExclusionsList);
|
||||
fileTable.Add (fileName, result);
|
||||
|
||||
using (var sr = new StreamReader (fileName)) {
|
||||
if (asExclusionsList)
|
||||
state.ExclusionsFilesParsed++;
|
||||
else
|
||||
state.SourcesFilesParsed++;
|
||||
|
||||
string line;
|
||||
while ((line = sr.ReadLine ()) != null) {
|
||||
if (line.StartsWith ("#")) {
|
||||
HandleMetaDirective (state, result, pathDirectory, includeDirectory, asExclusionsList, line);
|
||||
continue;
|
||||
}
|
||||
|
||||
line = line.Trim ();
|
||||
|
||||
if (String.IsNullOrWhiteSpace (line))
|
||||
continue;
|
||||
|
||||
var parts = line.Split (':');
|
||||
|
||||
if (parts.Length > 1) {
|
||||
var explicitExclusions = parts[1].Split (',');
|
||||
|
||||
// gensources.sh implemented these explicit exclusions like so:
|
||||
// ../foo/bar/*.cs:A.cs,B.cs
|
||||
// This would generate exclusions for ../foo/bar/A.cs and ../foo/bar/B.cs,
|
||||
// not ./A.cs and ./B.cs as you might expect
|
||||
|
||||
var mainPatternDirectory = Path.GetDirectoryName (parts[0]);
|
||||
|
||||
foreach (var pattern in explicitExclusions) {
|
||||
result.Exclusions.Add (new ParseEntry {
|
||||
Directory = pathDirectory,
|
||||
Pattern = Path.Combine (mainPatternDirectory, pattern)
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
(asExclusionsList ? result.Exclusions : result.Sources)
|
||||
.Add (new ParseEntry {
|
||||
Directory = pathDirectory,
|
||||
Pattern = parts[0]
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
ParseDepth -= 1;
|
||||
return result;
|
||||
}
|
||||
}
|
||||
Executable
+113
@@ -0,0 +1,113 @@
|
||||
#! /bin/sh
|
||||
|
||||
outfile=$1
|
||||
incfile=$2
|
||||
excfile=$3
|
||||
extfile=$4
|
||||
extexcfile=$5
|
||||
|
||||
process_includes_1() {
|
||||
sed -e '/^[ \t]*$/d' -e '/^[ \t]*#/d' -e '/*/d' $1 > $2
|
||||
if cmp -s $1 $2; then
|
||||
false
|
||||
else
|
||||
sed -n 's,^[ \t]*#include ,,p' $1 |
|
||||
while read inc; do
|
||||
cat $inc >> $2
|
||||
echo $outfile: $inc >> $outfile.makefrag
|
||||
echo $inc: >> $outfile.makefrag
|
||||
done
|
||||
|
||||
# expand wildcards
|
||||
sed -n '/*/p' $1 | grep -v '#' |
|
||||
while read wildc; do
|
||||
# quick syntax to exclude files:
|
||||
# ../../../MyDir/*.cs:FileToExclude1.cs,FileToExclude2.cs
|
||||
wc=`echo $wildc | cut -d \: -f 1` # ../../../MyDir/*.cs
|
||||
qexc=`echo $wildc | cut -d \: -f 2` # FileToExclude1.cs,FileToExclude2.cs
|
||||
|
||||
if test "$wc" = "$qexc"; then
|
||||
# no quick excludes - just expand the wildcard
|
||||
ls $wildc >> $2
|
||||
else
|
||||
wcdir=`echo $wildc | cut -d \* -f 1` # ../../../MyDir/
|
||||
# Enumerate files from 'FileToExclude1.cs,FileToExclude2.cs'
|
||||
# and save to $outfile.exc
|
||||
oldIFS=$IFS
|
||||
IFS=,
|
||||
for i in $qexc; do
|
||||
echo "$wcdir$i" >> $outfile.exc
|
||||
done
|
||||
IFS=$oldIFS
|
||||
ls $wc >> $2
|
||||
fi
|
||||
done
|
||||
fi
|
||||
}
|
||||
|
||||
process_includes() {
|
||||
i=$1; o=$2; t=${2}.tmp
|
||||
while process_includes_1 $i $o; do
|
||||
mv $o $t
|
||||
i=$t
|
||||
done
|
||||
rm -f $t
|
||||
}
|
||||
|
||||
check_newline_eof() {
|
||||
file=$1
|
||||
if ! test -f "$file"; then return; fi
|
||||
if ! test -z "$(tail -c 1 "$file")"; then echo "$file: missing newline at end of file."; exit 1; fi
|
||||
}
|
||||
|
||||
check_newline_eof $incfile
|
||||
check_newline_eof $excfile
|
||||
check_newline_eof $extfile
|
||||
check_newline_eof $extexcfile
|
||||
|
||||
rm -f $outfile.makefrag
|
||||
|
||||
process_includes $incfile $outfile.inc
|
||||
|
||||
if test x$extfile != x -a -f "$extfile"; then
|
||||
process_includes $extfile $outfile.ext.inc
|
||||
cat $outfile.ext.inc >> $outfile.inc
|
||||
rm -f $outfile.ext.inc
|
||||
fi
|
||||
|
||||
sort -u $outfile.inc > $outfile.inc_s
|
||||
rm -f $outfile.inc
|
||||
|
||||
|
||||
if test -n "$excfile" -a -f "$excfile"; then
|
||||
process_includes $excfile $outfile.exc
|
||||
fi
|
||||
|
||||
if test -n "$extexcfile"; then
|
||||
process_includes $extexcfile $outfile.ext_exc
|
||||
cat $outfile.ext_exc >> $outfile.exc
|
||||
rm -f $outfile.ext_exc
|
||||
fi
|
||||
|
||||
if test -f $outfile.exc; then
|
||||
# So what we're doing below with uniq -u is that we take
|
||||
# lines that have not been duplicated. This computes the
|
||||
# symmetric difference between the files. This is not
|
||||
# what we want. If a file is in the excludes but not in
|
||||
# the sources, we want that file not to show up. By duplicating the
|
||||
# excludes, we ensure that we won't end up in this failure state.
|
||||
sort -u $outfile.exc > $outfile.exc_s
|
||||
|
||||
# Duplicate excludes
|
||||
cat $outfile.exc_s >> $outfile.exc_s_dup
|
||||
cat $outfile.exc_s >> $outfile.exc_s_dup
|
||||
|
||||
rm -f $outfile.exc $outfile.exc_s
|
||||
|
||||
cat $outfile.inc_s $outfile.exc_s_dup | sort | uniq -u > $outfile
|
||||
rm -f $outfile.inc_s $outfile.exc_s_dup
|
||||
else
|
||||
mv $outfile.inc_s $outfile
|
||||
fi
|
||||
|
||||
|
||||
+26
-21
@@ -14,12 +14,13 @@
|
||||
# command line.
|
||||
#
|
||||
|
||||
# All dependent libs become dependent dirs for parallel builds
|
||||
# Have to rename to handle differences between assembly/directory names
|
||||
DEP_LIBS=$(patsubst System.Xml,System.XML,$(LIB_REFS))
|
||||
|
||||
LIB_REFS_FULL = $(call _FILTER_OUT,=, $(LIB_REFS)) $(DEFAULT_REFERENCES)
|
||||
LIB_REFS_ALIAS = $(filter-out $(LIB_REFS_FULL),$(LIB_REFS))
|
||||
|
||||
# All dependent libs become dependent dirs for parallel builds
|
||||
DEP_LIBS = $(filter-out %=, $(subst =,= ,$(LIB_REFS)))
|
||||
|
||||
ifdef TARGET_NET_REFERENCE
|
||||
# System*, mscorlib references come from the TARGET_NET_REFERENCE dir, others from the profile dir
|
||||
LIB_REFS_MONO_FULL = $(call _FILTER_OUT,System,$(call _FILTER_OUT,mscorlib,$(LIB_REFS_FULL)))
|
||||
@@ -74,6 +75,17 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# The bare directory contains the plain versions of System and System.Xml
|
||||
#
|
||||
bare_libdir = $(the_libdir_base)bare
|
||||
|
||||
#
|
||||
# The secxml directory contains the System version that depends on
|
||||
# System.Xml and Mono.Security
|
||||
#
|
||||
secxml_libdir = $(the_libdir_base)secxml
|
||||
|
||||
the_libdir = $(the_libdir_base)$(intermediate)
|
||||
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
@@ -124,7 +136,6 @@ csproj-library:
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo $(is_boot); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(KEYFILE_MCS_FLAGS); \
|
||||
echo $(LIBRARY); \
|
||||
echo $(LIBRARY_NAME); \
|
||||
echo $(BUILT_SOURCES_cmdline); \
|
||||
echo $(build_lib); \
|
||||
@@ -213,7 +224,7 @@ test-local run-test-local run-test-ondotnet-local:
|
||||
ccomma = ,
|
||||
define RESOURCE_template
|
||||
$(1).resources: $(2)
|
||||
$$(RESGEN) "$$<" "$$@"
|
||||
$(RESGEN) "$$<" "$$@"
|
||||
|
||||
GEN_RESOURCE_DEPS += $(1).resources
|
||||
GEN_RESOURCE_FLAGS += -resource:$(1).resources
|
||||
@@ -225,12 +236,11 @@ ifdef RESOURCE_DEFS
|
||||
$(foreach pair,$(RESOURCE_DEFS), $(eval $(call RESOURCE_template,$(word 1, $(subst $(ccomma), ,$(pair))), $(word 2, $(subst $(ccomma), ,$(pair))))))
|
||||
endif
|
||||
|
||||
DISTFILES = $(wildcard *.sources) $(EXTRA_DISTFILES) $(DIST_LISTED_RESOURCES)
|
||||
DISTFILES = $(wildcard *$(LIBRARY)*.sources) $(EXTRA_DISTFILES) $(DIST_LISTED_RESOURCES)
|
||||
|
||||
ASSEMBLY = $(LIBRARY)
|
||||
ASSEMBLY_EXT = .dll
|
||||
the_assembly = $(the_lib)
|
||||
|
||||
include $(topdir)/build/tests.make
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
@@ -241,7 +251,6 @@ csproj-test:
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo false; \
|
||||
echo $(USE_MCS_FLAGS) -r:$(the_assembly) $(TEST_MCS_FLAGS); \
|
||||
echo $(LIBRARY); \
|
||||
echo $(test_lib); \
|
||||
echo $(BUILT_SOURCES_cmdline); \
|
||||
echo $(test_lib); \
|
||||
@@ -286,18 +295,14 @@ endif
|
||||
# The library
|
||||
|
||||
# If the directory contains the per profile include file, generate list file.
|
||||
# TODO: depend on all *.sources for now and figure out how to list only needed files later
|
||||
PROFILE_sources = $(wildcard *.sources)
|
||||
|
||||
ifneq "x" "x$(PROFILE_RUNTIME)"
|
||||
GENSOURCES_RUNTIME=$(PROFILE_RUNTIME)
|
||||
else
|
||||
GENSOURCES_RUNTIME=MONO_PATH="$(GENSOURCES_LIBDIR)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME)
|
||||
endif
|
||||
PROFILE_sources := $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).sources)) $(wildcard $(PROFILE)_$(LIBRARY).sources) $(wildcard $(LIBRARY).sources))
|
||||
PROFILE_excludes = $(firstword $(if $(PROFILE_PLATFORM),$(wildcard $(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY).exclude.sources)) $(wildcard $(PROFILE)_$(LIBRARY).exclude.sources))
|
||||
|
||||
# Note, gensources.sh can create a $(sourcefile).makefrag if it sees any '#include's
|
||||
# We don't include it in the dependencies since it isn't always created
|
||||
sourcefile = $(depsdir)/$(PROFILE_PLATFORM)_$(PROFILE)_$(LIBRARY_SUBDIR)_$(LIBRARY).sources
|
||||
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(depsdir)/.stamp $(GENSOURCES_CS)
|
||||
$(GENSOURCES_RUNTIME) --debug $(GENSOURCES_EXE) --strict "$@" "$(LIBRARY)" "$(PROFILE_PLATFORM)" "$(PROFILE)"
|
||||
$(sourcefile): $(PROFILE_sources) $(PROFILE_excludes) $(topdir)/build/gensources.sh $(depsdir)/.stamp
|
||||
$(SHELL) $(topdir)/build/gensources.sh $@ '$(PROFILE_sources)' '$(PROFILE_excludes)'
|
||||
|
||||
library_CLEAN_FILES += $(sourcefile)
|
||||
|
||||
@@ -385,9 +390,9 @@ gen-deps:
|
||||
|
||||
update-corefx-sr-generic:
|
||||
ifneq ($(RESX_STRINGS),)
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_EXTRA_ARGUMENTS) $(RESX_STRINGS) >$(SR_OUTPUT)
|
||||
MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resx2sr.exe $(RESX_STRINGS) >$(SR_OUTPUT)
|
||||
endif
|
||||
|
||||
update-corefx-sr: $(RESX_RESOURCE_STRING) $(XTEST_RESX_RESOURCE_STRING)
|
||||
make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" RESX_EXTRA_ARGUMENTS="$(RESX_EXTRA_ARGUMENTS)" update-corefx-sr-generic \
|
||||
&& make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic
|
||||
make SR_OUTPUT=corefx/SR.cs RESX_STRINGS="$(RESX_RESOURCE_STRING)" update-corefx-sr-generic \
|
||||
&& make SR_OUTPUT=corefx/SR.tests.cs RESX_STRINGS=$(XTEST_RESX_RESOURCE_STRING) update-corefx-sr-generic
|
||||
@@ -34,5 +34,3 @@ platform-check:
|
||||
# echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \
|
||||
# exit 1 ; \
|
||||
# fi
|
||||
|
||||
PLATFORM_MACOS=1
|
||||
@@ -1,36 +0,0 @@
|
||||
# -*- makefile -*-
|
||||
#
|
||||
# Platform-specific makefile rules. This one's for any unix (FreeBSD, OpenBSD, etc.)
|
||||
#
|
||||
|
||||
PLATFORM_MCS_FLAGS =
|
||||
PLATFORM_RUNTIME = $(RUNTIME)
|
||||
PLATFORM_CORLIB = mscorlib.dll
|
||||
PLATFORM_TEST_HARNESS_EXCLUDES =
|
||||
|
||||
EXTERNAL_MCS = mcs
|
||||
EXTERNAL_MBAS = mbas
|
||||
EXTERNAL_RUNTIME = mono
|
||||
#ILDISASM = monodis
|
||||
ILDISASM = false
|
||||
|
||||
PLATFORM_PATH_SEPARATOR = :
|
||||
|
||||
# Define this if this ever will work on Unix
|
||||
# PLATFORM_MAKE_CORLIB_CMP = yes
|
||||
|
||||
# This is for changing / to \ on windows
|
||||
PLATFORM_CHANGE_SEPARATOR_CMD = cat
|
||||
|
||||
hidden_prefix = .
|
||||
hidden_suffix =
|
||||
|
||||
platform-check:
|
||||
@:
|
||||
# I tried this but apparently Make's version strings aren't that
|
||||
# ... consistent between releases. Whatever.
|
||||
#
|
||||
# @if ! $(MAKE) --version |grep '^GNU Make version 3' 1>/dev/null 2>&1 ; then \
|
||||
# echo "*** You need to build MCS with GNU make. Try \`gmake'" ; \
|
||||
# exit 1 ; \
|
||||
# fi
|
||||
@@ -29,9 +29,6 @@ endif
|
||||
ILASM = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/ilasm.exe
|
||||
STRING_REPLACER = $(PROFILE_RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/cil-stringreplacer.exe
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
GENSOURCES_CS = $(topdir)/build/gensources.cs
|
||||
GENSOURCES_DIR = $(topdir)/build
|
||||
GENSOURCES_EXE = $(GENSOURCES_DIR)/gensources.exe
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
|
||||
@@ -116,14 +113,9 @@ do-profile-check-monolite: $(depsdir)/.stamp
|
||||
|
||||
endif
|
||||
|
||||
$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs $(GENSOURCES_CS)
|
||||
$(PROFILE_EXE): $(topdir)/build/common/basic-profile-check.cs
|
||||
$(MAKE) $(MAKE_Q) -C $(topdir)/packages
|
||||
$(BOOTSTRAP_MCS) /warn:0 /noconfig /langversion:latest /r:System.dll /r:mscorlib.dll /out:$@.tmp $<
|
||||
$(BOOTSTRAP_MCS) /noconfig /langversion:latest /r:mscorlib.dll /r:System.dll /r:System.Core.dll /out:$(GENSOURCES_EXE).tmp $(GENSOURCES_CS)
|
||||
- rm $(GENSOURCES_EXE)
|
||||
mv $(GENSOURCES_EXE).tmp $(GENSOURCES_EXE)
|
||||
- rm -f $@
|
||||
mv [email protected] $@
|
||||
$(BOOTSTRAP_MCS) /warn:0 /noconfig /r:System.dll /r:mscorlib.dll /out:$@ $<
|
||||
|
||||
$(PROFILE_OUT): $(PROFILE_EXE)
|
||||
$(PROFILE_RUNTIME) $< > $@ 2>&1
|
||||
@@ -6,7 +6,7 @@ BUILD_TOOLS_PROFILE = basic
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
PLATFORMS = macos linux win32 unix
|
||||
PLATFORMS = darwin linux win32
|
||||
|
||||
# nuttzing!
|
||||
|
||||
@@ -22,4 +22,5 @@ NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
|
||||
@@ -39,4 +39,3 @@ NO_CONSOLE = yes
|
||||
PROFILE_DISABLE_BTLS=1
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
ONLY_APPLETLS=1
|
||||
ENABLE_GSS=1
|
||||
@@ -7,5 +7,3 @@ NO_THREAD_ABORT=1
|
||||
NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_MULTIPLE_APPDOMAINS=1
|
||||
NO_PROCESS_START=1
|
||||
NO_GSS=1
|
||||
NO_VTS_TEST=1
|
||||
@@ -8,5 +8,3 @@ NO_THREAD_SUSPEND_RESUME=1
|
||||
# The binding generator (btv) still needs to execute processes,
|
||||
# so we need a System.dll that can do that.
|
||||
#NO_PROCESS_START=1
|
||||
|
||||
NO_GSS=1
|
||||
@@ -9,8 +9,6 @@ NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_MULTIPLE_APPDOMAINS=1
|
||||
NO_PROCESS_START=1
|
||||
NO_MONO_SECURITY=1
|
||||
NO_GSS=1
|
||||
MONO_FEATURE_APPLETLS=
|
||||
ONLY_APPLETLS=
|
||||
MONO_FEATURE_APPLE_X509=1
|
||||
NO_VTS_TEST=1
|
||||
@@ -6,7 +6,6 @@ PROFILE_MCS_FLAGS += \
|
||||
|
||||
NO_THREAD_ABORT=1
|
||||
NO_THREAD_SUSPEND_RESUME=1
|
||||
NO_GSS=1
|
||||
# The binding generator (bwatch) still needs to execute processes,
|
||||
# so we need a System.dll that can do that.
|
||||
#NO_PROCESS_START=1
|
||||
|
||||
@@ -5,7 +5,7 @@ BOOTSTRAP_PROFILE = build
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_CSC)
|
||||
MCS = $(BOOTSTRAP_MCS)
|
||||
|
||||
PLATFORMS = macos linux win32 unix
|
||||
PLATFORMS = darwin linux win32
|
||||
|
||||
# nuttzing!
|
||||
|
||||
@@ -13,15 +13,11 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = mscorlib
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -d:WIN_PLATFORM -d:MULTIPLEX_OS -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS)
|
||||
API_BIN_PROFILE = v4.7.1
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
XBUILD_VERSION = 4.0
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
|
||||
ENFORCE_LIBRARY_WARN_AS_ERROR = yes
|
||||
|
||||
ifdef PLATFORM_MACOS
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
ENABLE_GSS=1
|
||||
endif
|
||||
@@ -35,7 +35,6 @@ MOBILE_DYNAMIC = yes
|
||||
MOBILE_PROFILE = yes
|
||||
NO_CONSOLE = yes
|
||||
|
||||
ENABLE_GSS=1
|
||||
PROFILE_DISABLE_BTLS=1
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
ONLY_APPLETLS=1
|
||||
@@ -1,7 +1,5 @@
|
||||
include $(topdir)/build/profiles/net_4_x.make
|
||||
|
||||
PLATFORMS =
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:NET_4_6 -d:MONO -nowarn:1699 -nostdlib $(PLATFORM_DEBUG_FLAGS) \
|
||||
-d:FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK \
|
||||
-d:NO_SYSTEM_DRAWING_DEPENDENCY \
|
||||
@@ -23,4 +21,3 @@ NO_SYSTEM_DIRECTORY_SERVICES_DEPENDENCY=1
|
||||
PROFILE_DISABLE_BTLS=1
|
||||
MONO_FEATURE_APPLETLS=1
|
||||
ONLY_APPLETLS=1
|
||||
ENABLE_GSS=1
|
||||
+5
-22
@@ -54,11 +54,9 @@ INTERNAL_CSC_LOCATION = $(CSC_LOCATION)
|
||||
INTERNAL_CSC = CSC_SDK_PATH_DISABLED= $(RUNTIME) $(RUNTIME_FLAGS) $(CSC_RUNTIME_FLAGS) $(INTERNAL_CSC_LOCATION)
|
||||
|
||||
RESGEN = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/resgen.exe
|
||||
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/tmp/cil-stringreplacer.exe
|
||||
STRING_REPLACER = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/cil-stringreplacer.exe
|
||||
ILASM = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/ilasm.exe
|
||||
GENSOURCES_LIBDIR = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)
|
||||
GENSOURCES_CS = $(topdir)/build/gensources.cs
|
||||
GENSOURCES_EXE = $(topdir)/build/gensources.exe
|
||||
|
||||
|
||||
depsdir = $(topdir)/build/deps
|
||||
|
||||
@@ -74,9 +72,6 @@ export MKINSTALLDIRS
|
||||
export BOOTSTRAP_MCS
|
||||
export DESTDIR
|
||||
export RESGEN
|
||||
export GENSOURCES_LIBDIR
|
||||
export GENSOURCES_CS
|
||||
export GENSOURCES_EXE
|
||||
|
||||
# Get this so the platform.make platform-check rule doesn't become the
|
||||
# default target
|
||||
@@ -166,7 +161,7 @@ gacutil = $(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)/gacutil.exe
|
||||
GACUTIL = MONO_PATH="$(topdir)/class/lib/$(BUILD_TOOLS_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
|
||||
endif
|
||||
|
||||
STD_TARGETS = test xunit-test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update
|
||||
STD_TARGETS = test run-test run-xunit-test run-test-ondotnet clean install uninstall doc-update
|
||||
|
||||
$(STD_TARGETS): %: do-%
|
||||
|
||||
@@ -243,9 +238,6 @@ endif
|
||||
$(if $(filter $*,all), \
|
||||
$(MAKE) $(PROFILE_PARALLEL_SUBDIRS) ENABLE_PARALLEL_SUBDIR_BUILD=1 || { final_exit="exit 1"; $$dk; };, \
|
||||
$(foreach subdir,$(PROFILE_PARALLEL_SUBDIRS),$(MAKE) -C $(subdir) $* || { final_exit="exit 1"; $$dk; };))) \
|
||||
$(if $(FACADES_FOLDER), \
|
||||
$(MAKE) -C $(FACADES_FOLDER) $* || { final_exit="exit 1"; $$dk; }; \
|
||||
) \
|
||||
$$final_exit
|
||||
|
||||
ifdef ENABLE_PARALLEL_SUBDIR_BUILD
|
||||
@@ -267,24 +259,15 @@ endif
|
||||
# directories it depends on.
|
||||
#
|
||||
ifneq ($(PROFILE_PARALLEL_SUBDIRS),)
|
||||
|
||||
dep_dirs = .dep_dirs-$(PROFILE)
|
||||
|
||||
#
|
||||
# This should track dependencies better but the variable can be defined in any
|
||||
# Makefile dependency. On top of that we should also regenerate when any of the
|
||||
# PROFILE_PARALLEL_SUBDIRS Makefile's are changed
|
||||
#
|
||||
$(dep_dirs): Makefile
|
||||
$(if $(V),@echo "Creating $(abspath $@)...",)
|
||||
$(dep_dirs):
|
||||
@echo "Creating $@..."
|
||||
list='$(PROFILE_PARALLEL_SUBDIRS)'; \
|
||||
echo > $@; \
|
||||
for d in $$list; do \
|
||||
$(MAKE) -C $$d gen-deps DEPS_TARGET_DIR=$$d DEPS_FILE=$(abspath $@); \
|
||||
done
|
||||
|
||||
-include $(dep_dirs)
|
||||
|
||||
endif
|
||||
|
||||
.PHONY: gen-deps
|
||||
|
||||
+34
-72
@@ -19,40 +19,23 @@ TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
## Unit test support
|
||||
ifndef NO_TEST
|
||||
|
||||
test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
|
||||
|
||||
test_nunit_lib = nunitlite.dll
|
||||
xunit_core := xunit.core xunit.execution.dotnet xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_core := xunit.core xunit.execution.desktop xunit.abstractions xunit.assert Xunit.NetCore.Extensions
|
||||
xunit_deps := System.Runtime
|
||||
xunit_src := $(patsubst %,$(topdir)/../external/xunit-binaries/%,BenchmarkAttribute.cs BenchmarkDiscover.cs) $(topdir)/../mcs/class/test-helpers/PlatformDetection.cs
|
||||
|
||||
ifeq ($(USE_XTEST_REMOTE_EXECUTOR), YES)
|
||||
XTEST_REMOTE_EXECUTOR = $(test_lib_dir)/RemoteExecutorConsoleApp.exe
|
||||
|
||||
ifeq ($(BUILD_PLATFORM), win32)
|
||||
XTEST_REMOTE_EXECUTOR_ABSPATH = $(shell cygpath -w $(abspath $(XTEST_REMOTE_EXECUTOR)))
|
||||
else
|
||||
XTEST_REMOTE_EXECUTOR_ABSPATH = $(abspath $(XTEST_REMOTE_EXECUTOR))
|
||||
endif
|
||||
|
||||
XTEST_REMOTE_EXECUTOR = $(topdir)/class/lib/$(PROFILE)/RemoteExecutorConsoleApp.exe
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/AdminHelper.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/IO/FileCleanupTestBase.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.cs \
|
||||
$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs \
|
||||
$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.Unix.cs
|
||||
$(topdir)/../external/corefx/src/Common/src/System/PasteArguments.cs
|
||||
|
||||
ifeq ($(PROFILE),monodroid)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
ifeq ($(PROFILE),monotouch_tv)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
ifeq ($(PROFILE),monotouch_watch)
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mobile.cs
|
||||
else
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs $(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
|
||||
endif
|
||||
endif
|
||||
xunit_src += $(topdir)/../mcs/class/test-helpers/RemoteExecutorTestBase.Mono.cs \
|
||||
$(topdir)/../external/corefx/src/CoreFx.Private.TestUtilities/src/System/Diagnostics/RemoteExecutorTestBase.Process.cs
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -78,7 +61,6 @@ test_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll.sources)
|
||||
endif
|
||||
|
||||
test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_test.dll)
|
||||
test_lib_output = $(test_lib_dir)/$(test_lib)
|
||||
|
||||
test_sourcefile_excludes = $(test_lib).exclude.sources
|
||||
|
||||
@@ -90,13 +72,12 @@ ifndef NO_BUILD
|
||||
test_flags += -r:$(the_assembly)
|
||||
test_assembly_dep = $(the_assembly)
|
||||
endif
|
||||
tests_CLEAN_FILES += $(test_lib_output) $(test_lib_output:$(ASSEMBLY_EXT)=.pdb) $(test_response) $(test_makefrag)
|
||||
tests_CLEAN_FILES += $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.dll) $(ASSEMBLY:$(ASSEMBLY_EXT)=_test*.pdb) $(test_response) $(test_makefrag)
|
||||
|
||||
xtest_sourcefile = $(PROFILE_PLATFORM)_$(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
xtest_sourcefile = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
xtest_sourcefile_excludes = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.exclude.sources)
|
||||
|
||||
xunit_test_lib = $(PROFILE)_$(ASSEMBLY:$(ASSEMBLY_EXT)=_xunit-test.dll)
|
||||
xtest_lib_output = $(test_lib_dir)/$(xunit_test_lib)
|
||||
|
||||
xtest_response = $(depsdir)/$(xunit_test_lib).response
|
||||
xtest_makefrag = $(depsdir)/$(xunit_test_lib).makefrag
|
||||
@@ -104,7 +85,7 @@ xtest_flags = -r:$(the_assembly) $(xunit_libs_ref) $(XTEST_MCS_FLAGS) $(XTEST_LI
|
||||
|
||||
ifeq ($(wildcard $(xtest_sourcefile)),)
|
||||
xtest_sourcefile = $(ASSEMBLY:$(ASSEMBLY_EXT)=_xtest.dll.sources)
|
||||
tests_CLEAN_FILES += $(xtest_lib_output) $(xtest_response) $(xtest_makefrag)
|
||||
tests_CLEAN_FILES += $(xunit_test_lib) $(xtest_response) $(xtest_makefrag)
|
||||
endif
|
||||
|
||||
ifndef HAVE_CS_TESTS
|
||||
@@ -131,6 +112,10 @@ endif
|
||||
|
||||
test_assemblies :=
|
||||
|
||||
test_lib_dir = $(topdir)/class/lib/$(PROFILE)/tests
|
||||
|
||||
test_lib_output = $(topdir)/class/lib/$(PROFILE)/tests/$(test_lib)
|
||||
|
||||
ifdef HAVE_CS_TESTS
|
||||
test_assemblies += $(test_lib_output)
|
||||
|
||||
@@ -176,20 +161,14 @@ endif
|
||||
|
||||
NUNITLITE_CONFIG_FILE=$(topdir)/class/lib/$(PROFILE)/$(PARENT_PROFILE)nunit-lite-console.exe.config
|
||||
|
||||
$(test_lib_output).nunitlite.config: $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(TEST_NUNITLITE_APP_CONFIG_GLOBAL) $(TEST_NUNITLITE_APP_CONFIG_RUNTIME) $(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL) | $(test_lib_dir)
|
||||
cp -f $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(test_lib_output).nunitlite.config
|
||||
patch-nunitlite-appconfig:
|
||||
cp -f $(topdir)/tools/nunit-lite/nunit-lite-console/nunit-lite-console.exe.config.tmpl $(NUNITLITE_CONFIG_FILE)
|
||||
ifdef TEST_NUNITLITE_APP_CONFIG_GLOBAL
|
||||
sed -i -e "/__INSERT_CUSTOM_APP_CONFIG_GLOBAL__/r $(TEST_NUNITLITE_APP_CONFIG_GLOBAL)" $(test_lib_output).nunitlite.config
|
||||
sed -i -e "/__INSERT_CUSTOM_APP_CONFIG_GLOBAL__/r $(TEST_NUNITLITE_APP_CONFIG_GLOBAL)" $(NUNITLITE_CONFIG_FILE)
|
||||
endif
|
||||
ifdef TEST_NUNITLITE_APP_CONFIG_RUNTIME
|
||||
sed -i -e "/__INSERT_CUSTOM_APP_CONFIG_RUNTIME__/r $(TEST_NUNITLITE_APP_CONFIG_RUNTIME)" $(test_lib_output).nunitlite.config
|
||||
sed -i -e "/__INSERT_CUSTOM_APP_CONFIG_RUNTIME__/r $(TEST_NUNITLITE_APP_CONFIG_RUNTIME)" $(NUNITLITE_CONFIG_FILE)
|
||||
endif
|
||||
ifdef TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL
|
||||
cp -f $(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL) $(test_lib_output).nunitlite.config.$(TEST_NUNITLITE_APP_CONFIG_SUPPLEMENTAL)
|
||||
endif
|
||||
|
||||
copy-nunitlite-appconfig: $(test_lib_output).nunitlite.config
|
||||
cp -f $(test_lib_output).nunitlite.config $(NUNITLITE_CONFIG_FILE)
|
||||
|
||||
ifdef PLATFORM_AOT_SUFFIX
|
||||
|
||||
@@ -235,10 +214,10 @@ TEST_HARNESS_EXEC=$(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(TEST_COVERAGE_FLAGS) $
|
||||
endif
|
||||
|
||||
## FIXME: i18n problem in the 'sed' command below
|
||||
run-test-lib: test-local test-local-aot-compile copy-nunitlite-appconfig
|
||||
run-test-lib: test-local test-local-aot-compile patch-nunitlite-appconfig
|
||||
ok=:; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" DBG_RUNTIME_ARGS="$(TEST_RUNTIME_FLAGS)" $(TEST_HARNESS_EXEC) $(test_assemblies) $(NOSHADOW_FLAG) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(LABELS_ARG) -format:nunit2 -result:TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \
|
||||
if [ ! -f "TestResult-$(PROFILE).xml" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='bcl-tests' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='$(strip $(test_assemblies))' success='False' time='0'><results><test-case name='$(notdir $(strip $(test_assemblies))).crash' executed='True' success='False' time='0'><failure><message>The test runner didn't produce a test result XML, probably due to a crash of the runtime. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-$(PROFILE).xml; fi; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" MONO_TESTS_IN_PROGRESS="yes" $(TEST_HARNESS_EXEC) $(test_assemblies) $(NOSHADOW_FLAG) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(LABELS_ARG) -format:nunit2 -result:TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \
|
||||
if [ ! -f "TestResult-$(PROFILE).xml" ]; then echo "<?xml version='1.0' encoding='utf-8'?><test-results failures='1' total='1' not-run='0' name='bcl-tests' date='$$(date +%F)' time='$$(date +%T)'><test-suite name='$(strip $(test_assemblies))' success='False' time='0'><results><test-case name='crash' executed='True' success='False' time='0'><failure><message>The test runner didn't produce a test result XML, probably due to a crash of the runtime. Check the log for more details.</message><stack-trace></stack-trace></failure></test-case></results></test-suite></test-results>" > TestResult-$(PROFILE).xml; fi; \
|
||||
$$ok
|
||||
|
||||
## Instructs compiler to compile to target .net execution, it can be usefull in rare cases when runtime detection is not possible
|
||||
@@ -262,25 +241,15 @@ ifdef HAVE_CS_TESTS
|
||||
$(test_lib_dir):
|
||||
mkdir -p $@
|
||||
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_output).nunitlite.config | $(test_lib_dir)
|
||||
$(test_lib_output): $(test_assembly_dep) $(test_response) $(test_nunit_dep) $(test_lib_dir)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) -target:library -out:$@ $(test_flags) $(LOCAL_TEST_COMPILER_ONDOTNET_FLAGS) @$(test_response)
|
||||
|
||||
test_response_preprocessed = $(test_response)_preprocessed
|
||||
|
||||
ifneq "x" "x$(PROFILE_RUNTIME)"
|
||||
GENSOURCES_RUNTIME=$(PROFILE_RUNTIME)
|
||||
else
|
||||
ifneq "x" "x$(TEST_RUNTIME)"
|
||||
GENSOURCES_RUNTIME=$(TEST_RUNTIME)
|
||||
else
|
||||
GENSOURCES_RUNTIME=MONO_PATH="$(GENSOURCES_LIBDIR)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME)
|
||||
endif
|
||||
endif
|
||||
|
||||
# This handles .excludes/.sources pairs, as well as resolving the
|
||||
# includes that occur in .sources files
|
||||
$(test_response_preprocessed): $(test_sourcefile) $(wildcard $(test_sourcefile_excludes)) $(GENSOURCES_CS)
|
||||
$(GENSOURCES_RUNTIME) --debug $(GENSOURCES_EXE) --basedir:./Test --strict "$@" "$(test_sourcefile)" "$(test_sourcefile_excludes)"
|
||||
$(test_response_preprocessed): $(test_sourcefile) $(wildcard $(test_sourcefile_excludes))
|
||||
$(SHELL) $(topdir)/build/gensources.sh $@ '$(test_sourcefile)' '$(test_sourcefile_excludes)'
|
||||
|
||||
$(test_response): $(test_response_preprocessed)
|
||||
# @echo Creating $@ ...
|
||||
@@ -302,14 +271,8 @@ ifdef HAVE_CS_XTESTS
|
||||
|
||||
XTEST_HARNESS_PATH := $(topdir)/../external/xunit-binaries
|
||||
XTEST_HARNESS = $(XTEST_HARNESS_PATH)/xunit.console.exe
|
||||
XTEST_RESULT_FILE := TestResult-$(PROFILE)-xunit.xml
|
||||
XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit $(XTEST_RESULT_FILE)
|
||||
XTEST_HARNESS_FLAGS := -noappdomain -noshadow -parallel none -nunit TestResult-$(PROFILE)-xunit.xml
|
||||
XTEST_TRAIT := -notrait category=failing -notrait category=nonmonotests -notrait Benchmark=true -notrait category=outerloop
|
||||
# The logic is double inverted so this actually excludes tests not intented for current platform
|
||||
# best to search for `property name="category"` in the xml output to see what's going on
|
||||
# https://github.com/dotnet/buildtools/blob/master/src/xunit.netcore.extensions/Discoverers/PlatformSpecificDiscoverer.cs
|
||||
XTEST_TRAIT_PLATFORM := -notrait category=non$(XTEST_PLATFORM)tests
|
||||
|
||||
TEST_MONO_PATH := $(TEST_MONO_PATH)$(PLATFORM_PATH_SEPARATOR)$(XTEST_HARNESS_PATH)
|
||||
|
||||
ifdef FIXTURE
|
||||
@@ -325,35 +288,34 @@ XTEST_COVERAGE_FLAGS = -O=-aot --profile=coverage:output=$(topdir)/class/lib/$(P
|
||||
endif
|
||||
|
||||
check: run-xunit-test-local
|
||||
xunit-test-local: $(xtest_lib_output)
|
||||
xunit-test-local: $(xunit_test_lib)
|
||||
run-xunit-test-local: run-xunit-test-lib
|
||||
|
||||
# cp -rf is a HACK for xunit runner to require xunit.execution.dOTNET.dll file in local folder on .net only
|
||||
run-xunit-test-lib: xunit-test-local
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.dotnet.dll $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
# cp -rf is a HACK for xunit runner to require xunit.execution.desktop.dll file in local folder on .net only
|
||||
run-xunit-test-lib: xunit-test-local $(XTEST_REMOTE_EXECUTOR)
|
||||
@cp -rf $(XTEST_HARNESS_PATH)/xunit.execution.desktop.dll xunit.execution.desktop.dll
|
||||
ok=:; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR="$(XTEST_REMOTE_EXECUTOR_ABSPATH)" $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xtest_lib_output) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) $(XTEST_TRAIT_PLATFORM) || ok=false; \
|
||||
if [ -n "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE" ]; then echo "$(abspath $(XTEST_RESULT_FILE))" >> "$$MONO_BABYSITTER_NUNIT_XML_LIST_FILE"; fi; \
|
||||
PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" REMOTE_EXECUTOR=$(XTEST_REMOTE_EXECUTOR) $(TEST_RUNTIME) $(TEST_RUNTIME_FLAGS) $(XTEST_COVERAGE_FLAGS) $(AOT_RUN_FLAGS) $(XTEST_HARNESS) $(xunit_test_lib) $(XTEST_HARNESS_FLAGS) $(XTEST_TRAIT) || ok=false; \
|
||||
$$ok
|
||||
@rm -f $(test_lib_dir)/xunit.execution.dotnet.dll
|
||||
@rm -f xunit.execution.desktop.dll
|
||||
|
||||
# Some xunit tests want to be executed in a separate process (see RemoteExecutorTestBase)
|
||||
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs | $(test_lib_dir)
|
||||
$(XTEST_REMOTE_EXECUTOR): $(topdir)/../external/corefx/src/Common/tests/System/Diagnostics/RemoteExecutorConsoleApp/RemoteExecutorConsoleApp.cs
|
||||
$(TEST_COMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll $< -out:$@
|
||||
|
||||
$(xtest_lib_output): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src) $(XTEST_REMOTE_EXECUTOR) | $(test_lib_dir)
|
||||
$(xunit_test_lib): $(the_assembly) $(xtest_response) $(xunit_libs_dep) $(xunit_src)
|
||||
$(TEST_COMPILE) $(LIBRARY_FLAGS) $(XTEST_LIB_FLAGS) -target:library -out:$@ $(xtest_flags) @$(xtest_response) $(xunit_src)
|
||||
|
||||
xtest_response_preprocessed = $(xtest_response)_preprocessed
|
||||
|
||||
# This handles .excludes/.sources pairs, as well as resolving the
|
||||
# includes that occur in .sources files
|
||||
$(xtest_response): $(xtest_sourcefile) $(wildcard *xtest.dll.sources) $(wildcard $(xtest_sourcefile_excludes)) $(GENSOURCES_CS)
|
||||
$(GENSOURCES_RUNTIME) --debug $(GENSOURCES_EXE) --strict "$@" "$(xtest_sourcefile)" "$(xtest_sourcefile_excludes)"
|
||||
$(xtest_response): $(xtest_sourcefile) $(wildcard $(xtest_sourcefile_excludes))
|
||||
$(SHELL) $(topdir)/build/gensources.sh $@ '$(xtest_sourcefile)' '$(xtest_sourcefile_excludes)'
|
||||
|
||||
$(xtest_makefrag): $(xtest_response)
|
||||
@echo Creating $@ ...
|
||||
@sed 's,^,$(xtest_lib_output): ,' $< >$@
|
||||
@sed 's,^,$(xunit_test_lib): ,' $< >$@
|
||||
|
||||
-include $(xtest_makefrag)
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{2CFDD4F5-4B13-4FF4-A421-0361F2FC825F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
@@ -19,16 +18,16 @@
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
@@ -43,22 +42,13 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<!-- @COMMON_SOURCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="Accessibility\IAccessible.cs" />
|
||||
<Compile Include="Accessibility\IAccessibleHandler.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
|
||||
<Name>genconsts</Name>
|
||||
<Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<!-- @COMMON_PROJECT_REFERENCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
@@ -66,10 +56,4 @@
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{79381DFE-F13A-4A37-9A89-6640702D46E3}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
@@ -19,16 +18,16 @@
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../mono.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
@@ -43,12 +42,8 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @COMMON_SOURCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
|
||||
</ItemGroup>
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
@@ -88,22 +83,8 @@
|
||||
<Compile Include="Commons.Xml.Relaxng\RelaxngValidatingReader.cs" />
|
||||
<Compile Include="Commons.Xml.Relaxng\XsdDatatypeProvider.cs" />
|
||||
<Compile Include="Commons.Xml\XmlDefaultReader.cs" />
|
||||
<ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
|
||||
<Name>genconsts</Name>
|
||||
<Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="$(SolutionDir)\mcs\jay\jay.vcxproj">
|
||||
<Name>jay</Name>
|
||||
<Project>{5d485d32-3b9f-4287-ab24-c8da5b89f537}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
<Compile Include="Commons.Xml.Relaxng.Rnc\RncParser.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<!-- @COMMON_PROJECT_REFERENCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
@@ -118,12 +99,6 @@
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">$(ProjectDir)\..\..\jay\jay -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">$(ProjectDir)\..\..\jay\jay.exe -ct < $(ProjectDir)\..\..\jay\skeleton.cs $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.jay > $(ProjectDir)\Commons.Xml.Relaxng.Rnc\RncParser.cs</PreBuildEvent>
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
../../test-helpers/TestResourceHelper.cs
|
||||
RdpPatternTests.cs
|
||||
RelaxngDatatypeProviderTests.cs
|
||||
RelaxngReaderTests.cs
|
||||
|
||||
@@ -11,20 +11,15 @@ LIB_REFS = System System.Xml
|
||||
KEYFILE = ../mono.pub
|
||||
LIB_MCS_FLAGS = \
|
||||
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
|
||||
|
||||
TEST_RESOURCE_FILES = \
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
EXTRA_DISTFILES = \
|
||||
Commons.Xml.Relaxng.Rnc/RncParser.jay \
|
||||
$(wildcard Test/XmlFiles/*.rng) \
|
||||
$(wildcard Test/XmlFiles/*.rnc) \
|
||||
$(wildcard Test/XmlFiles/*.nvdl) \
|
||||
$(wildcard Test/XmlFiles/*.xml)
|
||||
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169 $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
|
||||
|
||||
EXTRA_DISTFILES = \
|
||||
Commons.Xml.Relaxng.Rnc/RncParser.jay \
|
||||
$(wildcard Test/XmlFiles/*.xml) \
|
||||
$(wildcard Test/standalone_tests/*.cs) \
|
||||
$(RESOURCE_FILES) \
|
||||
$(TEST_RESOURCE_FILES)
|
||||
$(RESOURCE_FILES)
|
||||
|
||||
Commons.Xml.Relaxng.Rnc/RncParser.cs: Commons.Xml.Relaxng.Rnc/RncParser.jay $(topdir)/jay/skeleton.cs
|
||||
$(topdir)/jay/jay -ctv -o Commons.Xml.Relaxng.Rnc/RncParser.cs $< < $(topdir)/jay/skeleton.cs
|
||||
|
||||
@@ -13,8 +13,6 @@ using System.Xml;
|
||||
using Commons.Xml.Nvdl;
|
||||
using NUnit.Framework;
|
||||
|
||||
using MonoTests.Helpers;
|
||||
|
||||
namespace MonoTests.Commons.Xml.Relaxng
|
||||
{
|
||||
[TestFixture]
|
||||
@@ -23,7 +21,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void ReadNvdlNvdl ()
|
||||
{
|
||||
using (TextReader r = File.OpenText (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/nvdl.nvdl"))) {
|
||||
using (TextReader r = File.OpenText ("Test/XmlFiles/nvdl.nvdl")) {
|
||||
NvdlRules rules = NvdlReader.Read (
|
||||
new XmlTextReader (r));
|
||||
}
|
||||
@@ -33,7 +31,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
public void ValidateNvdlNvdl ()
|
||||
{
|
||||
NvdlRules rules = null;
|
||||
string path = TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/nvdl.nvdl");
|
||||
string path = "Test/XmlFiles/nvdl.nvdl";
|
||||
using (TextReader r = File.OpenText (path)) {
|
||||
rules = NvdlReader.Read (
|
||||
new XmlTextReader (path, r));
|
||||
|
||||
@@ -12,8 +12,6 @@ using Commons.Xml.Relaxng;
|
||||
using Commons.Xml.Relaxng.XmlSchema;
|
||||
using NUnit.Framework;
|
||||
|
||||
using MonoTests.Helpers;
|
||||
|
||||
namespace MonoTests.Commons.Xml.Relaxng
|
||||
{
|
||||
[TestFixture]
|
||||
@@ -25,7 +23,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
var datatypeLibrary = SetupMyDataProvider ();
|
||||
XmlDocument xml = new XmlDocument ();
|
||||
xml.LoadXml ("<root> <v1>mytype</v1> <v2>1</v2> </root>");
|
||||
XmlDocument schemaXml = ReadDoc (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/463264.rng"));
|
||||
XmlDocument schemaXml = ReadDoc ("Test/XmlFiles/463264.rng");
|
||||
XmlReader reader = new RelaxngValidatingReader (new XmlNodeReader (xml), new XmlNodeReader (schemaXml), datatypeLibrary);
|
||||
while (reader.Read ())
|
||||
;
|
||||
@@ -37,7 +35,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
var datatypeLibrary = SetupMyDataProvider ();
|
||||
XmlDocument xml = new XmlDocument ();
|
||||
xml.LoadXml ("<root> <v2>1</v2> <v1>mytype</v1> </root>");
|
||||
XmlDocument schemaXml = ReadDoc (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/463267.rng"));
|
||||
XmlDocument schemaXml = ReadDoc ("Test/XmlFiles/463267.rng");
|
||||
XmlReader reader = new RelaxngValidatingReader (new XmlNodeReader (xml), new XmlNodeReader (schemaXml), datatypeLibrary);
|
||||
while (reader.Read ())
|
||||
;
|
||||
|
||||
@@ -13,8 +13,6 @@ using System.Xml;
|
||||
using Commons.Xml.Relaxng;
|
||||
using NUnit.Framework;
|
||||
|
||||
using MonoTests.Helpers;
|
||||
|
||||
namespace MonoTests.Commons.Xml.Relaxng
|
||||
{
|
||||
[TestFixture]
|
||||
@@ -35,7 +33,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void SimpleRead ()
|
||||
{
|
||||
loadGrammarFromUrl (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/SimpleElementPattern1.rng"));
|
||||
loadGrammarFromUrl ("Test/XmlFiles/SimpleElementPattern1.rng");
|
||||
RelaxngPattern p = reader.ReadPattern ();
|
||||
|
||||
Assert.AreEqual (RelaxngPatternType.Element, p.PatternType);
|
||||
@@ -44,7 +42,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void CompileRelaxngGrammar ()
|
||||
{
|
||||
loadGrammarFromUrl (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/relaxng.rng"));
|
||||
loadGrammarFromUrl ("Test/XmlFiles/relaxng.rng");
|
||||
RelaxngPattern p = reader.ReadPattern ();
|
||||
|
||||
Assert.AreEqual (RelaxngPatternType.Grammar, p.PatternType);
|
||||
|
||||
@@ -14,7 +14,6 @@ using Commons.Xml.Relaxng;
|
||||
using NUnit.Framework;
|
||||
|
||||
using RVR = Commons.Xml.Relaxng.RelaxngValidatingReader;
|
||||
using MonoTests.Helpers;
|
||||
|
||||
namespace MonoTests.Commons.Xml.Relaxng
|
||||
{
|
||||
@@ -46,8 +45,8 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void SimpleElementPattern1 ()
|
||||
{
|
||||
SetupReaderFromUrl (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/SimpleElementPattern1.xml"),
|
||||
TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/SimpleElementPattern1.rng"));
|
||||
SetupReaderFromUrl ("Test/XmlFiles/SimpleElementPattern1.xml",
|
||||
"Test/XmlFiles/SimpleElementPattern1.rng");
|
||||
|
||||
while (!reader.EOF)
|
||||
reader.Read ();
|
||||
@@ -56,8 +55,8 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void SimpleElementPattern2 ()
|
||||
{
|
||||
SetupReaderFromUrl (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/SimpleElementPattern2.xml"),
|
||||
TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/SimpleElementPattern2.rng"));
|
||||
SetupReaderFromUrl ("Test/XmlFiles/SimpleElementPattern2.xml",
|
||||
"Test/XmlFiles/SimpleElementPattern2.rng");
|
||||
|
||||
while (!reader.EOF)
|
||||
reader.Read ();
|
||||
@@ -66,7 +65,7 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void ReadPracticalSample1 ()
|
||||
{
|
||||
SetupReaderFromUrl (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/team.xml"), TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/team.rng"));
|
||||
SetupReaderFromUrl ("Test/XmlFiles/team.xml", "Test/XmlFiles/team.rng");
|
||||
while (!reader.EOF)
|
||||
reader.Read ();
|
||||
}
|
||||
@@ -76,8 +75,8 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
{
|
||||
// validate relaxng.rng with relaxng.rng
|
||||
RVR r = new RVR (
|
||||
new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/relaxng.rng")),
|
||||
new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/relaxng.rng")));
|
||||
new XmlTextReader ("Test/XmlFiles/relaxng.rng"),
|
||||
new XmlTextReader ("Test/XmlFiles/relaxng.rng"));
|
||||
while (!r.EOF)
|
||||
r.Read ();
|
||||
}
|
||||
|
||||
@@ -15,8 +15,6 @@ using Commons.Xml.Relaxng;
|
||||
using Commons.Xml.Relaxng.Rnc;
|
||||
using NUnit.Framework;
|
||||
|
||||
using MonoTests.Helpers;
|
||||
|
||||
namespace MonoTests.Commons.Xml.Relaxng
|
||||
{
|
||||
[TestFixture]
|
||||
@@ -45,19 +43,19 @@ namespace MonoTests.Commons.Xml.Relaxng
|
||||
[Test]
|
||||
public void TestRelaxngRnc ()
|
||||
{
|
||||
Compile (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/relaxng.rnc"));
|
||||
Compile ("Test/XmlFiles/relaxng.rnc");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestAtomRnc ()
|
||||
{
|
||||
Compile (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/atom.rnc"));
|
||||
Compile ("Test/XmlFiles/atom.rnc");
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void TestInfocardRnc ()
|
||||
{
|
||||
Compile (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc"));
|
||||
Compile ("Test/XmlFiles/schemas-xmlsoap-or-ws-2005-05-identity.rnc");
|
||||
}
|
||||
|
||||
[Test]
|
||||
@@ -87,8 +85,8 @@ start = mine";
|
||||
[Test]
|
||||
public void InheritDefaultNamespace ()
|
||||
{
|
||||
RelaxngPattern g = Compile (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/include-default-namespace.rnc"));
|
||||
XmlReader xtr = new XmlTextReader (TestResourceHelper.GetFullPathOfResource ("Test/XmlFiles/include-default-namespace.xml"));
|
||||
RelaxngPattern g = Compile ("Test/XmlFiles/include-default-namespace.rnc");
|
||||
XmlReader xtr = new XmlTextReader ("Test/XmlFiles/include-default-namespace.xml");
|
||||
RelaxngValidatingReader r = new RelaxngValidatingReader (xtr, g);
|
||||
try {
|
||||
while (!r.EOF)
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{546B21E5-FB99-44A5-8721-2D672FBCD7FF}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
@@ -19,16 +18,16 @@
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
@@ -43,9 +42,8 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<!-- @COMMON_SOURCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
|
||||
@@ -53,15 +51,7 @@
|
||||
<Compile Include="Microsoft.CSharp\Compiler.cs" />
|
||||
<Compile Include="Microsoft.CSharp\CompilerError.cs" />
|
||||
<Compile Include="Microsoft.CSharp\ErrorLevel.cs" />
|
||||
<ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
|
||||
<Name>genconsts</Name>
|
||||
<Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<!-- @COMMON_PROJECT_REFERENCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
@@ -70,10 +60,4 @@
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{FC00125C-BEA1-4A1E-A463-6070352602CD}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
@@ -19,16 +18,16 @@
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<AssemblyOriginatorKeyFile>../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../class/lib/net_4_x-$(HostPlatform)</OutputPath>
|
||||
<IntermediateOutputPath>./../../class/obj/$(AssemblyName)-net_4_x-$(HostPlatform)</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
@@ -43,26 +42,17 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<!-- @COMMON_SOURCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<Compile Include="..\..\build\common\Consts.cs" />
|
||||
<Compile Include="..\..\build\common\Locale.cs" />
|
||||
<Compile Include="..\..\build\common\MonoTODOAttribute.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
|
||||
<Compile Include="System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
|
||||
<Compile Include="System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
|
||||
<Compile Include="System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
|
||||
<ProjectReference Include="$(SolutionDir)\msvc\scripts\genconsts.csproj">
|
||||
<Name>genconsts</Name>
|
||||
<Project>{702AE2C0-71DD-4112-9A06-E4FABCA59986}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
<Private>false</Private>
|
||||
</ProjectReference>
|
||||
<Compile Include=".\Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumerableToDispatchMarshaler.cs" />
|
||||
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\EnumeratorToEnumVariantMarshaler.cs" />
|
||||
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\ExpandoToDispatchExMarshaler.cs" />
|
||||
<Compile Include=".\System.Runtime.InteropServices.CustomMarshalers\TypeToTypeInfoMarshaler.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<!-- @COMMON_PROJECT_REFERENCES@ -->
|
||||
<ItemGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
@@ -71,10 +61,4 @@
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -37,9 +37,9 @@ doc-update-local:
|
||||
doc-update-recursive:
|
||||
@echo "do not recurse the Facades folder"
|
||||
|
||||
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.Xml \
|
||||
System System.Core System.ComponentModel.DataAnnotations System.Numerics System.Numerics.Vectors System.Runtime.Serialization System.Transactions System.XML \
|
||||
System.ComponentModel.Composition System.ServiceModel System.Xml.Linq System.Data System.IO.Compression.FileSystem System.Runtime.InteropServices.RuntimeInformation \
|
||||
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression System.IdentityModel \
|
||||
System.ServiceProcess System.Security System.Net.Http.WebRequest System.Net.Http System.ServiceProcess System.IO.Compression \
|
||||
System.Web.Services:
|
||||
|
||||
all-local-aot:
|
||||
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{FADE0AB0-B7B9-4909-B4AD-38ABE84E183A}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{ECD1D1FD-CEBA-4282-989B-EE031A809F2C}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,31 +93,16 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\..\external\corefx\src\Microsoft.Win32.Registry.AccessControl\src\Microsoft\Win32\RegistryAclExtensions.cs" />
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{21811072-CC82-465D-B8D7-DA89A63024F9}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{E21E6C69-5A3D-44A3-BCB1-CDE08786CB41}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,117 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- WARNING: this file is autogenerated, don't modify it. Edit the .sources file of the corresponding assembly instead if you want to add/remove C# source files. -->
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{CA080440-700C-46F4-B8F9-56D2507909D3}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<LangVersion>latest</LangVersion>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Windows_NT'">win32</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix' and $([System.IO.File]::Exists('/usr/lib/libc.dylib'))">darwin</HostPlatform>
|
||||
<HostPlatform Condition=" '$(HostPlatform)' == '' and '$(OS)' == 'Unix'">linux</HostPlatform>
|
||||
<GenerateTargetFrameworkAttribute>false</GenerateTargetFrameworkAttribute>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
<AssemblyName>System.Buffers</AssemblyName>
|
||||
<TargetFrameworkVersion>v2.1</TargetFrameworkVersion>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../Open.snk</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;MOBILE_DYNAMIC;MONODROID;ANDROID</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_watch' ">
|
||||
<OutputPath>./../../../class/lib/monotouch_watch/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;FEATURE_NO_BSD_SOCKETS;MONOTOUCH_WATCH</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monotouch_tv' ">
|
||||
<OutputPath>./../../../class/lib/monotouch_tv/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM;WIN_PLATFORM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac' ">
|
||||
<OutputPath>./../../../class/lib/xammac/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'orbis' ">
|
||||
<OutputPath>./../../../class/lib/orbis/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;ORBIS;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'unreal' ">
|
||||
<OutputPath>./../../../class/lib/unreal/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;MOBILE;MOBILE_DYNAMIC;NET_3_5;NET_4_0;NET_4_5;MONO</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'wasm' ">
|
||||
<OutputPath>./../../../class/lib/wasm/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;WASM;DISABLE_REMOTING;DISABLE_COM;FEATURE_NO_BSD_SOCKETS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<!-- @ALL_PROFILE_PROPERTIES@ -->
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<!-- TRACE is set only for Debug configuration, so inherit from platform-specific value -->
|
||||
<DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,24 +0,0 @@
|
||||
MCS_BUILD_DIR = ../../../build
|
||||
|
||||
thisdir = class/Facades/System.Buffers
|
||||
SUBDIRS =
|
||||
include $(MCS_BUILD_DIR)/rules.make
|
||||
|
||||
LIBRARY_SUBDIR = Facades
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
|
||||
|
||||
LIBRARY = System.Buffers.dll
|
||||
|
||||
KEYFILE = ../../Open.snk
|
||||
LIBRARY_SNK = $(KEYFILE)
|
||||
SIGN_FLAGS = /delaysign /nowarn:1616,1699
|
||||
LIB_REFS =
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS)
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
NO_TEST = yes
|
||||
|
||||
include $(MCS_BUILD_DIR)/library.make
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
TypeForwarders.cs
|
||||
AssemblyInfo.cs
|
||||
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{DE0D7286-1F09-4ACC-BC43-75342349FFC1}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{42696DB3-E1FA-4C6E-BB9B-8930CD563933}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{C5EC0603-74A8-450A-9EE2-AEBCC964134E}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{758C73D3-F04B-40BD-B55B-057F529053CA}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,31 +93,16 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../System.Core/System.Core.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{FDD583A9-F7AB-49E2-8B0C-B3B6C24EC3C1}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System.ComponentModel.DataAnnotations/System.ComponentModel.DataAnnotations.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{71D3A7F4-7774-4421-9DF1-FFB719F0DDA7}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{A2DA9A58-AE3F-41A4-8C1F-55E65244EB1B}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
+5
-26
@@ -3,7 +3,6 @@
|
||||
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">net_4_x</Platform>
|
||||
<ProjectGuid>{4C5EAC63-07DF-41DF-8CF5-40FDA68845D9}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
@@ -20,16 +19,16 @@
|
||||
<DelaySign>true</DelaySign>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<PropertyGroup>
|
||||
<!-- Set AddAdditionalExplicitAssemblyReferences to false, otherwise if targetting .NET4.0,
|
||||
Microsoft.NETFramework.props will force a dependency on the assembly System.Core. This
|
||||
is a problem to compile the Mono mscorlib.dll -->
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'net_4_x' ">
|
||||
<OutputPath>./../../../class/lib/net_4_x-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM</DefineConstants>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;WIN_PLATFORM;MULTIPLEX_OS</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'monodroid' ">
|
||||
<OutputPath>./../../../class/lib/monodroid/Facades</OutputPath>
|
||||
@@ -51,11 +50,6 @@
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MOBILE;MOBILE_LEGACY;MONO;MONOTOUCH;DISABLE_REMOTING;DISABLE_COM;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;FULL_AOT_RUNTIME;MONOTOUCH_TV</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<OutputPath>./../../../class/lib/testing_aot_full/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_LEGACY;FULL_AOT_DESKTOP;FULL_AOT_RUNTIME;DISABLE_REMOTING;DISABLE_COM</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'winaot' ">
|
||||
<OutputPath>./../../../class/lib/winaot/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
@@ -67,7 +61,7 @@
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_2_1;NET_3_5;NET_4_0;NET_4_5;MONO;MOBILE;MOBILE_DYNAMIC;XAMMAC;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Platform)' == 'xammac_net_4_5' ">
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5/Facades</OutputPath>
|
||||
<OutputPath>./../../../class/lib/xammac_net_4_5-$(HostPlatform)/Facades</OutputPath>
|
||||
<IntermediateOutputPath>./../../../class/obj/$(AssemblyName)-Facades</IntermediateOutputPath>
|
||||
<DefineConstants>NET_4_0;NET_4_5;NET_4_6;MONO;FEATURE_INTERCEPTABLE_THREADPOOL_CALLBACK;NO_SYSTEM_DRAWING_DEPENDENCY;NO_WINFORMS_DEPENDENCY;NO_SYSTEM_WEB_DEPENDENCY;XAMMAC_4_5;XAMARIN_MODERN</DefineConstants>
|
||||
</PropertyGroup>
|
||||
@@ -99,30 +93,15 @@
|
||||
<Optimize>true</Optimize>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- @BUILT_SOURCES@ -->
|
||||
<!--Common files-->
|
||||
<ItemGroup>
|
||||
<Compile Include="AssemblyInfo.cs" />
|
||||
<Compile Include="TypeForwarders.cs" />
|
||||
</ItemGroup>
|
||||
<!--End of common files-->
|
||||
<!-- @ALL_SOURCES@ -->
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../../System/System.csproj" />
|
||||
<ProjectReference Include="../../corlib/corlib.csproj" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(Platform)' == 'testing_aot_full' ">
|
||||
<Reference Include="nunitlite">
|
||||
<HintPath>..\lib\testing_aot_full\nunitlite.dll</HintPath>
|
||||
<Private>False</Private>
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
<!-- @ALL_REFERENCES@ -->
|
||||
<!-- @ALL_RESOURCES@ -->
|
||||
<PropertyGroup>
|
||||
<!-- Force the pre-build event to run after references have been resolved. The default
|
||||
behavior is to run them before resolving references, which can cause things like
|
||||
culevel.exe to be used before they have been built. -->
|
||||
<PreBuildEventDependsOn>ResolveReferences</PreBuildEventDependsOn>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
Loaded 100 of 3111 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user