mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 01:41:18 -10:00
Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
974943dcf9 | ||
|
|
d4c52c0ae0 | ||
|
|
8fe6c1d0d1 | ||
|
|
f131d0cf61 | ||
|
|
4538e3e0f2 | ||
|
|
615fa21dcc | ||
|
|
b389278fcb | ||
|
|
0690ce6405 | ||
|
|
e851dde346 | ||
|
|
cbe8767979 | ||
|
|
8f1e376d7e | ||
|
|
db5eb9ff5a |
No files matched your search
+2
-5
@@ -109,10 +109,6 @@ GRTAGS
|
||||
GSYMS
|
||||
GTAGS
|
||||
|
||||
# Doxygen
|
||||
docs/doxygen*
|
||||
docs/perlmod*
|
||||
|
||||
|
||||
##############################################################################
|
||||
# Mono-specific patterns
|
||||
@@ -122,6 +118,7 @@ docs/perlmod*
|
||||
compile
|
||||
mono.h
|
||||
mono-*.tar.*
|
||||
mono.spec
|
||||
mono-core.spec
|
||||
tmpinst-dir.stamp
|
||||
msvc/scripts/inputs/
|
||||
|
||||
+4
-1
@@ -10,6 +10,9 @@
|
||||
[submodule "external/debian-snapshot"]
|
||||
path = external/debian-snapshot
|
||||
url = git://github.com/directhex/mono-snapshot.git
|
||||
[submodule "external/entityframework"]
|
||||
path = external/entityframework
|
||||
url = git://github.com/mono/entityframework.git
|
||||
[submodule "external/rx"]
|
||||
path = external/rx
|
||||
url = git://github.com/mono/rx.git
|
||||
@@ -28,5 +31,5 @@
|
||||
url = git://github.com/mono/referencesource
|
||||
branch = mono
|
||||
[submodule "external/reference-assemblies"]
|
||||
path = external/binary-reference-assemblies
|
||||
path = external/reference-assemblies
|
||||
url = git://github.com/mono/reference-assemblies.git
|
||||
@@ -0,0 +1,3 @@
|
||||
Miguel de Icaza ([email protected])
|
||||
Paolo Molaro ([email protected])
|
||||
Dietmar Maurer ([email protected])
|
||||
@@ -8,8 +8,8 @@ For comments, corrections and updates, please contact [email protected]
|
||||
|
||||
Parts of Mono are dual licensed, they are available to the
|
||||
public in GPL or LGPL forms, but we also offer those pieces
|
||||
under commercial terms from Xamarin for the cases where the
|
||||
GPL and the LGPL are not suitable.
|
||||
under commercial terms from Xamarin for the cases wher the GPL
|
||||
and the LGPL are not suitable.
|
||||
|
||||
We have tried to pick the licenses that will maximize adoption
|
||||
of Mono, so we tend to use the MIT X11 or LGPL liceses.
|
||||
|
||||
+3
-1
@@ -36,9 +36,11 @@ EXTRA_DIST= \
|
||||
README.md \
|
||||
LICENSE \
|
||||
autogen.sh \
|
||||
build-mingw32.sh \
|
||||
mkinstalldirs \
|
||||
mono-uninstalled.pc.in \
|
||||
winconfig.h \
|
||||
mono-core.spec \
|
||||
external
|
||||
|
||||
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
|
||||
@@ -50,7 +52,7 @@ dist-hook:
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/reference-assemblies/v4\.0*'`
|
||||
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
|
||||
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
|
||||
# Disable this for now because it is very slow and causes wrench to timeout:
|
||||
|
||||
@@ -1,9 +1,5 @@
|
||||
Mono is a software platform designed to allow developers to easily
|
||||
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.
|
||||
|
||||
[](https://gitter.im/mono/mono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
Mono is a software platform designed to allow developers to easily 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.
|
||||
|
||||
1. [Compilation and Installation](#compilation-and-installation)
|
||||
2. [Using Mono](#using-mono)
|
||||
@@ -11,34 +7,12 @@ standards for C# and the Common Language Runtime.
|
||||
4. [Contributing to Mono](#contributing-to-mono)
|
||||
5. [Reporting bugs](#reporting-bugs)
|
||||
6. [Configuration Options](#configuration-options)
|
||||
7. [Working with Submodules](#working-with-submodules)
|
||||
|
||||
**Build Status**
|
||||
|
||||
Officially supported architectures:
|
||||
|
||||
| debian-amd64 | debian-i386 | debian-armel | debian-armhf | windows-amd64 |
|
||||
|-------------------------|------------------------|-------------------------|-------------------------|---------------------------|
|
||||
| [![debian-amd64][1]][2] | [![debian-i386][3]][4] | [![debian-armel][5]][6] | [![debian-armhf][7]][8] | [![windows-amd64][9]][10] |
|
||||
|
||||
Community supported architectures:
|
||||
|
||||
| centos-s390x |
|
||||
|---------------------------|
|
||||
| [![centos-s390x][11]][12] |
|
||||
|
||||
[1]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/badge/icon
|
||||
[2]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/
|
||||
[3]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/badge/icon
|
||||
[4]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/
|
||||
[5]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/badge/icon
|
||||
[6]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armel/
|
||||
[7]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/badge/icon
|
||||
[8]: http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-armhf/
|
||||
[9]: https://ci.appveyor.com/api/projects/status/1e61ebdfpbiei58v/branch/master?svg=true
|
||||
[10]: https://ci.appveyor.com/project/ajlennon/mono-817/branch/master
|
||||
[11]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=nealef-s390x-1/badge/icon
|
||||
[12]: http://jenkins.mono-project.com/job/test-mono-mainline-communityarchitectures/label=nealef-s390x-1/
|
||||
| debian-amd64 | debian-i386 | centos-s390x | windows-amd64 |
|
||||
|:------------:|:-----------:|:------------:|:-------------:|
|
||||
| [](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-amd64/) | [](http://jenkins.mono-project.com/job/test-mono-mainline/label=debian-i386/) | [](http://jenkins.mono-project.com/job/test-mono-mainline/label=centos-s390x/) | [](https://ci.appveyor.com/project/ajlennon/mono-817/branch/master) |
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@@ -70,7 +44,7 @@ which contains just enough to run the 'mcs' compiler. You do this with:
|
||||
This will download and place the files appropriately so that you can then
|
||||
just run:
|
||||
|
||||
make
|
||||
make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe
|
||||
|
||||
The build will then use the files downloaded by `make get-monolite-latest`.
|
||||
|
||||
@@ -145,50 +119,54 @@ runtime as an embedded library.
|
||||
|
||||
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
|
||||
|
||||
* `../olive/` - Incubation code from [Olive](https://github.com/mono/olive).
|
||||
|
||||
* If the directory ../olive is present (as an
|
||||
independent checkout) from the Mono module, that
|
||||
directory is automatically configured to share the
|
||||
same prefix than this module gets.
|
||||
|
||||
Contributing to Mono
|
||||
====================
|
||||
|
||||
Before submitting changes to Mono, please review the [contribution
|
||||
guidelines](http://www.mono-project.com/community/contributing/).
|
||||
Please pay particular attention to the [Important
|
||||
Rules](http://www.mono-project.com/community/contributing/#important-rules)
|
||||
section.
|
||||
Before submitting changes to Mono, please review the [contribution guidelines](http://www.mono-project.com/community/contributing/).
|
||||
Please pay particular attention to the [Important Rules](http://www.mono-project.com/community/contributing/#important-rules) section.
|
||||
|
||||
Reporting bugs
|
||||
==============
|
||||
|
||||
To submit bug reports, please use [Xamarin's
|
||||
Bugzilla](https://bugzilla.xamarin.com/)
|
||||
To submit bug reports, please use [Xamarin's Bugzilla](https://bugzilla.xamarin.com/)
|
||||
|
||||
Please use the search facility to ensure the same bug hasn't already
|
||||
been submitted and follow our
|
||||
[guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
|
||||
been submitted and follow our [guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
|
||||
on how to make a good bug report.
|
||||
|
||||
Configuration Options
|
||||
=====================
|
||||
|
||||
The following are the configuration options that someone building Mono
|
||||
might want to use:
|
||||
The following are the configuration options that someone
|
||||
building Mono might want to use:
|
||||
|
||||
* `--with-sgen=yes,no` - Generational GC support: Used to enable or
|
||||
disable the compilation of a Mono runtime with the SGen garbage
|
||||
collector.
|
||||
* `--with-sgen=yes,no` - Generational GC support: Used to enable or disable the
|
||||
compilation of a Mono runtime with the SGen garbage collector.
|
||||
|
||||
* On platforms that support it, after building Mono, you will have
|
||||
both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm,
|
||||
while `mono-sgen` uses the Simple Generational GC.
|
||||
both a `mono` binary and a `mono-sgen` binary. `mono` uses Boehm, while
|
||||
`mono-sgen` uses the Simple Generational GC.
|
||||
|
||||
* `--with-gc=[included, boehm, none]` - Selects the default Boehm
|
||||
garbage collector engine to use.
|
||||
* `--with-gc=[included, boehm, none]` - Selects the default Boehm garbage
|
||||
collector engine to use.
|
||||
|
||||
* *included*: (*slighty modified Boehm GC*) This is the default
|
||||
value for the Boehm GC, and it's the most feature complete, it will
|
||||
allow Mono to use typed allocations and support the debugger.
|
||||
* *included*: (*slighty modified Boehm GC*)
|
||||
This is the default value for the Boehm GC, and it's
|
||||
the most feature complete, it will allow Mono
|
||||
to use typed allocations and support the debugger.
|
||||
|
||||
* *boehm*: This is used to use a system-install Boehm GC, it is
|
||||
useful to test new features available in Boehm GC, but we do not
|
||||
recommend that people use this, as it disables a few features.
|
||||
* *boehm*:
|
||||
This is used to use a system-install Boehm GC,
|
||||
it is useful to test new features available in
|
||||
Boehm GC, but we do not recommend that people
|
||||
use this, as it disables a few features.
|
||||
|
||||
* *none*:
|
||||
Disables the inclusion of a garbage collector.
|
||||
@@ -447,53 +425,3 @@ http://code.google.com/p/nativeclient/
|
||||
|
||||
* Currently this is used with Mono's AOT engine as
|
||||
Native Client does not support JIT engines yet.
|
||||
|
||||
Working With Submodules
|
||||
=======================
|
||||
|
||||
Mono references several external git submodules, for example
|
||||
a fork of Microsoft's reference source code that has been altered
|
||||
to be suitable for use with the Mono runtime.
|
||||
|
||||
This section describes how to use it.
|
||||
|
||||
An initial clone should be done recursively so all submodules will also be
|
||||
cloned in a single pass:
|
||||
|
||||
$ git clone --recursive git@github.com:mono/mono
|
||||
|
||||
Once cloned, submodules can be updated to pull down the latest changes.
|
||||
This can also be done after an initial non-recursive clone:
|
||||
|
||||
$ git submodule update --init --recursive
|
||||
|
||||
To pull external changes into a submodule:
|
||||
|
||||
$ cd <submodule>
|
||||
$ git pull origin <branch>
|
||||
$ cd <top-level>
|
||||
$ git add <submodule>
|
||||
$ git commit
|
||||
|
||||
By default, submodules are detached because they point to a specific commit.
|
||||
Use `git checkout` to move back to a branch before making changes:
|
||||
|
||||
$ cd <submodule>
|
||||
$ git checkout <branch>
|
||||
# work as normal; the submodule is a normal repo
|
||||
$ git commit/push new changes to the repo (submodule)
|
||||
|
||||
$ cd <top-level>
|
||||
$ git add <submodule> # this will record the new commits to the submodule
|
||||
$ git commit
|
||||
|
||||
To switch the repo of a submodule (this should not be a common or normal thing
|
||||
to do at all), first edit `.gitmodules` to point to the new location, then:
|
||||
|
||||
$ git submodule sync -- <path of the submodule>
|
||||
$ git submodule update --recursive
|
||||
$ git checkout <desired new hash or branch>
|
||||
|
||||
The desired output diff is a change in `.gitmodules` to reflect the
|
||||
change in the remote URL, and a change in /<submodule> where you see
|
||||
the desired change in the commit hash.
|
||||
+120
@@ -0,0 +1,120 @@
|
||||
README.vsnet Last updated: 2006-02-01
|
||||
|
||||
|
||||
SVN includes a Visual Studio .NET 2005 solution, mono.sln, and some
|
||||
projects files to build most of the unmanaged parts in Mono.
|
||||
|
||||
The "mono.sln" solution file contains the VC projects files for:
|
||||
|
||||
* Embedded Samples
|
||||
* test-invoke.vcproj
|
||||
* test-metadata.vcproj
|
||||
* teste.vcproj
|
||||
* Libraries
|
||||
* libgc.vcproj
|
||||
* libmono.vcproj
|
||||
* Tools
|
||||
* genmdesc.vcproj
|
||||
* monoburg.vcproj
|
||||
* monodiet.vcproj
|
||||
* monodis.vcproj
|
||||
* monograph.vcproj
|
||||
* pedump.vcproj
|
||||
* mono.vcproj
|
||||
|
||||
|
||||
REQUIREMENTS
|
||||
|
||||
* A working (i.e. where you could succesfully build mono) cygwin
|
||||
(http://www.cygwin.com/) setup! This is required to:
|
||||
* generate some files (via monoburg and genmdesc);
|
||||
* build the class libraries; and
|
||||
* test for regressions.
|
||||
|
||||
* Visual Studio .NET 2005. Previous Visual Studio versions may work or
|
||||
requires, hopefully minimal, changes.
|
||||
|
||||
* VSDependencies.zip must be decompressed under the /mono/ directory
|
||||
(otherwise you will need to edit all the projects files). This file can
|
||||
be downloaded from http://www.go-mono.com/archive/VSDependencies.zip
|
||||
|
||||
|
||||
LOCAL CHANGES
|
||||
|
||||
Sadly solution/projects files aren't easy to move from computers to
|
||||
computers (well unless everyone follow the same naming convention) so
|
||||
you'll likely have to changes some options in order to compile the
|
||||
solution.
|
||||
|
||||
* each executed assembly (i.e. the EXE) must be able to find a
|
||||
working mscorlib.dll (and all the other required assemblies).
|
||||
This can be done in different ways. My preference is to use the
|
||||
project "properties pages" in the "Configuration Properties
|
||||
\Debugging\Environment" options and set MONO_PATH to the class
|
||||
libraries directory build by cygwin (local) or on Linux
|
||||
(remote).
|
||||
|
||||
e.g. MONO_PATH=z:\svn\mcs\class\lib\default\
|
||||
allows me to use the class libs build under Linux, while
|
||||
MONO_PATH=C:\cygwin\opt\mono\lib\mono\1.0
|
||||
use the one built from cygwin (after a make install)
|
||||
|
||||
Some useful informations to adapt the solution/project files...
|
||||
|
||||
* My cygwin root dir is: c:\cygwin\
|
||||
* My username is: poupou
|
||||
* My mono install prefix is: /opt/mono
|
||||
|
||||
|
||||
BUILDING
|
||||
|
||||
Once everything is installed (and edited) you can right-click on the
|
||||
"mono" solution (in the "Solution Explorer"), select "Clean
|
||||
Solution" (for the first time) then "Build Solution".
|
||||
|
||||
|
||||
KNOWN ISSUES
|
||||
|
||||
[1] Most, BUT NOT ALL, the regressions tests pass under this build. The
|
||||
failures seems limited to some mathematical differences and to code
|
||||
relying on the stack walking functions. The hacks to replace the GCC
|
||||
functions (__builtin_frame_address and __builtin_return_address) are
|
||||
incomplete;
|
||||
|
||||
[2] The solution doesn't provide complete (i.e. from scratch) build. It
|
||||
requires a working cygwin environment to create some files (e.g. via
|
||||
genmdesc, monoburg). This isn't so bad as without cygwin you wouldn't be
|
||||
able to test Mono properly (see REQUIREMENTS);
|
||||
|
||||
[3] Only the Debug target is configured properly (that would be easy to
|
||||
fix, but would require turning off some optimizations like omitting
|
||||
stack frames). Anyway there are other issues [1] to fix before switching
|
||||
to Release and IMHO the _biggest_ advantage to VS.NET is it's debugger/
|
||||
debugging tools;
|
||||
|
||||
[4] The C compiler emits _lots_ of warning during compilation. Some
|
||||
warnings have been turned off for some projects (there was so much that
|
||||
it slowed down compilation). You can bring them back (or hide more of
|
||||
them) using the project "properties pages" windows, "Configuration
|
||||
Properties\C/C++\Advanced\Disable Specific Warnings";
|
||||
|
||||
[5] Visual Studio 2005 should have all the latest header files required,
|
||||
but if not (or if you're using an older version of VS) then install MS
|
||||
Platform SDK (Windows Server 2003 is the latest) to ensure you have the
|
||||
latest Windows header files. You can download it from:
|
||||
http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
|
||||
|
||||
[6] Not everyone has VS.NET so it is possible you may have to add some
|
||||
(new) files to the build from time to time. See "more informations" for
|
||||
reporting those changes.
|
||||
|
||||
[7] Probably a lot more I didn't discover... or has changed since.
|
||||
|
||||
|
||||
MORE INFORMATION
|
||||
|
||||
Please email <[email protected]> if you have any problem
|
||||
and/or if there's something wrong/missing in the instructions.
|
||||
|
||||
An online version of this file is available at
|
||||
http://www.mono-project.com/Compiling_Mono_VSNET
|
||||
+54
-35
@@ -4,41 +4,54 @@
|
||||
# For further details see http://www.appveyor.com
|
||||
#
|
||||
|
||||
# Use 'unstable' Appveyor build worker image as Appveyor have added Cygwin to this for us
|
||||
os: Unstable
|
||||
|
||||
#
|
||||
# Custom environment variables
|
||||
#
|
||||
environment:
|
||||
global:
|
||||
CYG_ROOT: C:\cygwin
|
||||
CYG_ROOT: C:/cygwin
|
||||
CYG_MIRROR: http://cygwin.mirror.constant.com
|
||||
CYG_CACHE: C:\cygwin\var\cache\setup
|
||||
CYG_BASH: C:\cygwin\bin\bash
|
||||
|
||||
#
|
||||
# Cache Cygwin files to speed up build
|
||||
#
|
||||
cache:
|
||||
- '%CYG_CACHE%'
|
||||
|
||||
#
|
||||
# Do a shallow clone of the repo to speed up build
|
||||
#
|
||||
clone_depth: 1
|
||||
|
||||
CYG_CACHE: C:/cygwin/var/cache/setup
|
||||
NSIS_ROOT: C:\nsis
|
||||
|
||||
#
|
||||
# Initialisation prior to pulling the Mono repository
|
||||
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
|
||||
#
|
||||
init:
|
||||
- git config --global core.autocrlf input
|
||||
- 'echo Building Mono for Windows'
|
||||
- 'echo System architecture: %PLATFORM%'
|
||||
- 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
|
||||
- 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
|
||||
# Attempt to ensure we don't try to convert line endings to Win32 CRLF as this will cause build to fail
|
||||
- 'git config --global core.autocrlf input'
|
||||
|
||||
#
|
||||
# Install needed build dependencies
|
||||
#
|
||||
install:
|
||||
- ps: 'Start-FileDownload "http://cygwin.com/setup-x86.exe" -FileName "setup-x86.exe"'
|
||||
- 'setup-x86.exe --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages autoconf,automake,bison,gcc-core,gcc-g++,mingw-runtime,mingw-binutils,mingw-gcc-core,mingw-gcc-g++,mingw-pthreads,mingw-w32api,libtool,make,python,gettext-devel,gettext,intltool,libiconv,pkg-config,git,curl,libxslt > NUL 2>&1'
|
||||
- '%CYG_BASH% -lc "cygcheck -dc cygwin"'
|
||||
# NOTE: Already installed on current Appveyor unstable image
|
||||
# - 'echo Retrieving Cygwin'
|
||||
# - 'appveyor DownloadFile http://cygwin.com/setup-x86.exe -FileName %CYGROOT%/setup-x86.exe'
|
||||
- 'echo Setting up Cygwin dependencies'
|
||||
- '%CYG_ROOT%\setup-x86.exe -qnNdO -R "%CYG_ROOT%" -s "%CYG_MIRROR%" -l "%CYG_CACHE%" -P autoconf -P automake -P bison -P gcc-core -P gcc-g++ -P mingw-runtime -P mingw-binutils -P mingw-gcc-core -P mingw-gcc-g++ -P mingw-pthreads -P mingw-w32api -P libtool -P make -P python -P gettext-devel -P gettext -P intltool -P libiconv -P pkg-config -P git -P wget -P curl > NUL'
|
||||
- 'echo Check Cygwin setup'
|
||||
- '%CYG_ROOT%/bin/bash -lc "cygcheck -dc cygwin"'
|
||||
- 'echo Done setting up Cygwin'
|
||||
- 'echo Retrieving NSIS'
|
||||
- 'appveyor DownloadFile "http://sunet.dl.sourceforge.net/project/nsis/NSIS 2/2.46/nsis-2.46-setup.exe" -FileName nsissetup.exe'
|
||||
- 'echo Setting up NSIS'
|
||||
- 'nsissetup.exe /S /D=%NSIS_ROOT%'
|
||||
- 'echo Done setting up NSIS'
|
||||
|
||||
#
|
||||
# NOTE: msbuild doesn't work at present so use Cygwin to build
|
||||
#
|
||||
#build:
|
||||
# project: C:\projects\mono\msvc\mono.sln
|
||||
# verbosity: detailed
|
||||
|
||||
# Cygwin build script
|
||||
#
|
||||
@@ -46,29 +59,35 @@ install:
|
||||
#
|
||||
# The stdin/stdout file descriptor appears not to be valid for the Appveyor
|
||||
# build which causes failures as certain functions attempt to redirect
|
||||
# default file handles. Ensure a dummy file descriptor is opened with 'exec'.
|
||||
# default file handles. Ensure a dummy file descriptor is opened with exec.
|
||||
#
|
||||
build_script:
|
||||
- 'echo Building...'
|
||||
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./autogen.sh --prefix=/usr/local --host=i686-pc-mingw32"'
|
||||
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
|
||||
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make -j2"'
|
||||
- 'echo Installing...'
|
||||
- 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
|
||||
- '%CYG_BASH% -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
|
||||
- cmd: 'echo Cygwin root is: %CYG_ROOT%'
|
||||
- cmd: 'echo Build folder is: %APPVEYOR_BUILD_FOLDER%'
|
||||
- cmd: 'echo Repo build branch is: %APPVEYOR_REPO_BRANCH%'
|
||||
- cmd: 'echo Repo build commit is: %APPVEYOR_REPO_COMMIT%'
|
||||
- cmd: 'echo Autogen running...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; NOCONFIGURE=1 ./autogen.sh --prefix=/usr/local --with-preview=yes"'
|
||||
- cmd: 'echo Configure running...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; ./configure --host=i686-pc-mingw32"'
|
||||
- cmd: 'echo Pulling monolite latest...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make get-monolite-latest"'
|
||||
- cmd: 'echo Make running...'
|
||||
- cmd: '%CYG_ROOT%/bin/bash -lc "cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make"'
|
||||
- cmd: 'echo Installing...'
|
||||
- cmd: 'mkdir %APPVEYOR_BUILD_FOLDER%\install'
|
||||
- cmd: '%CYG_ROOT%/bin/bash --login -lc "export CYGWIN=winsymlinks:native; mount \"$APPVEYOR_BUILD_FOLDER\install\" /usr/local; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make install; umount /usr/local"'
|
||||
# - cmd: 'echo Building package...'
|
||||
# - cmd: 'cd %APPVEYOR_BUILD_FOLDER%'
|
||||
# - cmd: '%NSIS_ROOT%\makensis /DMILESTONE=%APPVEYOR_REPO_BRANCH% /DSOURCE_INSTALL_DIR=%APPVEYOR_BUILD_FOLDER\install\*.* /DBUILDNUM=%APPVEYOR_BUILD_VERSION% monowiz.win32.nsi'
|
||||
# - cmd: 'Building distribution...'
|
||||
# - cmd: '%CYG_ROOT%/bin/bash -lc "export CYGWIN=winsymlinks:native; cd $APPVEYOR_BUILD_FOLDER; exec 0</dev/null; make dist"'
|
||||
|
||||
#
|
||||
# Disable tests for now
|
||||
#
|
||||
test: off
|
||||
|
||||
#
|
||||
# Only build the master branch
|
||||
#
|
||||
branches:
|
||||
only:
|
||||
- master
|
||||
|
||||
#
|
||||
# NOTE: Currently this is the Mono installation tree. In future we will create an installation package artifact.
|
||||
# It has to be relative to the project path. Thus we have installed to within the build tree.
|
||||
|
||||
Executable
+227
@@ -0,0 +1,227 @@
|
||||
#!/bin/bash -e
|
||||
CURDIR="`pwd`"
|
||||
MINGW=i386-mingw32msvc
|
||||
CROSS_DIR=/opt/cross/$MINGW
|
||||
EXTRA_CROSS_DIR=
|
||||
INSTALL_DESTDIR="$CURDIR/mono-win32"
|
||||
PROFILES="default net_2_0 net_3_5 net_4_0 net_4_5 moonlight"
|
||||
TEMPORARY_PKG_CONFIG_DIR=/tmp/$RANDOM-pkg-config-$RANDOM
|
||||
ORIGINAL_PATH="$PATH"
|
||||
|
||||
export CPPFLAGS_FOR_EGLIB CFLAGS_FOR_EGLIB CPPFLAGS_FOR_LIBGC CFLAGS_FOR_LIBGC
|
||||
|
||||
function cleanup ()
|
||||
{
|
||||
if [ -d "$TEMPORARY_PKG_CONFIG_DIR" ]; then
|
||||
rm -rf "$TEMPORARY_PKG_CONFIG_DIR"
|
||||
fi
|
||||
}
|
||||
|
||||
function check_pkg_config_dir ()
|
||||
{
|
||||
local DIR="$1"
|
||||
local DIR_PREFIX="$2"
|
||||
|
||||
if [ ! -d "$DIR" ]; then
|
||||
return
|
||||
fi
|
||||
|
||||
install -d -m 755 "$TEMPORARY_PKG_CONFIG_DIR"
|
||||
for pc in "$DIR"/*.pc; do
|
||||
if [ -f $pc ]; then
|
||||
pcname="`basename $pc`"
|
||||
sed -e "s;^prefix=.*;prefix=$DIR_PREFIX;g" < $pc > "$TEMPORARY_PKG_CONFIG_DIR"/$pcname
|
||||
fi;
|
||||
done
|
||||
|
||||
if [ -z "$CROSS_PKG_CONFIG_DIR" ]; then
|
||||
CROSS_PKG_CONFIG_DIR="$TEMPORARY_PKG_CONFIG_DIR"
|
||||
fi
|
||||
}
|
||||
|
||||
function show_build_info ()
|
||||
{
|
||||
cat <<EOF
|
||||
Installation prefix: $MONO_PREFIX
|
||||
CPPFLAGS: ${CPPFLAGS:=not set}
|
||||
LDFLAGS: ${LDFLAGS:=not set}
|
||||
MONO_PATH: ${MONO_PATH:=not set}
|
||||
EOF
|
||||
}
|
||||
|
||||
function setup ()
|
||||
{
|
||||
local pcname
|
||||
|
||||
CROSS_BIN_DIR="$CROSS_DIR/bin"
|
||||
CROSS_DLL_DIR="$CROSS_DIR/bin"
|
||||
PATH=$CROSS_BIN_DIR:$PATH
|
||||
|
||||
MONO_VERSION=`grep AC_INIT configure.ac | cut -d ',' -f 2|tr -d '\[ \]'`
|
||||
|
||||
if [ -d ./.git ]; then
|
||||
MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
|
||||
MONO_GIT_BRANCH="`git branch|grep '\*'|cut -d ' ' -f 2|tr -d '\)'|tr -d '\('`"
|
||||
MONO_RELEASE="$MONO_VERSION-$MONO_GIT_BRANCH-$MONO_GIT_COMMIT"
|
||||
else
|
||||
MONO_RELEASE="$MONO_VERSION"
|
||||
fi
|
||||
|
||||
MONO_PREFIX="$MONO_PREFIX/mono-$MONO_RELEASE"
|
||||
|
||||
NOCONFIGURE=yes
|
||||
export NOCONFIGURE
|
||||
|
||||
check_pkg_config_dir "$CROSS_DIR/lib/pkgconfig" "$CROSS_DIR"
|
||||
|
||||
if [ -n "$EXTRA_CROSS_DIR" -a -d "$EXTRA_CROSS_DIR" ]; then
|
||||
if [ -d "$EXTRA_CROSS_DIR/bin" ]; then
|
||||
PATH="$EXTRA_CROSS_DIR/bin":$PATH
|
||||
fi
|
||||
|
||||
check_pkg_config_dir "$EXTRA_CROSS_DIR/lib/pkgconfig" "$EXTRA_CROSS_DIR"
|
||||
|
||||
if [ -d "$EXTRA_CROSS_DIR/include" ]; then
|
||||
if [ -z "$CPPFLAGS" ]; then
|
||||
CPPFLAGS="-I \"$EXTRA_CROSS_DIR/include\""
|
||||
else
|
||||
CPPFLAGS="-I \"$EXTRA_CROSS_DIR/include\" $CFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d "$EXTRA_CROSS_DIR/lib" ]; then
|
||||
if [ -z "$LDFLAGS" ]; then
|
||||
LDFLAGS="-I \"$EXTRA_CROSS_DIR/lib\""
|
||||
else
|
||||
LDFLAGS="-I \"$EXTRA_CROSS_DIR/lib\" $LDFLAGS"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -d "$EXTRA_CROSS_DIR/share/aclocal" ]; then
|
||||
if [ -z "$MONO_PATH" ]; then
|
||||
MONO_PATH="\"$EXTRA_CROSS_DIR\""
|
||||
else
|
||||
MONO_PATH="\"$EXTRA_CROSS_DIR\":$MONO_PATH"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
export PATH MONO_PATH CPPFLAGS
|
||||
show_build_info
|
||||
}
|
||||
|
||||
function build ()
|
||||
{
|
||||
if [ -f ./Makefile ]; then
|
||||
make distclean
|
||||
fi
|
||||
|
||||
if [ -d ./autom4te.cache ]; then
|
||||
rm -rf ./autom4te.cache
|
||||
fi
|
||||
|
||||
if [ -f ./config.status ]; then
|
||||
for f in `find -name config.status -type f`; do
|
||||
rm $f
|
||||
done
|
||||
fi
|
||||
|
||||
./autogen.sh
|
||||
|
||||
BUILD="`./config.guess`"
|
||||
|
||||
if [ ! -d "$CURDIR/build-cross-windows" ]; then
|
||||
mkdir "$CURDIR/build-cross-windows"
|
||||
fi
|
||||
|
||||
cd "$CURDIR/build-cross-windows"
|
||||
rm -rf *
|
||||
../configure --prefix=$MONO_PREFIX --with-crosspkgdir=$CROSS_PKG_CONFIG_DIR --build=$BUILD --target=$MINGW --host=$MINGW --enable-parallel-mark --program-transform-name="" --with-tls=none --disable-mcs-build --disable-embed-check --enable-win32-dllmain=yes --with-libgc-threads=win32 --with-profile4=yes
|
||||
make
|
||||
cd "$CURDIR"
|
||||
|
||||
if [ ! -d "$CURDIR/build-cross-windows-mcs" ]; then
|
||||
mkdir "$CURDIR/build-cross-windows-mcs"
|
||||
fi
|
||||
|
||||
rm -rf autom4te.cache
|
||||
unset PATH
|
||||
PATH="$ORIGINAL_PATH"
|
||||
export PATH
|
||||
cd "$CURDIR/build-cross-windows-mcs"
|
||||
rm -rf *
|
||||
../configure --prefix=$MONO_PREFIX --enable-parallel-mark
|
||||
make
|
||||
}
|
||||
|
||||
function doinstall ()
|
||||
{
|
||||
if [ -d "$INSTALL_DIR" ]; then
|
||||
rm -rf "$INSTALL_DIR"
|
||||
fi
|
||||
cd "$CURDIR/build-cross-windows"
|
||||
make DESTDIR="$INSTALL_DESTDIR" USE_BATCH_FILES=yes install
|
||||
|
||||
if test -d $CURDIR/mcs; then
|
||||
mcsdir=$CURDIR/mcs
|
||||
else
|
||||
mcsdir=$CURDIR/../mcs
|
||||
fi
|
||||
|
||||
cd "$mcsdir/mcs"
|
||||
for p in $PROFILES; do
|
||||
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "mcs profile $p installation failed"
|
||||
done
|
||||
|
||||
cd "$mcsdir/class"
|
||||
for p in $PROFILES; do
|
||||
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "class library profile $p installation failed"
|
||||
done
|
||||
|
||||
cd "$mcsdir/tools"
|
||||
for p in $PROFILES; do
|
||||
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "tools profile $p installation failed"
|
||||
done
|
||||
|
||||
cd "$CURDIR/mono-win32"
|
||||
rm -f "$CURDIR/mono-win32-$MONO_RELEASE".zip
|
||||
zip -9r "$CURDIR/mono-win32-$MONO_RELEASE".zip .
|
||||
|
||||
}
|
||||
|
||||
function usage ()
|
||||
{
|
||||
cat <<EOF
|
||||
Usage: build-mingw32.sh [OPTIONS]
|
||||
|
||||
where OPTIONS are:
|
||||
|
||||
-d DIR Sets the location of directory where MINGW is installed [$CROSS_DIR]
|
||||
-e DIR Sets the location of directory where additional cross develoment packages are installed [${EXTRA_CROSS_DIR:=none}]
|
||||
-m MINGW Sets the MINGW target name to be passed to configure [$MINGW]
|
||||
-p PREFIX Prefix at which Mono is to be installed. Build will append the 'mono-X.Y' string to that path
|
||||
EOF
|
||||
|
||||
exit 1
|
||||
}
|
||||
|
||||
trap cleanup 0
|
||||
|
||||
pushd . > /dev/null
|
||||
|
||||
while getopts "d:m:e:p:" opt; do
|
||||
case "$opt" in
|
||||
d) CROSS_DIR="$OPTARG" ;;
|
||||
m) MINGW="$OPTARG" ;;
|
||||
e) EXTRA_CROSS_DIR="$OPTARG" ;;
|
||||
p) MONO_PREFIX="$OPTARG" ;;
|
||||
*) usage ;;
|
||||
esac
|
||||
done
|
||||
|
||||
setup
|
||||
build
|
||||
doinstall
|
||||
show_build_info
|
||||
|
||||
popd > /dev/null
|
||||
+73
-391
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [4.1.0],
|
||||
AC_INIT(mono, [3.99.0],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -70,6 +70,9 @@ AC_SUBST(libmono_ldflags)
|
||||
reloc_libdir=`basename ${libdir}`
|
||||
AC_SUBST(reloc_libdir)
|
||||
|
||||
dnl if linker handles the version script
|
||||
no_version_script=no
|
||||
|
||||
# Set to yes if Unix sockets cannot be created in an anonymous namespace
|
||||
need_link_unlink=no
|
||||
|
||||
@@ -96,20 +99,24 @@ platform_android=no
|
||||
platform_darwin=no
|
||||
case "$host" in
|
||||
*-mingw*|*-*-cygwin*)
|
||||
AC_DEFINE(HOST_WIN32,1,[Host Platform is Win32])
|
||||
AC_DEFINE(DISABLE_PORTABILITY,1,[Disable the io-portability layer])
|
||||
AC_DEFINE(PLATFORM_NO_SYMLINKS,1,[This platform does not support symlinks])
|
||||
host_win32=yes
|
||||
mono_cv_clang=no
|
||||
if test "x$cross_compiling" = "xno"; then
|
||||
target_win32=yes
|
||||
if test "x$host" == "x$build" -a "x$host" == "x$target"; then
|
||||
target_win32=yes
|
||||
AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32])
|
||||
fi
|
||||
else
|
||||
target_win32=yes
|
||||
AC_DEFINE(TARGET_WIN32,1,[Target OS is Win32/MinGW])
|
||||
AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW])
|
||||
fi
|
||||
HOST_CC="gcc"
|
||||
# Windows Vista or later is required
|
||||
CPPFLAGS="$CPPFLAGS -DWINVER=0x0600 -D_WIN32_WINNT=0x0600 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
|
||||
# Windows XP SP2 is required
|
||||
CPPFLAGS="$CPPFLAGS -DWINVER=0x0502 -D_WIN32_WINNT=0x0502 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
|
||||
LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32 -liphlpapi"
|
||||
libmono_cflags="-mms-bitfields -mwindows"
|
||||
libmono_ldflags="-mms-bitfields -mwindows"
|
||||
@@ -299,10 +306,12 @@ case "$host" in
|
||||
platform_darwin=yes
|
||||
target_mach=yes
|
||||
CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
|
||||
CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
|
||||
libmono_cflags="-D_THREAD_SAFE"
|
||||
need_link_unlink=yes
|
||||
AC_DEFINE(PTHREAD_POINTER_ID)
|
||||
AC_DEFINE(USE_MACH_SEMA, 1, [...])
|
||||
no_version_script=yes
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
has_dtrace=yes
|
||||
@@ -356,14 +365,6 @@ if test x$need_link_unlink = xyes; then
|
||||
AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace])
|
||||
fi
|
||||
|
||||
if test x$host_win32 = xyes; then
|
||||
AC_DEFINE(HOST_WIN32, 1, [Host Platform is Win32])
|
||||
fi
|
||||
|
||||
if test x$target_win32 = xyes; then
|
||||
AC_DEFINE(TARGET_WIN32, 1, [Target Platform is Win32])
|
||||
fi
|
||||
|
||||
AC_SUBST(extra_runtime_ldflags)
|
||||
AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
|
||||
AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
|
||||
@@ -432,11 +433,16 @@ AC_SUBST(export_ldflags)
|
||||
# Test whenever ld supports -version-script
|
||||
AC_PROG_LD
|
||||
AC_PROG_LD_GNU
|
||||
if test "x$lt_cv_prog_gnu_ld" = "xno"; then
|
||||
no_version_script=yes
|
||||
fi
|
||||
|
||||
AM_ICONV()
|
||||
|
||||
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h sys/sysctl.h libproc.h)
|
||||
AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h arpa/inet.h complex.h)
|
||||
AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
|
||||
|
||||
AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h sys/uio.h sys/param.h libproc.h)
|
||||
AC_CHECK_HEADERS(sys/param.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h sys/select.h netinet/tcp.h netinet/in.h unistd.h sys/types.h link.h asm/sigcontext.h sys/inotify.h)
|
||||
AC_CHECK_HEADERS([linux/netlink.h linux/rtnetlink.h],
|
||||
[], [], [#include <stddef.h>
|
||||
#include <sys/socket.h>
|
||||
@@ -449,8 +455,6 @@ AC_CHECK_HEADERS(sys/user.h, [], [],
|
||||
#endif
|
||||
])
|
||||
|
||||
AC_CHECK_HEADERS(linux/serial.h)
|
||||
|
||||
AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
|
||||
if test x$have_zlib = xyes; then
|
||||
AC_TRY_COMPILE([#include <zlib.h>], [
|
||||
@@ -523,30 +527,26 @@ AC_CACHE_CHECK([for clang],
|
||||
[])
|
||||
])
|
||||
|
||||
AC_ARG_ENABLE(visiblity-hidden,
|
||||
[ --disable-visibility-hidden disable usage of -fvisiblity=hidden]
|
||||
disable_visibility_hidden=no, disable_visibility_hidden=yes)
|
||||
|
||||
WARN=''
|
||||
if test x"$GCC" = xyes; then
|
||||
WARN='-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wwrite-strings -Wno-switch -Wno-switch-enum -Wno-unused-value'
|
||||
|
||||
# We require C99 with some GNU extensions, e.g. `linux` macro
|
||||
CFLAGS="$CFLAGS -std=gnu99"
|
||||
|
||||
# The runtime code does not respect ANSI C strict aliasing rules
|
||||
CFLAGS="$CFLAGS -fno-strict-aliasing"
|
||||
|
||||
# We rely on signed overflow to behave
|
||||
CFLAGS="$CFLAGS -fwrapv"
|
||||
|
||||
CFLAGS="$CFLAGS -DMONO_DLL_EXPORT"
|
||||
if test x"$disable_visibility_hidden" = xno; then
|
||||
# Don't export any symbols by default
|
||||
SHARED_CFLAGS="-fvisibility=hidden"
|
||||
CFLAGS_FOR_EGLIB="$CFLAGS_FOR_EGLIB -fvisibility=hidden"
|
||||
CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
|
||||
fi
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
|
||||
AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
|
||||
AC_TRY_COMPILE([],[
|
||||
return 0;
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
CFLAGS=$ORIG_CFLAGS
|
||||
])
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
# Check for the normal version, since gcc ignores unknown -Wno options
|
||||
@@ -635,6 +635,17 @@ fi
|
||||
AC_SUBST([mcs_topdir])
|
||||
AC_SUBST([mcs_topdir_from_srcdir])
|
||||
|
||||
# Where's the 'olive' source tree?
|
||||
if test -d $srcdir/olive; then
|
||||
olivedir=olive
|
||||
else
|
||||
olivedir=../olive
|
||||
fi
|
||||
|
||||
if test -d $srcdir/$olivedir; then
|
||||
olive_topdir='$(top_srcdir)/'$olivedir
|
||||
fi
|
||||
|
||||
# gettext: prepare the translation directories.
|
||||
# we do not configure the full gettext, as we consume it dynamically from C#
|
||||
AM_PO_SUBDIRS
|
||||
@@ -667,7 +678,6 @@ if test x$werror_flag = xyes; then
|
||||
WERROR_CFLAGS="-Werror"
|
||||
fi
|
||||
AC_SUBST([WERROR_CFLAGS])
|
||||
AC_SUBST([SHARED_CFLAGS])
|
||||
|
||||
ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\""
|
||||
AC_CONFIG_SUBDIRS(eglib)
|
||||
@@ -965,12 +975,6 @@ if test x$enable_gsharing = xyes; then
|
||||
AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
|
||||
fi
|
||||
|
||||
# A synonym
|
||||
AC_ARG_ENABLE(gsharedvt, [ --enable-gsharedvt Enable generic valuetype sharing], enable_gsharedvt=$enableval, enable_gsharedvt=no)
|
||||
if test x$enable_gsharedvt = xyes; then
|
||||
AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharedvt])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(native-types, [ --enable-native-types Enable native types], enable_native_types=$enableval, enable_native_types=no)
|
||||
if test x$enable_native_types = xyes; then
|
||||
AC_DEFINE(MONO_NATIVE_TYPES,1,[native types])
|
||||
@@ -1141,12 +1145,6 @@ AC_TRY_COMPILE([
|
||||
|
||||
AC_CHECK_HEADERS(nacl/nacl_dyncode.h)
|
||||
|
||||
dnl ***********************************
|
||||
dnl *** Checks for signals
|
||||
dnl ***********************************
|
||||
AC_CHECK_HEADERS(signal.h)
|
||||
AC_CHECK_FUNCS(sigaction)
|
||||
|
||||
if test x$target_win32 = xno; then
|
||||
|
||||
dnl hires monotonic clock support
|
||||
@@ -1521,32 +1519,11 @@ if test x$target_win32 = xno; then
|
||||
])
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for getaddrinfo ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for getaddrinfo)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
getaddrinfo(NULL,NULL,NULL,NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETADDRINFO, 1, [Have getaddrinfo])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for gethostbyname2_r ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for gethostbyname2_r)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
|
||||
AC_TRY_LINK([#include <netdb.h>], [
|
||||
gethostbyname2_r(NULL,0,NULL,NULL,0,NULL,NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
@@ -1556,92 +1533,6 @@ if test x$target_win32 = xno; then
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for gethostbyname2 ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for gethostbyname2)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
gethostbyname2(NULL,0);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETHOSTBYNAME2, 1, [Have gethostbyname2])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for gethostbyname ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for gethostbyname)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
gethostbyname(NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [Have gethostbyname])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for getprotobyname ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for getprotobyname)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
getprotobyname(NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETPROTOBYNAME, 1, [Have getprotobyname])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for getnameinfo ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for getnameinfo)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <netdb.h>
|
||||
], [
|
||||
getnameinfo (NULL, 0, NULL, 0, NULL, 0, 0);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETNAMEINFO, 1, [Have getnameinfo])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for inet_ntop ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for inet_ntop)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <arpa/inet.h>
|
||||
], [
|
||||
inet_ntop (0, NULL, NULL, 0);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_INET_NTOP, 1, [Have inet_ntop])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl *****************************
|
||||
dnl *** Checks for libnsl ***
|
||||
dnl *****************************
|
||||
@@ -1707,23 +1598,11 @@ if test x$target_win32 = xno; then
|
||||
AC_CHECK_FUNCS(pthread_attr_getstack pthread_attr_getstacksize)
|
||||
AC_CHECK_FUNCS(pthread_get_stacksize_np pthread_get_stackaddr_np)
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for mincore ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for mincore)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/mman.h>
|
||||
], [
|
||||
mincore(NULL, 0, NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_MINCORE, 1, [Have mincore])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
dnl ***********************************
|
||||
dnl *** Checks for signals
|
||||
dnl ***********************************
|
||||
AC_CHECK_HEADERS(signal.h)
|
||||
AC_CHECK_FUNCS(sigaction)
|
||||
|
||||
dnl ***********************************
|
||||
dnl *** Checks for working __thread ***
|
||||
@@ -2277,115 +2156,6 @@ else
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for getaddrinfo ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for getaddrinfo)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
], [
|
||||
getaddrinfo(NULL,NULL,NULL,NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETADDRINFO, 1, [Have getaddrinfo])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for gethostbyname ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for gethostbyname)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
], [
|
||||
gethostbyname(NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETHOSTBYNAME, 1, [Have gethostbyname])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for getprotobyname ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for getprotobyname)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
], [
|
||||
getprotobyname(NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETPROTOBYNAME, 1, [Have getprotobyname])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for getnameinfo ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for getnameinfo)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
], [
|
||||
getnameinfo (NULL, 0, NULL, 0, NULL, 0, 0);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETNAMEINFO, 1, [Have getnameinfo])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for inet_ntop ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for inet_ntop)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
], [
|
||||
inet_ntop (0, NULL, NULL, 0);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_INET_NTOP, 1, [Have inet_ntop])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl **********************************
|
||||
dnl *** Check for inet_pton ***
|
||||
dnl **********************************
|
||||
AC_MSG_CHECKING(for inet_pton)
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
], [
|
||||
inet_pton (0, NULL, NULL);
|
||||
], [
|
||||
# Yes, we have it...
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_INET_PTON, 1, [Have inet_pton])
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
|
||||
@@ -2529,12 +2299,6 @@ fi
|
||||
|
||||
AC_ARG_ENABLE(bcl-opt, [ --disable-bcl-opt BCL is compiled with no optimizations (allows accurate BCL debugging)], test_bcl_opt=$enableval, test_bcl_opt=yes)
|
||||
|
||||
AC_ARG_ENABLE(perf-events, [ --enable-perf-events Enable using `perf` for profiling on Linux], test_perf_events=$enableval, test_perf_events=no)
|
||||
if test "x$test_perf_events" == "xyes"; then
|
||||
AC_DEFINE(ENABLE_PERF_EVENTS, 1, [Enable using `perf` for profiling on Linux])
|
||||
AC_SUBST(ENABLE_PERF_EVENTS)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([if big-arrays are to be enabled])
|
||||
AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
|
||||
if test "x$enable_big_arrays" = "xyes" ; then
|
||||
@@ -2656,9 +2420,6 @@ AC_ARG_WITH(llvm, [ --with-llvm=<llvm prefix> Enable the LLVM back-end], ena
|
||||
if test "x$enable_llvm" = "xyes"; then
|
||||
if test "x$with_llvm" != "x"; then
|
||||
LLVM_CONFIG=$with_llvm/bin/llvm-config
|
||||
if test x$target_win32 = xyes; then
|
||||
LLVM_CONFIG=$LLVM_CONFIG.exe
|
||||
fi
|
||||
if test ! -x $LLVM_CONFIG; then
|
||||
AC_MSG_ERROR([LLVM executable $LLVM_CONFIG not found.])
|
||||
fi
|
||||
@@ -2676,8 +2437,6 @@ if test "x$enable_llvm" = "xyes"; then
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "x$target_win32" = "xno"; then
|
||||
|
||||
# The output of --cflags seems to include optimizations flags too
|
||||
LLVM_CFLAGS=`$LLVM_CONFIG --cflags | sed -e 's/-O2//g' | sed -e 's/-O0//g' | sed -e 's/-fomit-frame-pointer//g' | sed -e 's/-fPIC//g'`
|
||||
# LLVM is compiled with -fno-rtti, so we need this too, since our classes inherit
|
||||
@@ -2707,39 +2466,17 @@ if test "x$enable_llvm" = "xyes"; then
|
||||
AC_MSG_ERROR([Expected llvm version $expected_llvm_version, but llvm-config --version returned $llvm_version"])
|
||||
fi
|
||||
fi
|
||||
if test "x$llvm_api_version" = "x"; then
|
||||
LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=0"
|
||||
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=0"
|
||||
else
|
||||
LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=$llvm_api_version"
|
||||
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
|
||||
fi
|
||||
else
|
||||
AC_MSG_ERROR([Compiling with stock LLVM is not supported, please use the Mono LLVM repo at https://github.com/mono/llvm, with the GIT branch which matches this version of mono, i.e. 'mono-2-10' for Mono 2.10.])
|
||||
fi
|
||||
|
||||
else
|
||||
LLVM_CFLAGS="-I$with_llvm/include -DNDEBUG -D__NO_CTYPE_INLINE -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
|
||||
LLVM_CXXFLAGS="$LLVM_CFLAGS -std=gnu++11 -fvisibility-inlines-hidden -fno-exceptions -fno-rtti -Woverloaded-virtual -Wcast-qual"
|
||||
LLVM_LDFLAGS="-L$with_llvm/lib"
|
||||
LLVM_SYSTEM_LIBS="-lshell32 -lpsapi -limagehlp -ldbghelp -lm"
|
||||
LLVM_LIBS="-lLLVMLTO -lLLVMObjCARCOpts -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMBitWriter \
|
||||
-lLLVMARMDisassembler -lLLVMARMCodeGen -lLLVMARMAsmParser -lLLVMARMDesc -lLLVMARMInfo \
|
||||
-lLLVMARMAsmPrinter -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler \
|
||||
-lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc \
|
||||
-lLLVMMCDisassembler -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMJIT \
|
||||
-lLLVMIRReader -lLLVMAsmParser -lLLVMLineEditor -lLLVMMCAnalysis -lLLVMInstrumentation \
|
||||
-lLLVMInterpreter -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils \
|
||||
-lLLVMipa -lLLVMAnalysis -lLLVMProfileData -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld \
|
||||
-lLLVMObject -lLLVMMCParser -lLLVMBitReader -lLLVMExecutionEngine -lLLVMMC -lLLVMCore \
|
||||
-lLLVMSupport -lstdc++"
|
||||
LLVM_LIBS="$LLVM_LIBS $LLVM_SYSTEM_LIBS"
|
||||
|
||||
llvm_config_path=$with_llvm/include/llvm/Config/llvm-config.h
|
||||
llvm_api_version=`awk '/MONO_API_VERSION/ { print $3 }' $llvm_config_path`
|
||||
fi
|
||||
|
||||
if test "x$llvm_api_version" = "x"; then
|
||||
LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=0"
|
||||
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=0"
|
||||
else
|
||||
LLVM_CFLAGS="$LLVM_CFLAGS -DLLVM_API_VERSION=$llvm_api_version"
|
||||
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_API_VERSION=$llvm_api_version"
|
||||
fi
|
||||
|
||||
AC_DEFINE_UNQUOTED(LLVM_VERSION, "$llvm_version", [Full version of LLVM libraties])
|
||||
|
||||
AC_SUBST(LLVM_CFLAGS)
|
||||
@@ -3060,31 +2797,6 @@ if test "x$host" != "x$target"; then
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
;;
|
||||
x86_64*-linux-*)
|
||||
TARGET=AMD64;
|
||||
arch_target=amd64;
|
||||
AC_DEFINE(TARGET_AMD64, 1, [...])
|
||||
AC_DEFINE(TARGET_ANDROID, 1, [...])
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
sgen_supported=true
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
;;
|
||||
x86_64-ps4-freebsd)
|
||||
TARGET=AMD64;
|
||||
arch_target=amd64;
|
||||
AC_DEFINE(TARGET_AMD64, 1, [...])
|
||||
AC_DEFINE(TARGET_PS4, 1, [...])
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
sgen_supported=true
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
target_mach=no
|
||||
target_win32=no
|
||||
;;
|
||||
aarch64*-linux-*)
|
||||
TARGET=ARM64;
|
||||
arch_target=arm64;
|
||||
@@ -3141,46 +2853,6 @@ SPARC64)
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl *************
|
||||
dnl *** VTUNE ***
|
||||
dnl *************
|
||||
|
||||
AC_ARG_ENABLE(vtune,[ --enable-vtune Enable the VTUNE back-end], enable_vtune=$enableval, enable_vtune=no)
|
||||
AC_ARG_WITH(vtune, [ --with-vtune=<vtune prefix> Enable jit vtune profiling], enable_vtune=yes,)
|
||||
|
||||
AM_CONDITIONAL(HAVE_VTUNE, test x$enable_vtune = xyes)
|
||||
|
||||
if test "x$enable_vtune" = "xyes"; then
|
||||
if test "x$with_vtune" = "x"; then
|
||||
VTUNE_PATH=/opt/intel/vtune_amplifier_xe
|
||||
else
|
||||
VTUNE_PATH=$with_vtune
|
||||
fi
|
||||
VTUNE_INCLUDE=$VTUNE_PATH/include
|
||||
case "$TARGET" in
|
||||
X86)
|
||||
VTUNE_LIB=$VTUNE_PATH/lib32
|
||||
;;
|
||||
AMD64)
|
||||
VTUNE_LIB=$VTUNE_PATH/lib64
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Unsupported target $TARGET for VTUNE.])
|
||||
;;
|
||||
esac
|
||||
if test ! -f $VTUNE_INCLUDE/jitprofiling.h; then
|
||||
AC_MSG_ERROR([VTUNE $VTUNE_INCLUDE/jitprofiling.h not found.])
|
||||
fi
|
||||
if test ! -f $VTUNE_LIB/libjitprofiling.a; then
|
||||
AC_MSG_ERROR([VTUNE $VTUNE_LIB/libjitprofiling.a not found.])
|
||||
fi
|
||||
|
||||
VTUNE_CFLAGS=-I$VTUNE_INCLUDE
|
||||
VTUNE_LIBS="-L/$VTUNE_LIB/ -ljitprofiling"
|
||||
|
||||
AC_SUBST(VTUNE_LIBS)
|
||||
AC_SUBST(VTUNE_CFLAGS)
|
||||
fi
|
||||
dnl Use GCC atomic ops if they work on the target.
|
||||
if test x$GCC = "xyes"; then
|
||||
case $TARGET in
|
||||
@@ -3579,12 +3251,6 @@ AC_ARG_WITH(lazy_gc_thread_creation, [ --with-lazy-gc-thread-creation=yes|no
|
||||
fi
|
||||
], [with_lazy_gc_thread_creation=no])
|
||||
|
||||
AC_ARG_WITH(cooperative_gc, [ --with-cooperative-gc=yes|no Enable cooperative stop-the-world garbage collection (sgen only) (defaults to no)],[
|
||||
if test x$with_cooperative_gc != xno ; then
|
||||
AC_DEFINE(USE_COOP_GC,1,[Enable cooperative stop-the-world garbage collection.])
|
||||
fi
|
||||
], [with_cooperative_gc=no])
|
||||
|
||||
AC_CHECK_HEADER([malloc.h],
|
||||
[AC_DEFINE([HAVE_USR_INCLUDE_MALLOC_H], [1],
|
||||
[Define to 1 if you have /usr/include/malloc.h.])],,)
|
||||
@@ -3857,10 +3523,10 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/4.5/web.config],
|
||||
],[LN_S='$LN_S'])
|
||||
|
||||
AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/echo "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
|
||||
AC_CONFIG_COMMANDS([nolock-libtool], [sed -e 's/lock_old_archive_extraction=yes/lock_old_archive_extraction=no/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
mono-core.spec
|
||||
mono-uninstalled.pc
|
||||
scripts/mono-find-provides
|
||||
scripts/mono-find-requires
|
||||
@@ -3891,6 +3557,7 @@ mono/tests/cas/threads/Makefile
|
||||
mono/tests/gc-descriptors/Makefile
|
||||
mono/unit-tests/Makefile
|
||||
mono/benchmark/Makefile
|
||||
mono/monograph/Makefile
|
||||
mono/io-layer/Makefile
|
||||
mono/mini/Makefile
|
||||
mono/profiler/Makefile
|
||||
@@ -3932,7 +3599,6 @@ data/config
|
||||
tools/Makefile
|
||||
tools/locale-builder/Makefile
|
||||
tools/sgen/Makefile
|
||||
tools/monograph/Makefile
|
||||
runtime/Makefile
|
||||
msvc/Makefile
|
||||
po/Makefile
|
||||
@@ -4041,6 +3707,22 @@ fi
|
||||
|
||||
fi
|
||||
|
||||
# if we have an olive folder, override the default settings
|
||||
if test -d $olivedir; then
|
||||
|
||||
if test x$cross_compiling = xno && test x$enable_olive_build != xno; then
|
||||
|
||||
test -w $srcdir/$olivedir/build || chmod +w $srcdir/$olivedir/build
|
||||
|
||||
echo "prefix=$prefix" > $srcdir/$olivedir/build/config.make
|
||||
echo "exec_prefix=$exec_prefix" >> $srcdir/$olivedir/build/config.make
|
||||
echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$olivedir/build/config.make
|
||||
echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$olivedir/build/config.make
|
||||
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$olivedir/build/config.make
|
||||
echo "MONO_VERSION = $myver" >> $srcdir/$olivedir/build/config.make
|
||||
fi
|
||||
fi
|
||||
|
||||
)
|
||||
|
||||
libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
|
||||
|
||||
+1
-4
@@ -1,7 +1,6 @@
|
||||
SUBDIRS = net_2_0 net_4_0 net_4_5
|
||||
|
||||
monodir = $(sysconfdir)/mono
|
||||
monolldbdir = $(libdir)/mono/lldb
|
||||
|
||||
EXTRA_DIST = \
|
||||
config.in \
|
||||
@@ -13,8 +12,7 @@ EXTRA_DIST = \
|
||||
reactive.pc.in xbuild12.pc \
|
||||
net_1_1/machine.config \
|
||||
gdb/mono-gdb.py \
|
||||
gdb/gdb-python.diff \
|
||||
lldb/mono.py
|
||||
gdb/gdb-python.diff
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
|
||||
@@ -33,7 +31,6 @@ DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nuni
|
||||
mono_DATA = config \
|
||||
browscap.ini
|
||||
|
||||
monolldb_DATA = lldb/mono.py
|
||||
gdbdir = $(bindir)
|
||||
|
||||
mono-sgen-gdb.py: gdb/mono-gdb.py
|
||||
|
||||
@@ -31,7 +31,7 @@ class StringPrinter:
|
||||
while i < len:
|
||||
val = (chars.cast(gdb.lookup_type ("gint64")) + (i * 2)).cast(gdb.lookup_type ("gunichar2").pointer ()).dereference ()
|
||||
if val >= 256:
|
||||
c = unichr (val)
|
||||
c = "\u%X".format (val)
|
||||
else:
|
||||
c = chr (val)
|
||||
res.append (c)
|
||||
|
||||
@@ -1,174 +0,0 @@
|
||||
#
|
||||
# Author: Zoltan Varga ([email protected])
|
||||
# License: MIT/X11
|
||||
#
|
||||
|
||||
#
|
||||
# This is a mono support mode for lldb
|
||||
#
|
||||
|
||||
# Comments about the lldb python api:
|
||||
# - there are no accessors, i.e. valobj["name"]
|
||||
# - http://lldb.llvm.org/python_reference/index.html seems to be outdated
|
||||
# - there is no autoload support, i.e. can't load this file automatically
|
||||
# when 'mono' is the debugger target.
|
||||
|
||||
import lldb
|
||||
|
||||
# FIXME: Generate enums from runtime enums
|
||||
MONO_TYPE_END = 0x00
|
||||
MONO_TYPE_VOID = 0x01
|
||||
MONO_TYPE_BOOLEAN = 0x02
|
||||
MONO_TYPE_CHAR = 0x03
|
||||
MONO_TYPE_I1 = 0x04
|
||||
MONO_TYPE_U1 = 0x05
|
||||
MONO_TYPE_I2 = 0x06
|
||||
MONO_TYPE_U2 = 0x07
|
||||
MONO_TYPE_I4 = 0x08
|
||||
MONO_TYPE_U4 = 0x09
|
||||
MONO_TYPE_I8 = 0x0a
|
||||
MONO_TYPE_U8 = 0x0b
|
||||
MONO_TYPE_R4 = 0x0c
|
||||
MONO_TYPE_R8 = 0x0d
|
||||
MONO_TYPE_STRING = 0x0e
|
||||
MONO_TYPE_PTR = 0x0f
|
||||
MONO_TYPE_BYREF = 0x10
|
||||
MONO_TYPE_VALUETYPE = 0x11
|
||||
MONO_TYPE_CLASS = 0x12
|
||||
MONO_TYPE_VAR = 0x13
|
||||
MONO_TYPE_ARRAY = 0x14
|
||||
MONO_TYPE_GENERICINST= 0x15
|
||||
MONO_TYPE_TYPEDBYREF = 0x16
|
||||
MONO_TYPE_I = 0x18
|
||||
MONO_TYPE_U = 0x19
|
||||
MONO_TYPE_FNPTR = 0x1b
|
||||
MONO_TYPE_OBJECT = 0x1c
|
||||
MONO_TYPE_SZARRAY = 0x1d
|
||||
MONO_TYPE_MVAR = 0x1e
|
||||
|
||||
primitive_type_names = {
|
||||
MONO_TYPE_BOOLEAN : "bool",
|
||||
MONO_TYPE_CHAR : "char",
|
||||
MONO_TYPE_I1 : "sbyte",
|
||||
MONO_TYPE_U1 : "byte",
|
||||
MONO_TYPE_I2 : "short",
|
||||
MONO_TYPE_U2 : "ushort",
|
||||
MONO_TYPE_I4 : "int",
|
||||
MONO_TYPE_U4 : "uint",
|
||||
MONO_TYPE_I8 : "long",
|
||||
MONO_TYPE_U8 : "ulong",
|
||||
MONO_TYPE_R4 : "float",
|
||||
MONO_TYPE_R8 : "double",
|
||||
MONO_TYPE_STRING : "string"
|
||||
}
|
||||
|
||||
#
|
||||
# Helper functions for working with the lldb python api
|
||||
#
|
||||
|
||||
def member(val, member_name):
|
||||
return val.GetChildMemberWithName (member_name)
|
||||
|
||||
def string_member(val, member_name):
|
||||
return val.GetChildMemberWithName (member_name).GetSummary ()[1:-1]
|
||||
|
||||
def isnull(val):
|
||||
return val.deref.addr.GetOffset () == 0
|
||||
|
||||
def stringify_class_name(ns, name):
|
||||
if ns == "System":
|
||||
if name == "Byte":
|
||||
return "byte"
|
||||
if name == "String":
|
||||
return "string"
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "{0}.{1}".format (ns, name)
|
||||
|
||||
#
|
||||
# Pretty printers for mono runtime types
|
||||
#
|
||||
|
||||
def stringify_type (type):
|
||||
"Print a MonoType structure"
|
||||
ttype = member(type, "type").GetValueAsUnsigned()
|
||||
if primitive_type_names.has_key (ttype):
|
||||
return primitive_type_names [ttype]
|
||||
else:
|
||||
return "<MonoTypeEnum 0x{0:x}>".format (ttype)
|
||||
|
||||
def stringify_ginst (ginst):
|
||||
"Print a MonoGenericInst structure"
|
||||
len = int(member(ginst, "type_argc").GetValue())
|
||||
argv = member(ginst, "type_argv")
|
||||
res=""
|
||||
for i in range(len):
|
||||
t = argv.GetChildAtIndex(i, False, True)
|
||||
if i > 0:
|
||||
res += ", "
|
||||
res += stringify_type(t)
|
||||
return res
|
||||
|
||||
def print_type(valobj, internal_dict):
|
||||
type = valobj
|
||||
if isnull (type):
|
||||
return ""
|
||||
return stringify_type (type)
|
||||
|
||||
def print_class (valobj, internal_dict):
|
||||
klass = valobj
|
||||
if isnull (klass):
|
||||
return ""
|
||||
aname = member (member (member (klass, "image"), "assembly"), "aname")
|
||||
basename = "[{0}]{1}".format (string_member (aname, "name"), (stringify_class_name (string_member (klass, "name_space"), string_member (klass, "name"))))
|
||||
gclass = member (klass, "generic_class")
|
||||
if not isnull (gclass):
|
||||
ginst = member (member (gclass, "context"), "class_inst")
|
||||
return "{0}<{1}>".format (basename, stringify_ginst (ginst))
|
||||
return basename
|
||||
|
||||
def print_method (valobj, internal_dict):
|
||||
method = valobj
|
||||
if isnull (method):
|
||||
return ""
|
||||
klass = member (method, "klass")
|
||||
return "{0}:{1}()".format (print_class (klass, None), string_member (valobj, "name"))
|
||||
|
||||
def print_domain(valobj, internal_dict):
|
||||
domain = valobj
|
||||
if isnull (domain):
|
||||
return ""
|
||||
target = domain.target
|
||||
root = target.FindFirstGlobalVariable("mono_root_domain")
|
||||
name = string_member (domain, "friendly_name")
|
||||
if root.IsValid () and root.deref.addr.GetOffset () == root.deref.addr.GetOffset ():
|
||||
return "[root]"
|
||||
else:
|
||||
return "[{0}]".format (name)
|
||||
|
||||
def print_object(valobj, internal_dict):
|
||||
obj = valobj
|
||||
if isnull (obj):
|
||||
return ""
|
||||
domain = member (member (obj, "vtable"), "domain")
|
||||
klass = member (member (obj, "vtable"), "klass")
|
||||
return print_domain (domain, None) + print_class (klass, None)
|
||||
|
||||
# Register pretty printers
|
||||
# FIXME: This cannot pick up the methods define in this module, leading to warnings
|
||||
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_method MonoMethod")
|
||||
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_class MonoClass")
|
||||
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_type MonoType")
|
||||
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_domain MonoDomain")
|
||||
lldb.debugger.HandleCommand ("type summary add -w mono -F mono.print_object MonoObject")
|
||||
lldb.debugger.HandleCommand ("type category enable mono")
|
||||
|
||||
# Helper commands for runtime debugging
|
||||
# These resume the target
|
||||
# Print the method at the current ip
|
||||
lldb.debugger.HandleCommand ("command alias pip p mono_print_method_from_ip((void*)$pc)")
|
||||
# Print the method at the provided ip
|
||||
lldb.debugger.HandleCommand ("command regex pmip 's/^$/p mono_print_method_from_ip((void*)$pc)/' 's/(.+)/p mono_print_method_from_ip((void*)(%1))/'")
|
||||
|
||||
print "Mono support mode loaded."
|
||||
@@ -143,8 +143,6 @@ public enum Lock {
|
||||
IcallLock,
|
||||
AssemblyBindingLock,
|
||||
MarshalLock,
|
||||
ClassesLock,
|
||||
LoaderGlobalDataLock
|
||||
}
|
||||
|
||||
public class SimLock
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
|
||||
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
|
||||
@@ -14,6 +14,7 @@ ASSEMBLED_DOCS = \
|
||||
EXTRA_DIST = \
|
||||
abc-removal.txt \
|
||||
api-style.css \
|
||||
assembly-bundle \
|
||||
check-exports \
|
||||
check-coverage \
|
||||
convert.cs \
|
||||
@@ -22,6 +23,7 @@ EXTRA_DIST = \
|
||||
docs.make \
|
||||
documented \
|
||||
embedded-api \
|
||||
exceptions \
|
||||
exdoc \
|
||||
file-share-modes \
|
||||
gc-issues \
|
||||
@@ -33,25 +35,33 @@ EXTRA_DIST = \
|
||||
jit-imt \
|
||||
jit-thoughts \
|
||||
jit-trampolines \
|
||||
local-regalloc.txt \
|
||||
magic.diff \
|
||||
mini-doc.txt \
|
||||
mono-api-metadata.html \
|
||||
mono-file-formats.config\
|
||||
mono-file-formats.source\
|
||||
mono_handle_d \
|
||||
mono-tools.config \
|
||||
mono-tools.source \
|
||||
monoapi.source \
|
||||
new-regalloc \
|
||||
object-layout \
|
||||
opcode-decomp.txt \
|
||||
precise-gc \
|
||||
produce-lists \
|
||||
public \
|
||||
public-api \
|
||||
README \
|
||||
release-notes-1.0.html \
|
||||
remoting \
|
||||
ssapre.txt \
|
||||
stack-alignment \
|
||||
stack-overflow.txt \
|
||||
threading \
|
||||
toc.xml \
|
||||
TODO \
|
||||
tree-mover.txt \
|
||||
unmanaged-calls
|
||||
|
||||
dist-hook:
|
||||
|
||||
@@ -0,0 +1,57 @@
|
||||
|
||||
HOWTO bundle assemblies inside the mono runtime.
|
||||
Paolo Molaro ([email protected])
|
||||
|
||||
* Intent
|
||||
|
||||
Bundling assemblies inside the mono runtime may be useful for a number
|
||||
of reasons:
|
||||
|
||||
* creating a standalone complete runtime that can be more easily
|
||||
distributed
|
||||
|
||||
* having an application run against a known set of assemblies
|
||||
that has been tested
|
||||
|
||||
Of course, there are drawbacks, too: if there has been fixes
|
||||
to the assemblies, replacing them means recompiling the
|
||||
runtime as well and if there are other mono apps, unless they
|
||||
use the same mono binary, there will be less opportunities for
|
||||
the operating system to optimize memory usage. So use this
|
||||
feature only when really needed.
|
||||
|
||||
* Creating the Bundle
|
||||
|
||||
To bundle a set of assemblies, you need to create a file that
|
||||
lists the assembly names and the relative files. Empty lines
|
||||
and lines starting with # are ignored:
|
||||
|
||||
== cut cut ==
|
||||
# Sample bundle template
|
||||
mscorlib: /path/to/mscorlib/assembly.dll
|
||||
myapp: /path/to/myapp.exe
|
||||
== cut cut ==
|
||||
|
||||
Next you need to build the mono runtime using a special configure option:
|
||||
|
||||
./configure --with-bundle=/path/to/bundle/template
|
||||
|
||||
The path to the template should be an absolute path.
|
||||
|
||||
The script metadata/make-bundle.pl will take the specifie
|
||||
assemblies and embed them inside the runtime where the loading
|
||||
routines can find them before searching for them on disk.
|
||||
|
||||
* Open Issues
|
||||
|
||||
There are still two issues to solve:
|
||||
|
||||
* config files: sometimes they are needed but they are
|
||||
not yet bundled inside the library ()
|
||||
|
||||
* building with the included libgc makes it not
|
||||
possible to build a mono binary statically linked to
|
||||
libmono: this needs to be fixed to make bundles
|
||||
really useful.
|
||||
|
||||
|
||||
@@ -71,3 +71,40 @@ unwinding code.
|
||||
|
||||
catch handler: catch hanlders are always called from the stack unwinding
|
||||
code. The exception object is passed in a local variable (cfg->exvar).
|
||||
|
||||
gcc support for Exceptions
|
||||
==========================
|
||||
|
||||
gcc supports exceptions in files compiled with the -fexception option. gcc
|
||||
generates DWARF exceptions tables in that case, so it is possible to unwind the
|
||||
stack. The method to read those exception tables is contained in libgcc.a, and
|
||||
in newer versions of glibc (glibc 2.2.5 for example), and it is called
|
||||
__frame_state_for(). Another usable glibc function is backtrace_symbols() which
|
||||
returns the function name corresponding to a code address.
|
||||
|
||||
We dynamically check if those features are available using g_module_symbol(),
|
||||
and we use them only when available. If not available we use the LMF as
|
||||
fallback.
|
||||
|
||||
Using gcc exception information prevents us from saving the LMF at each native
|
||||
call, so this is a way to speed up native calls. This is especially valuable
|
||||
for internal calls, because we can make sure that all internal calls are
|
||||
compiled with -fexceptions (we compile the whole mono runtime with that
|
||||
option).
|
||||
|
||||
All native function are able to call function without exception tables, and so
|
||||
we are unable to restore all caller saved registers if an exception is raised
|
||||
in such function. Well, its possible if the previous function already saves all
|
||||
registers. So we only omit the the LMF if a function has an exception table
|
||||
able to restore all caller saved registers.
|
||||
|
||||
One problem is that gcc almost never saves all caller saved registers, because
|
||||
it is just unnecessary in normal situations. But there is a trick forcing gcc
|
||||
to save all register, we just need to call __builtin_unwind_init() at the
|
||||
beginning of a function. That way gcc generates code to save all caller saved
|
||||
register on the stack.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,208 @@
|
||||
|
||||
* Proposal for the local register allocator
|
||||
|
||||
The local register allocator deals with allocating registers
|
||||
for temporaries inside a single basic block, while the global
|
||||
register allocator is concerned with method-wide allocation of
|
||||
variables.
|
||||
The global register allocator uses callee-saved register for it's
|
||||
purpouse so that there is no need to save and restore these registers
|
||||
at call sites.
|
||||
|
||||
There are a number of issues the local allocator needs to deal with:
|
||||
*) some instructions expect operands in specific registers (for example
|
||||
the shl instruction on x86, or the call instruction with thiscall
|
||||
convention, or the equivalent call instructions on other architectures,
|
||||
such as the need to put output registers in %oX on sparc)
|
||||
*) some instructions deliver results only in specific registers (for example
|
||||
the div instruction on x86, or the call instructionson on almost all
|
||||
the architectures).
|
||||
*) it needs to know what registers may be clobbered by an instruction
|
||||
(such as in a method call)
|
||||
*) it should avoid excessive reloads or stores to improve performance
|
||||
|
||||
While which specific instructions have limitations is architecture-dependent,
|
||||
the problem shold be solved in an arch-independent way to reduce code duplication.
|
||||
The register allocator will be 'driven' by the arch-dependent code, but it's
|
||||
implementation should be arch-independent.
|
||||
|
||||
To improve the current local register allocator, we need to
|
||||
keep more state in it than the current setup that only keeps busy/free info.
|
||||
|
||||
Possible state information is:
|
||||
|
||||
free: the resgister is free to use and it doesn't contain useful info
|
||||
freeable: the register contains data loaded from a local (there is
|
||||
also info about _which_ local it contains) as a result from previous
|
||||
instructions (like, there was a store from the register to the local)
|
||||
moveable: it contains live data that is needed in a following instruction, but
|
||||
the contents may be moved to a different register
|
||||
busy: the register contains live data and it is placed there because
|
||||
the following instructions need it exactly in that register
|
||||
allocated: the register is used by the global allocator
|
||||
|
||||
The local register allocator will have the following interfaces:
|
||||
|
||||
int get_register ();
|
||||
Searches for a register in the free state. If it doesn't find it,
|
||||
searches for a freeable register. Sets the status to moveable.
|
||||
Looking for a 'free' register before a freeable one should allow for
|
||||
removing a few redundant loads (though I'm still unsure if such
|
||||
things should be delegated entirely to the peephole pass).
|
||||
|
||||
int get_register_force (int reg);
|
||||
Returns 'reg' if it is free or freeable. If it is moveable, it moves it
|
||||
to another free or freeable register.
|
||||
Sets the status of 'reg' to busy.
|
||||
|
||||
void set_register_freeable (int reg);
|
||||
Sets the status of 'reg' to freeable.
|
||||
|
||||
void set_register_free (int reg);
|
||||
Sets the status of 'reg' to free.
|
||||
|
||||
void will_clobber (int reg);
|
||||
Spills the register to the stack. Sets the status to freeable.
|
||||
After the clobbering has occurred, set the status to free.
|
||||
|
||||
void register_unspill (int reg);
|
||||
Un-spills register reg and sets the status to moveable.
|
||||
|
||||
FIXME: how is the 'local' information represented? Maybe a MonoInst* pointer.
|
||||
|
||||
Note: the register allocator will insert instructions in the basic block
|
||||
during it's operation.
|
||||
|
||||
* Examples
|
||||
|
||||
Given the tree (on x86 the right argument to shl needs to be in ecx):
|
||||
|
||||
store (local1, shl (local1, call (some_arg)))
|
||||
|
||||
At the start of the basic block, the registers are set to the free state.
|
||||
The sequence of instructions may be:
|
||||
instruction register status -> [%eax %ecx %edx]
|
||||
start free free free
|
||||
eax = load local1 mov free free
|
||||
/* call clobbers eax, ecx, edx */
|
||||
spill eax free free free
|
||||
call mov free free
|
||||
/* now eax contains the right operand of the shl */
|
||||
mov %eax -> %ecx free busy free
|
||||
un-spill mov busy free
|
||||
shl %cl, %eax mov free free
|
||||
|
||||
The resulting x86 code is:
|
||||
mov $fffc(%ebp), %eax
|
||||
mov %eax, $fff0(%ebp)
|
||||
push some_arg
|
||||
call func
|
||||
mov %eax, %ecx
|
||||
mov $fff0(%ebp), %eax
|
||||
shl %cl, %eax
|
||||
|
||||
Note that since shl could operate directly on memory, we could have:
|
||||
|
||||
push some_arg
|
||||
call func
|
||||
mov %eax, %ecx
|
||||
shl %cl, $fffc(%ebp)
|
||||
|
||||
The above example with loading the operand in a register is just to complicate
|
||||
the example and show that the algorithm should be able to handle it.
|
||||
|
||||
Let's take another example with the this-call call convention (the first argument
|
||||
is passed in %ecx).
|
||||
In this case, will_clobber() will be called only on %eax and %edx, while %ecx
|
||||
will be allocated with get_register_force ().
|
||||
Note: when a register is allocated with get_register_force(), it should be set
|
||||
to a different state as soon as possible.
|
||||
|
||||
store (local1, shl (local1, this-call (local1)))
|
||||
|
||||
instruction register status -> [%eax %ecx %edx]
|
||||
start free free free
|
||||
eax = load local1 mov free free
|
||||
/* force load in %ecx */
|
||||
ecx = load local1 mov busy free
|
||||
spill eax free busy free
|
||||
call mov free free
|
||||
/* now eax contains the right operand of the shl */
|
||||
mov %eax -> %ecx free busy free
|
||||
un-spill mov busy free
|
||||
shl %cl, %eax mov free free
|
||||
|
||||
What happens when a register that we need to allocate with get_register_force ()
|
||||
contains an operand for the next instruction?
|
||||
|
||||
instruction register status -> [%eax %ecx %edx]
|
||||
eax = load local0 mov free free
|
||||
ecx = load local1 mov mov free
|
||||
get_register_force (ecx) here.
|
||||
We have two options:
|
||||
mov %ecx, %edx
|
||||
or:
|
||||
spill %ecx
|
||||
The first option is way better (and allows the peephole pass to
|
||||
just load the value in %edx directly, instead of loading first to %ecx).
|
||||
This doesn't work, though, if the instruction clobbers the %edx register
|
||||
(like in a this-call). So, we first need to clobber the registers
|
||||
(so the state of %ecx changes to freebale and there is no issue
|
||||
with get_register_force ()).
|
||||
What if an instruction both clobbers a register and requires it as
|
||||
an operand? Lets' take the x86 idiv instruction as an example: it
|
||||
requires the dividend in edx:eax and returns the result in eax,
|
||||
with the modulus in edx.
|
||||
|
||||
store (local1, div (local1, local2))
|
||||
|
||||
instruction register status -> [%eax %ecx %edx]
|
||||
eax = load local0 mov free free
|
||||
will_clobber eax, edx free mov free
|
||||
force mov %ecx, %eax busy free free
|
||||
set %edx busy free busy
|
||||
idiv mov free free
|
||||
|
||||
Note: edx is set to free after idiv, because the modulus is not needed
|
||||
(if it was a rem, eax would have been freed).
|
||||
If we load the divisor before will_clobber(), we'll have to spill
|
||||
eax and reload it later. If we load it just after the idiv, there is no issue.
|
||||
In any case, the algorithm should give the correct results and allow the operation.
|
||||
|
||||
Working recursively on the isntructions there shouldn't be huge issues
|
||||
with this algorithm (though, of course, it's not optimal and it may
|
||||
introduce excessive spills or register moves). The advantage over the current
|
||||
local reg allocator is that:
|
||||
1) the number of spills/moves would be smaller anyway
|
||||
2) a separate peephole pass could be able to eliminate reg moves
|
||||
3) we'll be able to remove the 'forced' spills we currently do with
|
||||
the return value of method calls
|
||||
|
||||
* Issues
|
||||
|
||||
How to best integrate such a reg allocator with the burg stuff.
|
||||
|
||||
Think about a call os sparc with two arguments: they got into %o0 and %o1
|
||||
and each of them sets the register as busy. But what if the values to put there
|
||||
are themselves the result of a call? %o0 is no problem, but for all the
|
||||
next argument n the above algorithm would spill all the 0...n-1 registers...
|
||||
|
||||
* Papers
|
||||
|
||||
More complex solutions to the local register allocator problem:
|
||||
http://dimacs.rutgers.edu/TechnicalReports/abstracts/1997/97-33.html
|
||||
|
||||
Combining register allocation and instruction scheduling:
|
||||
http://citeseer.nj.nec.com/motwani95combining.html
|
||||
|
||||
More on LRA euristics:
|
||||
http://citeseer.nj.nec.com/liberatore97hardness.html
|
||||
|
||||
Linear-time optimal code scheduling for delayedload architectures
|
||||
http://www.cs.wisc.edu/~fischer/cs701.f01/inst.sched.ps.gz
|
||||
|
||||
Precise Register Allocation for Irregular Architectures
|
||||
http://citeseer.nj.nec.com/kong98precise.html
|
||||
|
||||
Allocate registers first to subtrees that need more of them.
|
||||
http://www.upb.de/cs/ag-kastens/compii/folien/comment401-409.2.pdf
|
||||
@@ -0,0 +1,98 @@
|
||||
=pod
|
||||
|
||||
=head1 Internal design document for the mono_handle_d
|
||||
|
||||
This document is designed to hold the design of the mono_handle_d and
|
||||
not as an api reference.
|
||||
|
||||
=head2 Primary goal and purpose
|
||||
|
||||
The mono_handle_d is a process which takes care of the (de)allocation
|
||||
of scratch shared memory and handles (of files, threads, mutexes,
|
||||
sockets etc. see L<WapiHandleType>) and refcounts of the
|
||||
filehandles. It is designed to be run by a user and to be fast, thus
|
||||
minimal error checking on input is done and will most likely crash if
|
||||
given a faulty package. No effort has been, or should be, made to have
|
||||
the daemon talking to machine of different endianness/size of int.
|
||||
|
||||
=head2 How to start the daemon
|
||||
|
||||
To start the daemon you either run the mono_handle_d executable or try
|
||||
to attach to the shared memory segment via L<_wapi_shm_attach> which
|
||||
will start a daemon if one does not exist.
|
||||
|
||||
=head1 Internal details
|
||||
|
||||
The daemon works by opening a socket and listening to clients. These
|
||||
clients send packages over the socket complying to L<struct
|
||||
WapiHandleRequest>.
|
||||
|
||||
=head2 Possible requests
|
||||
|
||||
=over
|
||||
|
||||
=item WapiHandleRequest_New
|
||||
|
||||
Find a handle in the shared memory segment that is free and allocate
|
||||
it to the specified type. To destroy use
|
||||
L</WapiHandleRequest_Close>. A L<WapiHandleResponse> with
|
||||
.type=WapiHandleResponseType_New will be sent back with .u.new.handle
|
||||
set to the handle that was allocated. .u.new.type is the type that was
|
||||
requested.
|
||||
|
||||
=item WapiHandleRequestType_Open
|
||||
|
||||
Increase the ref count of an already created handle. A
|
||||
L<WapiHandleResponse> with .type=WapiHandleResponseType_Open will be sent
|
||||
back with .u.new.handle set to the handle, .u.new.type is set to the
|
||||
type of handle this is.
|
||||
|
||||
=item WapiHandleRequestType_Close
|
||||
|
||||
Decrease the ref count of an already created handle. A
|
||||
L<WapiHandleResponse> with .type=WapiHandleResponseType_Close will be
|
||||
sent back with .u.close.destroy set to TRUE if ref count for this
|
||||
client reached 0.
|
||||
|
||||
=item WapiHandleRequestType_Scratch
|
||||
|
||||
Allocate a shared memory area of size .u.scratch.length in bytes. A
|
||||
L<WapiHandleResponse> with .type=WapiHandleResponseType_Scratch will be
|
||||
sent back with .u.scratch.idx set to the index into the shared
|
||||
memory's scratch area where to memory begins. (works just like
|
||||
malloc(3))
|
||||
|
||||
=item WapiHandleRequestType_Scratch
|
||||
|
||||
Deallocate a shared memory area, this must have been allocated before
|
||||
deallocating. A L<WapiHandleResponse> with
|
||||
.type=WapiHandleResponseType_ScratchFree will be sent back (works just
|
||||
like free(3))
|
||||
|
||||
=back
|
||||
|
||||
=head1 Why a daemon
|
||||
|
||||
From an email:
|
||||
|
||||
Dennis: I just have one question about the daemon... Why does it
|
||||
exist? Isn't it better performancewise to just protect the shared area
|
||||
with a mutex when allocation a new handle/shared mem segment or
|
||||
changing refcnt? It will however be a less resilient to clients that
|
||||
crash (the deamon cleans up ref'd handles if socket closes)
|
||||
|
||||
Dick: It's precisely because with a mutex the shared memory segment
|
||||
can be left in a locked state. Also, it's not so easy to clean up
|
||||
shared memory without it (you can't just mark it deleted when creating
|
||||
it, because you can't attach any more readers to the same segment
|
||||
after that). I did some minimal performance testing, and I don't
|
||||
think the daemon is particularly slow.
|
||||
|
||||
|
||||
=head1 Authors
|
||||
|
||||
Documentaion: Dennis Haney
|
||||
|
||||
Implementation: Dick Porter
|
||||
|
||||
=cut
|
||||
@@ -0,0 +1,68 @@
|
||||
We need to switch to a new register allocator.
|
||||
The current one is split in a global and a local register allocator.
|
||||
The global one can assign only callee-saves registers and happens
|
||||
on the tree-based internal representation: it assigns local variables
|
||||
to hardware registers.
|
||||
The local one happens on the linear representation on a per basic
|
||||
block basis and assigns hard registers to virtual registers (which
|
||||
hold temporary values during expression executions) and it deals also
|
||||
with the platform-specific issues (fixed registers, call conventions).
|
||||
|
||||
Moving to a different register will help solve some of the performance
|
||||
issues introduced by the above split, make the register more easily
|
||||
portable and solve some of the issues generated by dealing with trees.
|
||||
|
||||
The general design ideas are below.
|
||||
|
||||
The new allocator should have a global view of all the method, so it can be
|
||||
able to assign variables also to some of the volatile registers if possible,
|
||||
even across basic blocks (this would improve performance).
|
||||
|
||||
The allocator would be driven by per-arch declarative data, so porting
|
||||
should be easier: an architecture needs to specify register classes,
|
||||
call convention and instructions requirements (similar to the gcc code).
|
||||
|
||||
The allocator should operate on the linear representation, this way it's
|
||||
easier and faster to track usages more correctly. We need to assign virtual
|
||||
registers on a per-method basis instead of per basic block. We can assign
|
||||
virtual registers to variables, too. Note that since we fix the stack offset
|
||||
of local vars only after this step (which happens after the burg rules are run),
|
||||
some of the burg rules that try to optimize the code won't apply anymore:
|
||||
the peephole code may need to be enhanced to do the optimizations instead.
|
||||
|
||||
We need to handle floating point registers in the global allocator, too.
|
||||
|
||||
The new allocator also needs to keep track precisely of which registers
|
||||
contain references or managed pointers to allow us to move to a precise GC.
|
||||
|
||||
It may be worth to use a single increasing set of integers for the virtual
|
||||
registers, with the class of the register stored separately (unless the
|
||||
current local allocator which keeps interger and fp registers separate).
|
||||
|
||||
Since this is a large task, we need to do it in steps as much as possible.
|
||||
The first is to run the register allocator _after_ the burg rules: this
|
||||
requires a rewrite of the liveness code, too, to use linear indexes instead
|
||||
of basic-block/tree number combinations. This can be done by:
|
||||
*) allocating virtual regs to all the locals that can be register allocated
|
||||
*) running the burg rules (some may require adjustments): the local virtual
|
||||
registers are assigned starting from global-virt-regs+1, instead of the current
|
||||
hardware-regs+1, so we can tell apart global and local virt regs.
|
||||
*) running the liveness/whatever code is needed to allocate the global registers
|
||||
*) allocate the rest of the local variables to stack slots
|
||||
*) continue with the current local allocator
|
||||
|
||||
This work could take 2-3 weeks.
|
||||
|
||||
The next step is to define the kind of declarative data an architecture needs
|
||||
and assigning virtual regs to all the registers and making the allocator
|
||||
assign from the volatile registers, too.
|
||||
Note that some of the code that is currently emitted in the arch-specific
|
||||
code, will need to be emitted as instructions that the reg allocator
|
||||
can inspect: think of a method that returns the first argument which is
|
||||
received in a register: the current code copies it to either a local slot or
|
||||
to a global reg in the prolog an copies it back to the return register
|
||||
int he basic block, but since neither the regallocator nor the peephole code
|
||||
knows about the prolog code, the first store cannot be optimized away.
|
||||
The gcc code has some example of how to specify register classes in a
|
||||
declarative way.
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
|
||||
* How to handle complex IL opcodes in an arch-independent way
|
||||
|
||||
Many IL opcodes are very simple: add, ldind etc.
|
||||
Such opcodes can be implemented with a single cpu instruction
|
||||
in most architectures (on some, a group of IL instructions
|
||||
can be converted to a single cpu op).
|
||||
There are many IL opcodes, though, that are more complex, but
|
||||
can be expressed as a series of trees or a single tree of
|
||||
simple operations. Such simple operations are architecture-independent.
|
||||
It makes sense to decompose such complex IL instructions in their
|
||||
simpler equivalent so that we gain in several ways:
|
||||
*) porting effort is easier, because only the simple instructions
|
||||
need to be implemented in arch-specific code
|
||||
*) we could apply BURG rules to the trees and do pattern matching
|
||||
on them to optimize the expressions according to the host cpu
|
||||
|
||||
The issue is: where do we do such conversion from coarse opcodes to
|
||||
simple expressions?
|
||||
|
||||
* Doing the conversion in method_to_ir ()
|
||||
|
||||
Some of these conversions can certainly be done in method_to_ir (),
|
||||
but it's not always easy to decide which are better done there and
|
||||
which in a different pass.
|
||||
For example, let's take ldlen: in the mono implementation, ldlen
|
||||
can be simply implemented with a load from a fixed position in the
|
||||
array object:
|
||||
|
||||
len = [reg + maxlen_offset]
|
||||
|
||||
However, ldlen carries also semantics information: the result is the
|
||||
length of the array, and since in the CLR arrays are of fixed size,
|
||||
this information can be useful to later do bounds check removal.
|
||||
If we convert this opcode in method_to_ir () we lost some useful
|
||||
information for further optimizations.
|
||||
|
||||
In some other ways, decomposing an opcode in method_to_ir() may
|
||||
allow for better optimizations later on (need to come up with an
|
||||
example here ...).
|
||||
|
||||
* Doing the conversion in inssel.brg
|
||||
|
||||
Some conversion may be done inside the burg rules: this has the
|
||||
disadvantage that the instruction selector is not run again on
|
||||
the resulting expression tree and we could miss some optimization
|
||||
(this is what effectively happens with the coarse opcodes in the old
|
||||
jit). This may also interfere with an efficient local register allocator.
|
||||
It may be possible to add an extension in monoburg that allows a rule
|
||||
such as:
|
||||
|
||||
recheck: LDLEN (reg) {
|
||||
create an expression tree representing LDLEN
|
||||
and return it
|
||||
}
|
||||
|
||||
When the monoburg label process gets back a recheck, it will run
|
||||
the labeling again on the resulting expression tree.
|
||||
If this is possible at all (and in an efficient way) is a
|
||||
question for dietmar:-)
|
||||
It should be noted, though, that this may not always work, since
|
||||
some complex IL opcodes may require a series of expression trees
|
||||
and handling such cases in monoburg could become quite hairy.
|
||||
For example, think of opcode that need to do multiple actions on the
|
||||
same object: this basically means a DUP...
|
||||
On the other end, if a complex opcode needs a DUP, monoburg doesn't
|
||||
actually need to create trees if it emits the instructions in
|
||||
the correct sequence and maintains the right values in the registers
|
||||
(usually the values that need a DUP are not changed...). How
|
||||
this integrates with the current register allocator is not clear, since
|
||||
that assigns registers based on the rule, but the instructions emitted
|
||||
by the rules may be different (this already happens with the current JIT
|
||||
where a MULT is replaced with lea etc...).
|
||||
|
||||
* Doing it in a separate pass.
|
||||
|
||||
Doing the conversion in a separate pass over the instructions
|
||||
is another alternative. This can be done right after method_to_ir ()
|
||||
or after the SSA pass (since the IR after the SSA pass should look
|
||||
almost like the IR we get back from method_to_ir ()).
|
||||
|
||||
This has the following advantages:
|
||||
*) monoburg will handle only the simple opcodes (makes porting easier)
|
||||
*) the instruction selection will be run on all the additional trees
|
||||
*) it's easier to support coarse opcodes that produce multiple expression
|
||||
trees (and apply the monoburg selector on all of them)
|
||||
*) the SSA optimizer will see the original opcodes and will be able to use
|
||||
the semantic info associated with them
|
||||
|
||||
The disadvantage is that this is a separate pass on the code and
|
||||
it takes time (how much has not been measured yet, though).
|
||||
|
||||
With this approach, we may also be able to have C implementations
|
||||
of some of the opcodes: this pass would insert a function call to
|
||||
the C implementation (for example in the cases when first porting
|
||||
to a new arch and implemenating some stuff may be too hard in asm).
|
||||
|
||||
* Extended basic blocks
|
||||
|
||||
IL code needs a lot of checks, bounds checks, overflow checks,
|
||||
type checks and so on. This potentially increases by a lot
|
||||
the number of basic blocks in a control flow graph. However,
|
||||
all such blocks end up with a throw opcode that gives control to the
|
||||
exception handling mechanism.
|
||||
After method_to_ir () a MonoBasicBlock can be considered a sort
|
||||
of extended basic block where the additional exits don't point
|
||||
to basic blocks in the same procedure (at least when the method
|
||||
doesn't have exception tables).
|
||||
We need to make sure the passes following method_to_ir () can cope
|
||||
with such kinds of extended basic blocks (especially the passes
|
||||
that we need to apply to all the methods: as a start, we could
|
||||
skip SSA optimizations for methods with exception clauses...)
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
With this change, we bundle Reactive Extensions from Microsoft.
|
||||
|
||||
Steps to do:
|
||||
|
||||
- Until we add submodule, check out Rx sources from http://rx.codeplex.com:
|
||||
|
||||
$ cd external
|
||||
$ git clone git://github.com/atsushieno/rx.git
|
||||
$ cd rx
|
||||
$ git checkout rx-oss-v1.0
|
||||
$ cd ../..
|
||||
|
||||
Note that the original repo at rx.codeplex.com will *fail* on Linux!
|
||||
codeplex.codeplex.com/workitem/26133
|
||||
Also note that rx.codeplex.com is huge and takes very long time to checkout.
|
||||
|
||||
- expand rx-mono-changes-3.tar.bz2
|
||||
|
||||
$ tar jxvf rx-mono-changes-3.tar.bz2
|
||||
|
||||
- Apply changes to mcs/class/Makefile:
|
||||
|
||||
$ cd mcs/class
|
||||
$ patch -i add-rx-libs.patch -p3
|
||||
$ cd ../..
|
||||
|
||||
Then it should be done.
|
||||
|
||||
Note that this does not include Mono.Reactive.Testing into the build yet -
|
||||
this library depends on nunit.framework.dll but it wouldn't be built before
|
||||
this assembly is built. This needs to be resolved.
|
||||
|
||||
** Current Status
|
||||
|
||||
- We don't have Microsoft.Reactive.Testing.dll. Instead, I created an
|
||||
alternative Mono.Reactive.Testing.dll which *mostly* uses MS sources for
|
||||
that assembly but uses NUnit.Framework instead.
|
||||
|
||||
To make it happen, I added a small script that automatically replaces
|
||||
MSTest dependency parts with that for NUnit (replacer.sh under rx tree).
|
||||
|
||||
(We'll also have to rename namespaces and have more source changes, but
|
||||
so far it is to get things runnable.)
|
||||
|
||||
- To check the build sanity, I imported unit tests (as explained above)
|
||||
and it is supposed to run by "make run-test" in Mono.Reactive.Testing
|
||||
directory (the tests were all in one place in MS tests, so I made it
|
||||
in Mono.Reactive.Testing directory instead).
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
<h1>Mono 1.0 Release Notes</h1>
|
||||
|
||||
<h2>What does Mono Include</h2>
|
||||
|
||||
<h2>Missing functionality</h2>
|
||||
|
||||
<p>COM support.
|
||||
|
||||
<p>EnterpriseServices are non-existant.
|
||||
|
||||
<p>Windows.Forms is only available as a preview, it is not
|
||||
completed nor stable.
|
||||
|
||||
<h3>Assembly: System.Drawing</h3>
|
||||
|
||||
<p>System.Drawing.Printing is not supported.
|
||||
@@ -0,0 +1,33 @@
|
||||
Size and alignment requirements of stack values
|
||||
===============================================
|
||||
|
||||
P ... System.IntPtr
|
||||
I1 ... System.Int8
|
||||
I2 ... System.Int16
|
||||
I4 ... System.Int32
|
||||
I8 ... System.Int64
|
||||
F ... System.Single
|
||||
D ... System.Double
|
||||
LD ... native long double
|
||||
|
||||
-----------------------------------------------------------
|
||||
ARCH | P | I1 | I2 | I4 | I8 | F | D | LD |
|
||||
-----------------------------------------------------------
|
||||
X86 | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 |12/4 |
|
||||
-----------------------------------------------------------
|
||||
X86/W32 | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 |12/4 |
|
||||
-----------------------------------------------------------
|
||||
ARM | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 | 8/4 |
|
||||
-----------------------------------------------------------
|
||||
M68K | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 |12/4 |
|
||||
-----------------------------------------------------------
|
||||
ALPHA | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 |
|
||||
-----------------------------------------------------------
|
||||
SPARC | 4/4 | 4/4 | 4/4 | 4/4 | 8/8 | 4/4 | 8/8 |16/8 |
|
||||
-----------------------------------------------------------
|
||||
SPARC64 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 |16/16|
|
||||
-----------------------------------------------------------
|
||||
MIPS | 4/4 | 4/4 | 4/4 | 4/4 | ?/? | 4/4 | 8/8 | 8/8 |
|
||||
-----------------------------------------------------------
|
||||
| | | | | | | | |
|
||||
-----------------------------------------------------------
|
||||
@@ -0,0 +1,261 @@
|
||||
|
||||
Purpose
|
||||
|
||||
Especially when inlining is active, it can happen that temporary
|
||||
variables add pressure to the register allocator, producing bad
|
||||
code.
|
||||
|
||||
The idea is that some of these temporaries can be totally eliminated
|
||||
my moving the MonoInst tree that defines them directly to the use
|
||||
point in the code (so the name "tree mover").
|
||||
|
||||
Please note that this is *not* an optimization: it is mostly a
|
||||
workaround to issues we have in the regalloc.
|
||||
Actually, with the new linear IR this will not be possible at all
|
||||
(there will be no more trees in the code!).
|
||||
Anyway, this workaround turns out to be useful in the current state
|
||||
of things...
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
Base logic
|
||||
|
||||
If a local is defined by a value which is a proper expression (a tree
|
||||
of MonoInst, not just another local or a constant), and this definition
|
||||
is used only once, the tree can be moved directly to the use location,
|
||||
and the definition eliminated.
|
||||
Of course, none of the variables used in the tree must be defined in
|
||||
the code path between the definition and the use, and the tree must be
|
||||
free of side effects.
|
||||
We do not handle the cases when the tree is just a local or a constant
|
||||
because they are handled by copyprop and consprop, respectively.
|
||||
|
||||
To make things simpler, we restrict the tree move to the case when:
|
||||
- the definition and the use are in the same BB, and
|
||||
- the use is followed by another definition in the same BB (it is not
|
||||
possible that the 1st value is used again), or alternatively there
|
||||
is no BB in the whole CFG that contains a use of this local before a
|
||||
definition (so, again, there is no code path that can lead to a
|
||||
subsequent use).
|
||||
|
||||
To handle this, we maintain an ACT array (Available Copy Tree, similar
|
||||
to the ACP), where we store the "state" of every local.
|
||||
Ideally, every local can be in the following state:
|
||||
[E] Undefined (by a tree, it could be in the ACP but we don't care).
|
||||
[D] Defined (by a tree), and waiting for a use.
|
||||
[U] Used, with a tree definition available in the same BB, but still
|
||||
without a definition following the use (always in the same BB).
|
||||
Of course state [E] (empty) is the initial one.
|
||||
|
||||
Besides, there are two sort of "meta states", or flags:
|
||||
[W] Still waiting for a use or definition in this BB (we have seen no
|
||||
occurrence of the local yet).
|
||||
[X] Used without being previously defined in the same BB (note that if
|
||||
there is a definition that precedes the use in the same BB, even if
|
||||
the definition is not a tree or is not available because of side
|
||||
effects or because the tree value has changed the local is not in
|
||||
state [X]).
|
||||
Also note that state [X] is a sort of "global" condition, which if set
|
||||
in one BB will stay valid for the whole CFG, even if the local will
|
||||
otherwise change state. The idea of flagging a local as [X] is that if
|
||||
there is a definition/use pair that reaches the end of a BB, it could
|
||||
be that there is a CFG path that then leads to the BB flagging it as
|
||||
[X] (which contains a use), so the tree cannot be moved.
|
||||
So state [X] will always be set, and never examined in all the state
|
||||
transitions we will describe.
|
||||
In practice, we use flag [W] to set state [X]: if, when traversing a
|
||||
BB, we find a use for a local in state [W], then that local is flagged
|
||||
[X].
|
||||
|
||||
|
||||
For each BB, we initialize all states to [E] and [W], and then we
|
||||
traverse the code one inst at a time, and update the variable states
|
||||
in the ACT in the following ways:
|
||||
|
||||
[Definition]
|
||||
- Flag [W] is cleared.
|
||||
- All "affected trees" are killed (go from state [D] to [E]).
|
||||
The "affected trees" are the trees which contain (use) the defined
|
||||
local, and the rationale is that the tree value changed, so the
|
||||
tree is no longer available.
|
||||
- If the local was in state [U], *that* tree move is marked "safe"
|
||||
(because *this* definition makes us sure that the previous tree
|
||||
cannot be used again in any way).
|
||||
The idea is that "safe" moves can happen even if the local is
|
||||
flagged [X], because the second definition "covers" the use.
|
||||
The tree move is then saved in the "todo" list (and the affecting
|
||||
nodes are cleared).
|
||||
- If the local was defined by a tree, it goes to state [D], the tree
|
||||
is recorded, and all the locals used in it are marked as "affecting
|
||||
this tree" (of course these markers are lists, because each local
|
||||
could affect more than one tree).
|
||||
|
||||
[IndirectDefinition]
|
||||
- All potentially affected trees (in state [D]) are killed.
|
||||
|
||||
[Use]
|
||||
- If the local is still [W], it is flagged [X] (the [W] goes away).
|
||||
- If the local is in state [D], it goes to state [U].
|
||||
The tree move must not yet be recorded in the "todo" list, it still
|
||||
stays in the ACT slot belonging to this local.
|
||||
Anyway, the "affecting" nodes are updated, because now a definition
|
||||
of a local used in this tree will affect only "indirect" (or also
|
||||
"propagated") moves, but not *this* move (see below).
|
||||
- If the local is in state [U], then the tree cannot be moved (it is
|
||||
used two times): the move is canceled, and the state goes [E].
|
||||
- If the local is in state [E], the use is ignored.
|
||||
|
||||
[IndirectUse]
|
||||
- All potentially affected trees (in state [D] or [U]) are killed.
|
||||
|
||||
[SideEffect]
|
||||
- Tree is marked as "unmovable".
|
||||
|
||||
Then, at the end of the BB, for each ACT slot:
|
||||
- If state is [U], the tree move is recorded in the "todo" list, but
|
||||
flagged "unsafe".
|
||||
- Anyway, state goes to [E], the [W] flag is set, and all "affecting"
|
||||
lists are cleared (we get ready to traverse the next BB).
|
||||
Finally, when all BBs has been scanned, we traverse the "todo" list,
|
||||
moving all "safe" entries, and moving "unsafe" ones only if their ACT
|
||||
slot is not flagged [X].
|
||||
|
||||
So far, so good.
|
||||
But there are two issues that make things harder :-(
|
||||
|
||||
The first is the concept of "indirect tree move".
|
||||
It can happen that a tree is scheduled for moving, and its destination
|
||||
is a use that is located in a second tree, which could also be moved.
|
||||
The main issue is that a definition of a variable of the 1st tree on
|
||||
the path between the definition and the use of the 2nd one must prevent
|
||||
the move.
|
||||
But which move? The 1st or the 2nd?
|
||||
Well, any of the two!
|
||||
The point is, the 2nd move must be prevented *only* if the 1st one
|
||||
happens: if it is aborted (for an [X] flag or any other reason), the
|
||||
2nd move is OK, and vice versa...
|
||||
We must handle this in the following way:
|
||||
- The ACT must still remember if a slot is scheduled for moving in
|
||||
this BB, and if it is, all the locals used in the tree.
|
||||
We say that the slot is in state [M].
|
||||
Note that [M] is (like [X] and [W]) a sort of "meta state": a local
|
||||
is flagged [M] when it goes to state [U], and the flag is cleared
|
||||
when the tree move is cancelled
|
||||
- A tree that uses a local whose slot is in state [M] is also using all
|
||||
the locals used by the tree in state [M], but the use is "indirect".
|
||||
These use nodes are also included in the "affecting" lists.
|
||||
- The definition of a variable used in an "indirect" way has the
|
||||
effect of "linking" the two involved tree moves, saying that only one
|
||||
of the two can happen in practice, but not both.
|
||||
- When the 2nd tree is scheduled for moving, the 1st one is *still* in
|
||||
state [M], because a third move could "carry it forward", and all the
|
||||
*three* moves should be mutually exclusive (to be safe!).
|
||||
|
||||
The second tricky complication is the "tree forwarding" that can happen
|
||||
when copyprop is involved.
|
||||
It is conceptually similar to the "indirect tree move".
|
||||
Only, the 2nd tree is not really a tree, it is just the local defined
|
||||
in the 1st tree move.
|
||||
It can happen that copyprop will propagate the definition.
|
||||
We cannot make treeprop do the same job of copyprop, because copyprop
|
||||
has less constraints, and is therefore more powerful in its scope.
|
||||
The main issue is that treeprop cannot propagate a tree to *two* uses,
|
||||
while copyprop is perfectly capable of propagating one definition to
|
||||
two (or more) different places.
|
||||
So we must let copyprop do its job otherwise we'll miss optimizations,
|
||||
but we must also make it play safe with treeprop.
|
||||
Let's clarify with an example:
|
||||
a = v1 + v2; //a is defined by a tree, state [D], uses v2 and v2
|
||||
b = a; //a is used, state [U] with move scheduled, and
|
||||
//b is defined by a, ACP[b] is a, and b is in state [DC]
|
||||
c = b + v3; // b is used, goes to state [U]
|
||||
The real trouble is that copyprop happens *immediately*, while treeprop
|
||||
is deferred to the end of the CFG traversal.
|
||||
So, in the 3rd statement, the "b" is immediately turned into an "a" by
|
||||
copyprop, regardless of what treeprop will do.
|
||||
Anyway, if we are careful, this is not so bad.
|
||||
First of all, we must "accept" the fact that in the 3rd statement the
|
||||
"b" is in fact an "a", as treeprop must happen *after* copyprop.
|
||||
The real problem is that "a" is used twice: in the 2nd and 3rd lines.
|
||||
In our usual setup, the 2nd line would set it to [U], and the 3rd line
|
||||
would kill the move (and set "a" to [E]).
|
||||
I have tried to play tricks, and reason as of copyprop didn't happen,
|
||||
but everything becomes really messy.
|
||||
Instead, we should note that the 2nd line is very likely to be dead.
|
||||
At least in this BB, copyprop will turn all "b"s into "a"s as long as
|
||||
it can, and when it cannot, it will be because either "a" or "b" have
|
||||
been redefined, which would be after the tree move anyway.
|
||||
So, the reasoning gets different: let's pretend that "b" will be dead.
|
||||
This will make the "a" use in the 2nd statement useless, so there we
|
||||
can "reset" "a" to [D], but also take note that if "b" will end up
|
||||
not being dead, the tree move associated to this [D] must be aborted.
|
||||
We can detect this in the following way:
|
||||
- Either "b" is used before being defined in this BB, or
|
||||
- It will be flagged "unsafe".
|
||||
Both things are very easy to check.
|
||||
The only quirk is that the "affecting" lists must not be cleared when
|
||||
a slot goes to state [U], because a "propagation" could put it back
|
||||
to state [D] (where those lists are needed, because it can be killed
|
||||
by a definition to a used slot).
|
||||
|
||||
-----------------------------------------------------------------------
|
||||
|
||||
Implementation notes
|
||||
|
||||
All the implementation runs inside the existing mono_local_cprop
|
||||
function, and a separate memory pool is used to hold the temporary
|
||||
data.
|
||||
|
||||
A struct, MonoTreeMover, contains the pointers to the pool, the ACT,
|
||||
the list of scheduled moves and auxiliary things.
|
||||
This struct is allocated if the tree move pass is requested, and is
|
||||
then passed along to all the involved functions, which are therefore
|
||||
aware of the tree mover state.
|
||||
|
||||
The ACT is an array of slots, obviously one per local.
|
||||
Each slot is of type MonoTreeMoverActSlot, and contains the used and
|
||||
affected locals, a pointer to the pending tree move and the "waiting"
|
||||
and "unsafe" flags.
|
||||
|
||||
The "affecting" lists a built from "dependency nodes", of type
|
||||
MonoTreeMoverDependencyNode.
|
||||
Each of the nodes contains the used and affected local, and is in
|
||||
two lists: the locals used by a slot, and the locals affected by a
|
||||
slot (obviously a different one).
|
||||
So, each node means: "variable x is used in tree t, so a definition
|
||||
of x affects tree t".
|
||||
The "affecting" lists are doubly linked, to allow for O(1) deletion.
|
||||
The "used" lists are simply linked, but when they are mantained there
|
||||
is always a pointer to the last element to allow for O(1) list moving.
|
||||
When a used list is dismissed (which happens often, any time a node is
|
||||
killed), its nodes are unlinked from their respective affecting lists
|
||||
and are then put in a "free" list in the MonoTreeMover to be reused.
|
||||
|
||||
Each tree move is represented by a struct (MonoTreeMoverTreeMove),
|
||||
which contains:
|
||||
- the definition and use points,
|
||||
- the "affected" moves (recall the concept of "indirect tree move"),
|
||||
- the "must be dead" slots (recall "tree forwarding"). and
|
||||
- a few utility flags.
|
||||
The tree moves stays in the relevant ACT slot until it is ready to be
|
||||
scheduled for moving, at which point it is put in a list in the
|
||||
MonoTreeMover.
|
||||
The tree moves structs are reused when they are killed, so there is
|
||||
also a "free" list for them in the MonoTreeMover.
|
||||
|
||||
The tree mover code has been added to all the relevant functions that
|
||||
participate in consprop and copyprop, particularly:
|
||||
- mono_cprop_copy_values takes care of variable uses (transitions from
|
||||
states [D] to [U] and [U] to [E] because of killing),
|
||||
- mono_cprop_invalidate_values takes care of side effects (indirect
|
||||
accesses, calls...),
|
||||
- mono_local_cprop_bb sets up and cleans the traversals for each BB,
|
||||
and for each MonoInst it takes care of variable definitions.
|
||||
To each of them has been added a MonoTreeMover parameter, which is not
|
||||
NULL if the tree mover is running.
|
||||
After mono_local_cprop_bb has run for all BBs, the MonoTreeMover has
|
||||
the list of all the pending moves, which must be walked to actually
|
||||
perform the moves (when possible, because "unsafe" flags, "affected"
|
||||
moves and "must be dead" slots can still have their effects, which
|
||||
must be handled now because they are fully known only at the end of
|
||||
the CFG traversal).
|
||||
@@ -58,7 +58,7 @@ int mkstemp (char *tmp_template)
|
||||
utf16_template = _wmktemp( utf16_template);
|
||||
if (utf16_template && *utf16_template) {
|
||||
/* FIXME: _O_TEMPORARY causes file to disappear on close causing a test to fail */
|
||||
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_RDWR | _O_EXCL, _S_IREAD | _S_IWRITE);
|
||||
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_EXCL, _S_IREAD | _S_IWRITE);
|
||||
}
|
||||
|
||||
/* FIXME: this will crash if utf16_template == NULL */
|
||||
|
||||
@@ -814,7 +814,6 @@ gboolean g_spawn_command_line_sync (const gchar *command_line, gchar **standard_
|
||||
gboolean g_spawn_async_with_pipes (const gchar *working_directory, gchar **argv, gchar **envp, GSpawnFlags flags, GSpawnChildSetupFunc child_setup,
|
||||
gpointer user_data, GPid *child_pid, gint *standard_input, gint *standard_output, gint *standard_error, GError **error);
|
||||
|
||||
int eg_getdtablesize (void);
|
||||
|
||||
/*
|
||||
* Timer
|
||||
|
||||
@@ -132,7 +132,6 @@ g_assertion_message (const gchar *format, ...)
|
||||
va_start (args, format);
|
||||
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
|
||||
va_end (args);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
|
||||
|
||||
+5
-11
@@ -74,7 +74,7 @@
|
||||
#define NO_INTR(var,cmd) do { (var) = (cmd); } while ((var) == -1 && errno == EINTR)
|
||||
#define CLOSE_PIPE(p) do { close (p [0]); close (p [1]); } while (0)
|
||||
|
||||
#if defined(__APPLE__) && !defined (__arm__) && !defined (__aarch64__)
|
||||
#if defined(__APPLE__) && !defined (__arm__)
|
||||
/* Apple defines this in crt_externs.h but doesn't provide that header for
|
||||
* arm-apple-darwin9. We'll manually define the symbol on Apple as it does
|
||||
* in fact exist on all implementations (so far)
|
||||
@@ -218,8 +218,8 @@ write_all (int fd, const void *vbuf, size_t n)
|
||||
}
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
int
|
||||
eg_getdtablesize (void)
|
||||
static int
|
||||
g_getdtablesize (void)
|
||||
{
|
||||
#ifdef HAVE_GETRLIMIT
|
||||
struct rlimit limit;
|
||||
@@ -232,12 +232,6 @@ eg_getdtablesize (void)
|
||||
return getdtablesize ();
|
||||
#endif
|
||||
}
|
||||
#else
|
||||
int
|
||||
eg_getdtablesize (void)
|
||||
{
|
||||
g_error ("Should not be called");
|
||||
}
|
||||
#endif
|
||||
|
||||
gboolean
|
||||
@@ -283,7 +277,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
close (stderr_pipe [0]);
|
||||
dup2 (stderr_pipe [1], STDERR_FILENO);
|
||||
}
|
||||
for (i = eg_getdtablesize () - 1; i >= 3; i--)
|
||||
for (i = g_getdtablesize () - 1; i >= 3; i--)
|
||||
close (i);
|
||||
|
||||
/* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */
|
||||
@@ -444,7 +438,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
}
|
||||
|
||||
if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) {
|
||||
for (i = eg_getdtablesize () - 1; i >= 3; i--)
|
||||
for (i = g_getdtablesize () - 1; i >= 3; i--)
|
||||
close (i);
|
||||
}
|
||||
|
||||
|
||||
Vendored
-1
Submodule external/binary-reference-assemblies deleted from 7120b21603.
+1
Submodule external/entityframework added at a5faddeca2.
Vendored
+1
-1
Submodule external/ikdasm updated: a3de8ec435...7ded4decb9.
Vendored
+1
-1
Submodule external/ikvm updated: 061a13cc77...22534de209.
+1
Submodule external/reference-assemblies added at 4abf9a74bd.
Vendored
+1
-1
Submodule external/referencesource updated: b27f681369...7dc4e513ea.
+1
-2
@@ -56,7 +56,6 @@ man_MANS = \
|
||||
xsd.1 \
|
||||
mono-configuration-crypto.1 \
|
||||
ccrewrite.1 \
|
||||
cccheck.1 \
|
||||
mono-symbolicate.1
|
||||
cccheck.1
|
||||
|
||||
EXTRA_DIST = $(man_MANS)
|
||||
@@ -20,26 +20,6 @@ revocation lists (CRL) or certificate trust lists (CTL) to/from a
|
||||
certificate store. Certificate stores are used to build and validate
|
||||
certificate chains for Authenticode(r) code signing validation and SSL
|
||||
server certificates.
|
||||
.SH STORES
|
||||
The
|
||||
.I store
|
||||
represents the certificate store to use. It can be one of the
|
||||
following:
|
||||
.TP
|
||||
.I "My"
|
||||
This is the personal certificate store.
|
||||
.TP
|
||||
.I "AddressBook"
|
||||
This is the store for other people.
|
||||
.TP
|
||||
.I "CA"
|
||||
This is a store for intermediate certificate authorities.
|
||||
.TP
|
||||
.I "Trust"
|
||||
This is for trusted roots.
|
||||
.TP
|
||||
.I "Disallowed"
|
||||
This is for untrusted roots
|
||||
.SH ACTIONS
|
||||
.TP
|
||||
.I "-list"
|
||||
|
||||
+4
-4
@@ -358,9 +358,9 @@ gmcs(1), mcs(1), mdb(1), mono(1), pkg-config(1)
|
||||
.SH BUGS
|
||||
To report bugs in the compiler, you must file them on our bug tracking
|
||||
system, at:
|
||||
http://www.mono-project.com/community/bugs/
|
||||
http://www.mono-project.com/Bugs
|
||||
.SH MAILING LIST
|
||||
The Mono Mailing lists are listed at http://www.mono-project.com/community/help/mailing-lists/
|
||||
The Mono Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
|
||||
.SH MORE INFORMATION
|
||||
The Mono C# compiler was developed by Novell, Inc
|
||||
(http://www.novell.com, http) and is based on the
|
||||
@@ -368,5 +368,5 @@ ECMA C# language standard available here:
|
||||
http://www.ecma.ch/ecma1/STAND/ecma-334.htm
|
||||
.PP
|
||||
The home page for the Mono C# compiler is at
|
||||
http://www.mono-project.com/docs/about-mono/languages/csharp/ information about the
|
||||
interactive mode for C# is available in http://mono-project.com/docs/tools+libraries/tools/repl/
|
||||
http://www.mono-project.com/CSharp_Compiler information about the
|
||||
interactive mode for C# is available in http://mono-project.com/CsharpRepl
|
||||
+2
-2
@@ -54,7 +54,7 @@ httpcfg -add -port 8081 -pvk myfile.pvk -cert MyCert
|
||||
For more details on creating the certificate file and the private key,
|
||||
see the following web page:
|
||||
.PP
|
||||
http://www.mono-project.com/docs/web/using-clientcertificates-with-xsp/
|
||||
http://www.mono-project.com/UsingClientCertificatesWithXSP
|
||||
.SH FILES
|
||||
The certificates are stored in the ~/.mono/httplistener directory
|
||||
.SH AUTHOR
|
||||
@@ -72,4 +72,4 @@ Visit http://www.mono-project.com for details
|
||||
The private key format:
|
||||
.nf
|
||||
http://www.drh-consultancy.demon.co.uk/pvk.html
|
||||
.fi
|
||||
.fi
|
||||
@@ -78,7 +78,7 @@ version and publickeytoken.
|
||||
|
||||
.SH MAILING LISTS
|
||||
Mailing lists are listed at the
|
||||
http://www.mono-project.com/community/help/mailing-lists/
|
||||
http://www.mono-project.com/Mailing_Lists
|
||||
.SH WEB SITE
|
||||
http://www.mono-project.com
|
||||
.SH SEE ALSO
|
||||
|
||||
@@ -249,6 +249,29 @@ This will instruct the compiler to reference the System.* libraries
|
||||
available on a typical dotnet framework installation, notice that this
|
||||
does not include all of the Mono libraries, only the System.* ones. This
|
||||
is a convenient shortcut for those porting code.
|
||||
.TP
|
||||
.I \-pkg:olive
|
||||
Use this to reference the "Olive" libraries (the 3.0 and 3.5 extended
|
||||
libraries).
|
||||
.TP
|
||||
.I \-pkg:silver
|
||||
References the assemblies for creating Moonlight/Silverlight
|
||||
applications.
|
||||
.TP
|
||||
.I \-pkg:silverdesktop
|
||||
Use this option to create Moonlight/Silverlight applications that
|
||||
target the desktop. This option allows developers to consume the
|
||||
Silverlight APIs with the full 2.0 profile API available to them,
|
||||
unlike
|
||||
.I smcs
|
||||
it gives full access to all the APIs that are part of Mono. The only
|
||||
downside is that applications created with silverdesktop will not run
|
||||
on the browser. Typically these applications will be launched
|
||||
with the
|
||||
.I mopen
|
||||
command line tool.
|
||||
.TP
|
||||
For more details see the PACKAGE section in this document
|
||||
.ne
|
||||
.RE
|
||||
.TP
|
||||
@@ -515,13 +538,13 @@ csharp(1), mdb(1), mono(1), mopen(1), pkg-config(1), sn(1)
|
||||
.SH BUGS
|
||||
To report bugs in the compiler, you must file them on our bug tracking
|
||||
system, at:
|
||||
http://www.mono-project.com/community/bugs/
|
||||
http://www.mono-project.com/Bugs
|
||||
.SH MAILING LIST
|
||||
The Mono Mailing lists are listed at http://www.mono-project.com/community/help/mailing-lists/
|
||||
The Mono Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
|
||||
.SH MORE INFORMATION
|
||||
The Mono C# compiler was developed by Novell, Inc
|
||||
(http://www.novell.com) and Xamarin Inc (http://www.xamarin.com) is based on the
|
||||
ECMA C# language standard available here:
|
||||
http://www.ecma.ch/ecma1/STAND/ecma-334.htm
|
||||
.PP
|
||||
The home page for the Mono C# compiler is at http://www.mono-project.com/docs/about-mono/languages/csharp/
|
||||
The home page for the Mono C# compiler is at http://www.mono-project.com/CSharp_Compiler
|
||||
+2
-2
@@ -198,7 +198,7 @@ file for a list of PATH values
|
||||
.I //node/@name
|
||||
values).
|
||||
.sp
|
||||
See also: http://www.mono-project.com/docs/tools+libraries/tools/monodoc/generating-documentation/
|
||||
See also: http://www.mono-project.com/Generating_Documentation
|
||||
.TP
|
||||
.I Create your documentation
|
||||
See also the
|
||||
@@ -256,4 +256,4 @@ Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
|
||||
.SH WEB SITE
|
||||
See also: http://www.mono-project.com
|
||||
and
|
||||
http://www.mono-project.com/docs/tools+libraries/tools/mdassembler/
|
||||
http://www.mono-project.com/Assembler
|
||||
+1
-1
@@ -207,4 +207,4 @@ file and looks for referenced documents to create the help source.
|
||||
.TP
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
|
||||
.SH WEB SITE
|
||||
See also: http://www.mono-project.com/docs/tools+libraries/tools/mdoc/
|
||||
See also: http://www.mono-project.com/mdoc
|
||||
@@ -148,4 +148,4 @@ See the \fICREF FORMAT\fR section of \fBmdoc\fR(5) for more information.
|
||||
.TP
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
|
||||
.SH WEB SITE
|
||||
Visit http://www.mono-project.com/docs/tools+libraries/tools/mdoc/ for details
|
||||
Visit http://www.mono-project.com/mdoc for details
|
||||
@@ -34,4 +34,4 @@ Display a help message and exit.
|
||||
.TP
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
|
||||
.SH WEB SITE
|
||||
Visit http://www.mono-project.com/docs/tools+libraries/tools/mdoc/ for details
|
||||
Visit http://www.mono-project.com/mdoc for details
|
||||
+1
-1
@@ -51,4 +51,4 @@ documentation within that directory, recursively), use:
|
||||
.TP
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
|
||||
.SH WEB SITE
|
||||
Visit http://www.mono-project.com/docs/tools+libraries/tools/mdoc/ for details
|
||||
Visit http://www.mono-project.com/mdoc for details
|
||||
+1
-1
@@ -195,4 +195,4 @@ mdoc-validate(1)
|
||||
.TP
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
|
||||
.SH WEB SITE
|
||||
Visit http://www.mono-project.com/docs/tools+libraries/tools/mdoc/ for details
|
||||
Visit http://www.mono-project.com/mdoc for details
|
||||
@@ -11,7 +11,7 @@ longer necessary, but the metadata still is.
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2008 Novell, Inc (http://www.novell.com)
|
||||
.SH MAILING LISTS
|
||||
Mailing lists are listed at http://www.mono-project.com/community/help/mailing-lists/
|
||||
Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
|
||||
.SH LICENSE
|
||||
mono-cil-strip is licensed under the MIT/X11 license. Please read the accompayning
|
||||
MIT.X11 file for details.
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
.\"
|
||||
.\" mono-symbolicate manual page.
|
||||
.\" Copyright 2015 Xamarin
|
||||
.\" Author:
|
||||
.\" Marcos Henrich <[email protected]>
|
||||
.\"
|
||||
.TH "mono-symbolicate" 1
|
||||
.SH NAME
|
||||
mono-symbolicate \- Mono Symbolicate Tool
|
||||
.SH SYNOPSIS
|
||||
.PP
|
||||
.B mono-symbolicate exefile stacktracesfile [directories...]
|
||||
.SH DESCRIPTION
|
||||
mono-symbolicate is a tool that converts a stack trace with <filename unknown>:0
|
||||
into one with file names and line numbers.
|
||||
.PP
|
||||
The output of calling this tool will be the provided
|
||||
.I stacktracesfile
|
||||
where <filename unknown>:0 parts are replaced by
|
||||
a file name and a line number.
|
||||
.PP
|
||||
For the tool to work it needs to load referenced assemblies, it will first look
|
||||
in the same folder as
|
||||
.I exefile
|
||||
then from one of the provided
|
||||
.I directories.
|
||||
.PP
|
||||
The tool assumes that the folder with a referenced assembly called for example
|
||||
name.dll will also include name.dll.mdb,
|
||||
if the referenced assembly is AOT compiled then the tool is also expecting to find
|
||||
name.dll.msym.
|
||||
.SH AUTHOR
|
||||
Written by Marcos Henrich
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2015 Xamarin.
|
||||
.SH MAILING LISTS
|
||||
Visit http://lists.ximian.com/mailman/listinfo/mono-devel-list for details.
|
||||
.SH WEB SITE
|
||||
Visit http://www.mono-project.com for details
|
||||
+1
-1
@@ -78,7 +78,7 @@ specified it reads the standard input. If
|
||||
is not specified, the output is sent to the standard output.
|
||||
.SH MAILING LISTS
|
||||
Mailing lists are listed at the
|
||||
http://www.mono-project.com/community/help/mailing-lists/
|
||||
http://www.mono-project.com/Mailing_Lists
|
||||
.SH WEB SITE
|
||||
http://www.mono-project.com
|
||||
.SH SEE ALSO
|
||||
|
||||
+11
-68
@@ -146,13 +146,6 @@ Defaults to 128.
|
||||
.I nodebug
|
||||
Instructs the AOT compiler to not output any debugging information.
|
||||
.TP
|
||||
.I no-direct-calls
|
||||
This prevents the AOT compiler from generating a direct calls to a
|
||||
method. The AOT compiler usually generates direct calls for certain
|
||||
methods that do not require going through the PLT (for example,
|
||||
methods that are known to not require a hook like a static
|
||||
constructor) or call into simple internal calls.
|
||||
.TP
|
||||
.I dwarfdebug
|
||||
Instructs the AOT compiler to emit DWARF debugging information. When
|
||||
used together with the nodebug option, only DWARF debugging
|
||||
@@ -229,7 +222,7 @@ example, --tool=prefix=arm-linux-gnueabi- will make the AOT compiler run
|
||||
.I write-symbols
|
||||
Instructs the AOT compiler to emit debug symbol information.
|
||||
.PP
|
||||
For more information about AOT, see: http://www.mono-project.com/docs/advanced/aot/
|
||||
For more information about AOT, see: http://www.mono-project.com/AOT
|
||||
.RE
|
||||
.TP
|
||||
\fB--attach=[options]\fR
|
||||
@@ -325,7 +318,7 @@ If the Mono runtime has been compiled with LLVM support (not available
|
||||
in all configurations), Mono will use the LLVM optimization and code
|
||||
generation engine to JIT or AOT compile.
|
||||
.Sp
|
||||
For more information, consult: http://www.mono-project.com/docs/advanced/mono-llvm/
|
||||
For more information, consult: http://www.mono-project.com/Mono_LLVM
|
||||
.TP
|
||||
\fB--nollvm\fR
|
||||
When using a Mono that has been compiled with LLVM support, it forces
|
||||
@@ -408,7 +401,7 @@ e.g. execution of Code Access Security (CAS) or non-CAS demands.
|
||||
.I core-clr
|
||||
Enables the core-clr security system, typically used for
|
||||
Moonlight/Silverlight applications. It provides a much simpler
|
||||
security system than CAS, see http://www.mono-project.com/docs/web/moonlight/
|
||||
security system than CAS, see http://www.mono-project.com/Moonlight
|
||||
for more details and links to the descriptions of this new system.
|
||||
.TP
|
||||
.I validil
|
||||
@@ -744,7 +737,7 @@ shared library `mono-profiler-custom.so'. This profiler module must
|
||||
be on your dynamic linker library path.
|
||||
.PP
|
||||
A list of other third party profilers is available from Mono's web
|
||||
site (www.mono-project.com/docs/advanced/performance-tips/)
|
||||
site (www.mono-project.com/Performance_Tips)
|
||||
.PP
|
||||
Custom profiles are written as shared libraries. The shared library
|
||||
must be called `mono-profiler-NAME.so' where `NAME' is the name of
|
||||
@@ -861,27 +854,6 @@ The following is a common use to track down problems with P/Invoke:
|
||||
|
||||
.fi
|
||||
.PP
|
||||
.SH DEBUGGING WITH LLDB
|
||||
If you are using LLDB, you can use the
|
||||
.B mono.py
|
||||
script to print some internal data structures with it. To use this,
|
||||
add this to your
|
||||
.B $HOME/.lldbinit
|
||||
file:
|
||||
.nf
|
||||
command script import $PREFIX/lib/mono/lldb/mono.py
|
||||
.fi
|
||||
.PP
|
||||
Where $PREFIX is the prefix value that you used when you configured
|
||||
Mono (typically /usr).
|
||||
.PP
|
||||
Once this is done, then you can inspect some Mono Runtime data structures,
|
||||
for example:
|
||||
.nf
|
||||
(lldb) p method
|
||||
|
||||
(MonoMethod *) $0 = 0x05026ac0 [mscorlib]System.OutOfMemoryException:.ctor()
|
||||
.fi
|
||||
.SH SERIALIZATION
|
||||
Mono's XML serialization engine by default will use a reflection-based
|
||||
approach to serialize which might be slow for continuous processing
|
||||
@@ -977,10 +949,6 @@ where V is the architecture number 4, 5, 6, 7 and the options can be currently b
|
||||
|
||||
.fi
|
||||
.TP
|
||||
\fBMONO_ARM_FORCE_SOFT_FLOAT\fR
|
||||
When Mono is built with a soft float fallback on ARM and this variable is set to
|
||||
"1", Mono will always emit soft float code, even if a VFP unit is detected.
|
||||
.TP
|
||||
\fBMONO_DISABLE_AIO\fR
|
||||
If set, tells mono NOT to attempt using native asynchronous I/O services. In
|
||||
that case, a default select/poll implementation is used. Currently only epoll()
|
||||
@@ -1129,16 +1097,9 @@ to 100 percent. A value of 0 turns evacuation off.
|
||||
.TP
|
||||
\fB(no-)lazy-sweep\fR
|
||||
Enables or disables lazy sweep for the Mark&Sweep collector. If
|
||||
enabled, the sweeping of individual major heap blocks is done
|
||||
piecemeal whenever the need arises, typically during nursery
|
||||
collections. Lazy sweeping is enabled by default.
|
||||
.TP
|
||||
\fB(no-)concurrent-sweep\fR
|
||||
Enables or disables concurrent sweep for the Mark&Sweep collector. If
|
||||
enabled, the iteration of all major blocks to determine which ones can
|
||||
be freed and which ones have to be kept and swept, is done
|
||||
concurrently with the running program. Concurrent sweeping is enabled
|
||||
by default.
|
||||
enabled, the sweep phase of the garbage collection is done piecemeal
|
||||
whenever the need arises, typically during nursery collections. Lazy
|
||||
sweeping is enabled by default.
|
||||
.TP
|
||||
\fBstack-mark=\fImark-mode\fR
|
||||
Specifies how application threads should be scanned. Options are
|
||||
@@ -1297,24 +1258,12 @@ work, Mono needs to be compiled with the BINARY_PROTOCOL define on
|
||||
sgen-gc.c. You can then use this command to explore the output
|
||||
.nf
|
||||
sgen-grep-binprot 0x1234 0x5678 < file
|
||||
.fi
|
||||
.TP
|
||||
\fBnursery-canaries\fR
|
||||
If set, objects allocated in the nursery are suffixed with a canary (guard)
|
||||
word, which is checked on each minor collection. Can be used to detect/debug
|
||||
heap corruption issues.
|
||||
|
||||
.TP
|
||||
\fBdo-not-finalize\fR
|
||||
If enabled, finalizers will not be run. Everything else will be
|
||||
unaffected: finalizable objects will still be put into the
|
||||
finalization queue where they survive until they're scheduled to
|
||||
finalize. Once they're not in the queue anymore they will be
|
||||
collected regularly.
|
||||
|
||||
.TP
|
||||
\fBlog-finalizers\fR
|
||||
Log verbosely around the finalization process to aid debugging.
|
||||
.fi
|
||||
.ne
|
||||
.RE
|
||||
.TP
|
||||
@@ -1423,7 +1372,7 @@ libraries side-by-side with the main executable.
|
||||
.Sp
|
||||
For a complete description of recommended practices for application
|
||||
deployment, see
|
||||
http://www.mono-project.com/docs/getting-started/application-deployment/
|
||||
http://www.mono-project.com/Guidelines:Application_Deployment
|
||||
.TP
|
||||
\fBMONO_RTC\fR
|
||||
Experimental RTC support in the statistical profiler: if the user has
|
||||
@@ -1469,12 +1418,6 @@ include "clearlooks", "nice" and "win32".
|
||||
.Sp
|
||||
The default is "win32".
|
||||
.TP
|
||||
\fBMONO_THREAPOOL\fR
|
||||
This environment variable can be used to choose the implementation of
|
||||
the ThreadPool used at runtime. By default this uses the long term
|
||||
Mono threadpool implementation. But a new "microsoft" value switches
|
||||
the threadpool implementation to Microsoft's CoreCLR/ReferenceSource implementation.
|
||||
.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
|
||||
@@ -1813,7 +1756,7 @@ on this subject see the http://www.mono-project.com/Config_system.web
|
||||
page.
|
||||
.SH MAILING LISTS
|
||||
Mailing lists are listed at the
|
||||
http://www.mono-project.com/community/help/mailing-lists/
|
||||
http://www.mono-project.com/Mailing_Lists
|
||||
.SH WEB SITE
|
||||
http://www.mono-project.com
|
||||
.SH SEE ALSO
|
||||
@@ -1822,6 +1765,6 @@ certmgr(1), csharp(1), mcs(1), mdb(1), monocov(1), monodis(1),
|
||||
mono-config(5), mozroots(1), mprof-report(1), pdb2mdb(1), xsp(1), mod_mono(8).
|
||||
.PP
|
||||
For more information on AOT:
|
||||
http://www.mono-project.com/docs/advanced/aot/
|
||||
http://www.mono-project.com/AOT
|
||||
.PP
|
||||
For ASP.NET-related documentation, see the xsp(1) manual page
|
||||
+3
-3
@@ -202,13 +202,13 @@ Specify a parameter for a custom step.
|
||||
.SH COPYRIGHT
|
||||
Copyright (C) 2007 Novell, Inc (http://www.novell.com)
|
||||
.SH BUGS
|
||||
Bugs report are welcome at http://bugzilla.xamarin.com
|
||||
Bugs report are welcome at http://bugzilla.ximian.com
|
||||
.PP
|
||||
Product Mono Tools, Component linker.
|
||||
.SH MAILING LISTS
|
||||
Mailing lists are listed at http://www.mono-project.com/community/help/mailing-lists/
|
||||
Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
|
||||
.SH WEB SITE
|
||||
http://www.mono-project.com/docs/tools+libraries/tools/linker/
|
||||
http://www.mono-project.com/Linker
|
||||
.SH AUTHORS
|
||||
The linker has been written by Jb Evain, and have been partially founded by
|
||||
the Google Summer of Code.
|
||||
|
||||
@@ -30,14 +30,6 @@ Show private members.
|
||||
.TP
|
||||
.I \-\-runtime\-version
|
||||
Print runtime version.
|
||||
.TP
|
||||
.I \-xa
|
||||
Sets the lookup path to the Xamarin.Android directory. This will
|
||||
load both the mscorlib from there, and search assemblies in that directory.
|
||||
.TP
|
||||
.I \-xi
|
||||
Sets the lookup path to the Xamarin.iOS directory. This will
|
||||
load both the mscorlib from there, and search assemblies in that directory.
|
||||
.PP
|
||||
.SH DESCRIPTION
|
||||
Monop is a tool that allows you to view the outline of a class. You can see the
|
||||
|
||||
+1
-1
@@ -170,7 +170,7 @@ manual page for more information on managing certificate stores.
|
||||
Copyright (C) 2005 Novell.
|
||||
.SH MAILING LISTS
|
||||
Mailing lists are listed at the
|
||||
http://www.mono-project.com/community/help/mailing-lists/
|
||||
http://www.mono-project.com/Mailing_Lists
|
||||
.SH WEB SITE
|
||||
http://www.mono-project.com
|
||||
.SH SEE ALSO
|
||||
|
||||
+1
-1
@@ -536,7 +536,7 @@ information, you could use it like this:
|
||||
.PP
|
||||
\f[B]output=|mprof-report\ --reports=monitor\ --traces\ -\f[]
|
||||
.SH WEB SITE
|
||||
http://www.mono-project.com/docs/debug+profile/profile/profiler/
|
||||
http://www.mono-project.com/Profiler
|
||||
.SH SEE ALSO
|
||||
.PP
|
||||
mono(1)
|
||||
|
||||
+1
-1
@@ -518,7 +518,7 @@ licenses are available from Novell or Daniel Morgan.
|
||||
To report bugs in the compiler, you can use `bug-buddy', or you can
|
||||
file bug reports in our bug tracking system:
|
||||
.nf
|
||||
http://bugzilla.xamarin.com.
|
||||
http://bugzilla.ximian.com.
|
||||
.fi
|
||||
.PP
|
||||
.SH MAILING LISTS
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
TestResult-*.log
|
||||
TestResult-*.xml
|
||||
TestResult*.xml
|
||||
.dep_dirs-*
|
||||
errors/*.log
|
||||
errors/dummy.xml
|
||||
class/Mono.Data.Sqlite/test.db
|
||||
|
||||
+59
-3
@@ -12,11 +12,67 @@ monotouch_runtime_SUBDIRS := build class
|
||||
xammac_SUBDIRS := build class
|
||||
mobile_SUBDIRS := build class
|
||||
mobile_static_SUBDIRS := build class
|
||||
binary_reference_assemblies_SUBDIRS := build class
|
||||
net_4_0_SUBDIRS := build class
|
||||
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
|
||||
xbuild_12_SUBDIRS := build class tools/xbuild
|
||||
xbuild_14_SUBDIRS := build class tools/xbuild
|
||||
|
||||
# List of test subdirs that should pass 100%
|
||||
centum_tests := \
|
||||
class/corlib \
|
||||
class/System \
|
||||
class/System.XML \
|
||||
class/Commons.Xml.Relaxng \
|
||||
class/Cscompmgd \
|
||||
class/Mono.Posix \
|
||||
class/Mono.Security \
|
||||
class/System.Design \
|
||||
class/System.DirectoryServices \
|
||||
class/System.Drawing \
|
||||
class/System.Runtime.Remoting \
|
||||
class/System.Runtime.Serialization.Formatters.Soap \
|
||||
class/System.Security \
|
||||
class/System.ServiceProcess \
|
||||
class/System.Web \
|
||||
class/System.Web.Services \
|
||||
tests \
|
||||
errors
|
||||
|
||||
default_centum_tests := \
|
||||
$(centum_tests) \
|
||||
class/System.Data
|
||||
|
||||
net_2_0_centum_tests := \
|
||||
$(centum_tests) \
|
||||
class/System.Core \
|
||||
class/System.Configuration \
|
||||
class/System.Data.DataSetExtensions \
|
||||
class/System.Xml.Linq \
|
||||
class/System.Transactions \
|
||||
class/Microsoft.Build.Framework \
|
||||
class/Microsoft.Build.Utilities \
|
||||
class/Microsoft.Build.Engine \
|
||||
class/System.Runtime.Serialization \
|
||||
class/System.IdentityModel \
|
||||
class/System.ServiceModel \
|
||||
class/System.ServiceModel.Web \
|
||||
class/Mono.C5
|
||||
|
||||
# class/System.Web.Extensions
|
||||
# class/Microsoft.Build.Tasks
|
||||
|
||||
# note that System.Xml.Linq is here to prevent this from being empty
|
||||
net_3_5_centum_tests := \
|
||||
class/System.Xml.Linq
|
||||
|
||||
ifdef ONLY_CENTUM_TESTS
|
||||
TEST_SUBDIRS := $($(PROFILE)_centum_tests)
|
||||
endif
|
||||
|
||||
ifdef TEST_SUBDIRS
|
||||
$(PROFILE)_SUBDIRS := $(TEST_SUBDIRS)
|
||||
endif
|
||||
|
||||
include build/rules.make
|
||||
|
||||
all-recursive $(STD_TARGETS:=-recursive): dir-check platform-check profile-check
|
||||
@@ -30,7 +86,7 @@ dir-check:
|
||||
|
||||
# fun specialty targets
|
||||
|
||||
PROFILES = net_4_5 binary_reference_assemblies xbuild_12 xbuild_14
|
||||
PROFILES = net_4_5 net_4_0 xbuild_12 xbuild_14
|
||||
|
||||
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
|
||||
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
|
||||
@@ -51,7 +107,7 @@ profiles-do--run-test:
|
||||
_boot_ = all clean install
|
||||
$(_boot_:%=profile-do--xbuild_14--%): profile-do--xbuild_14--%: profile-do--net_4_5--%
|
||||
$(_boot_:%=profile-do--xbuild_12--%): profile-do--xbuild_12--%: profile-do--net_4_5--%
|
||||
$(_boot_:%=profile-do--binary_reference_assemblies--%): profile-do--binary_reference_assemblies--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--net_4_0--%): profile-do--net_4_0--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--net_4_5--%): profile-do--net_4_5--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ PLATFORMS = darwin linux win32
|
||||
PROFILES = \
|
||||
basic \
|
||||
build \
|
||||
binary_reference_assemblies \
|
||||
net_4_0 \
|
||||
net_4_5 \
|
||||
xbuild_12 \
|
||||
xbuild_14
|
||||
|
||||
@@ -78,7 +78,6 @@ static class Consts
|
||||
//
|
||||
|
||||
public const string AssemblyI18N = "I18N, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
|
||||
public const string AssemblyMicrosoft_JScript = "Microsoft.JScript, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblyMicrosoft_VisualStudio_Web = "Microsoft.VisualStudio.Web, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
|
||||
|
||||
+1
-11
@@ -7,18 +7,8 @@ static class AssemblyRef
|
||||
internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
|
||||
|
||||
public const string EcmaPublicKey = "b77a5c561934e089";
|
||||
#if NET_2_1
|
||||
public const string FrameworkPublicKeyFull = "0024000004800000940000000602000000240000525341310004000001000100B5FC90E7027F67871E773A8FDE8938C81DD402BA65B9201D60593E96C492651E889CC13F1415EBB53FAC1131AE0BD333C5EE6021672D9718EA31A8AEBD0DA0072F25D87DBA6FC90FFD598ED4DA35E44C398C454307E8E33B8426143DAEC9F596836F97C8F74750E5975C64E2189F45DEF46B2A2B1247ADC3652BF5C308055DA9";
|
||||
public const string FrameworkPublicKeyFull2 = "00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB";
|
||||
#else
|
||||
public const string FrameworkPublicKeyFull = "00000000000000000400000000000000";
|
||||
public const string FrameworkPublicKeyFull2 = "00000000000000000400000000000000";
|
||||
#endif
|
||||
public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
|
||||
|
||||
public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
|
||||
public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
|
||||
public const string SystemData = Consts.AssemblySystem_Data;
|
||||
public const string SystemDesign = Consts.AssemblySystem_Design;
|
||||
public const string SystemDrawing = Consts.AssemblySystem_Drawing;
|
||||
public const string SystemWeb = Consts.AssemblySystem_Web;
|
||||
@@ -51,6 +41,6 @@ static partial class SR
|
||||
|
||||
namespace System.Runtime.CompilerServices
|
||||
{
|
||||
class FriendAccessAllowedAttribute : Attribute
|
||||
class FriendAccessAllowed : Attribute
|
||||
{ }
|
||||
}
|
||||
@@ -23,14 +23,8 @@ class X {
|
||||
return 1;
|
||||
|
||||
var consts = o.GetType ().Assembly.GetType ("Consts");
|
||||
if (consts == null) {
|
||||
// We could be bootraping on cygwin using .net runtime
|
||||
var assembly = o.GetType ().Assembly;
|
||||
if (assembly.GetName ().Version >= new Version (4, 0) && assembly.Location.Contains ("Microsoft.NET"))
|
||||
return 0;
|
||||
|
||||
if (consts == null)
|
||||
return 2;
|
||||
}
|
||||
|
||||
var field = consts.GetField ("MonoVersion");
|
||||
if (field == null)
|
||||
@@ -40,7 +34,7 @@ class X {
|
||||
if (!Version.TryParse (field.GetValue (null) as string, out version))
|
||||
return 4;
|
||||
|
||||
if (version < new Version (3, 8))
|
||||
if (version < new Version (3, 2))
|
||||
return 5;
|
||||
|
||||
return 0;
|
||||
|
||||
@@ -166,6 +166,3 @@ $(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
|
||||
doc-update-local:
|
||||
@:
|
||||
|
||||
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
|
||||
gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
+14
-23
@@ -8,18 +8,6 @@
|
||||
# All the dep files now land in the same directory so we
|
||||
# munge in the library name to keep the files from clashing.
|
||||
|
||||
# The including makefile can set the following variables:
|
||||
# LIB_MCS_FLAGS - Command line flags passed to mcs.
|
||||
# LIB_REFS - This should be a space separated list of assembly names which are added to the mcs
|
||||
# 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_MCS_FLAGS += $(patsubst %,-r:%,$(LIB_REFS))
|
||||
|
||||
sourcefile = $(LIBRARY).sources
|
||||
|
||||
# If the directory contains the per profile include file, generate list file.
|
||||
@@ -78,12 +66,6 @@ else
|
||||
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/
|
||||
endif
|
||||
|
||||
ifdef RESOURCE_STRINGS
|
||||
ifdef BOOTSTRAP_PROFILE
|
||||
MCS_FLAGS_RESOURCE_STRINGS += $(RESOURCE_STRINGS:%=--getresourcestrings:%)
|
||||
endif
|
||||
endif
|
||||
|
||||
#
|
||||
# The bare directory contains the plain versions of System and System.Xml
|
||||
#
|
||||
@@ -97,11 +79,15 @@ secxml_libdir = $(the_libdir_base)secxml
|
||||
|
||||
the_libdir = $(the_libdir_base)$(intermediate)
|
||||
|
||||
ifdef LIBRARY_NEEDS_POSTPROCESSING
|
||||
build_libdir = fixup/$(PROFILE)/
|
||||
else
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
build_libdir = $(the_libdir)tmp/
|
||||
else
|
||||
build_libdir = $(the_libdir)
|
||||
endif
|
||||
endif
|
||||
|
||||
the_lib = $(the_libdir)$(LIBRARY_NAME)
|
||||
build_lib = $(build_libdir)$(LIBRARY_NAME)
|
||||
@@ -257,6 +243,13 @@ dist-local: dist-default
|
||||
for d in . $$subs ; do \
|
||||
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
|
||||
|
||||
ifdef LIBRARY_NEEDS_POSTPROCESSING
|
||||
dist-local: dist-fixup
|
||||
FIXUP_PROFILES = default net_2_0
|
||||
dist-fixup:
|
||||
$(MKINSTALLDIRS) $(distdir)/fixup $(FIXUP_PROFILES:%=$(distdir)/fixup/%)
|
||||
endif
|
||||
|
||||
ifndef LIBRARY_COMPILE
|
||||
LIBRARY_COMPILE = $(CSCOMPILE)
|
||||
endif
|
||||
@@ -279,7 +272,7 @@ endif
|
||||
$(the_lib): $(the_libdir)/.stamp
|
||||
|
||||
$(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) $(MCS_FLAGS_RESOURCE_STRINGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
|
||||
$(Q) $(SN) -R $@ $(LIBRARY_SNK)
|
||||
|
||||
ifdef LIBRARY_USE_INTERMEDIATE_FILE
|
||||
@@ -347,8 +340,9 @@ $(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag
|
||||
## Documentation stuff
|
||||
|
||||
Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE)] $(notdir $(@))";)
|
||||
# net_2_0 is needed because monodoc is only compiled in that profile
|
||||
MDOC_UP =$(Q_MDOC_UP) \
|
||||
MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe \
|
||||
MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe \
|
||||
update --delete -o Documentation/en $(the_lib)
|
||||
|
||||
doc-update-local: $(the_libdir)/.doc-stamp
|
||||
@@ -357,6 +351,3 @@ $(the_libdir)/.doc-stamp: $(the_lib)
|
||||
$(MDOC_UP)
|
||||
@echo "doc-stamp" > $@
|
||||
|
||||
# Need to be here so it comes after the definition of DEP_DIRS/DEP_LIBS
|
||||
gen-deps:
|
||||
@echo "$(DEPS_TARGET_DIR): $(DEP_DIRS) $(DEP_LIBS)" >> $(DEPS_FILE)
|
||||
@@ -18,7 +18,7 @@ endif
|
||||
|
||||
MCS = $(with_mono_path) $(INTERNAL_GMCS)
|
||||
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE -lib:$(topdir)/class/lib/$(PROFILE)
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:BOOTSTRAP_BASIC -nowarn:1699 -d:DISABLE_CAS_USE
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
@@ -65,7 +65,7 @@ do-profile-check: $(depsdir)/.stamp
|
||||
$(MAKE) -s do-profile-check-monolite ; \
|
||||
else \
|
||||
echo "*** The compiler '$(BOOTSTRAP_MCS)' doesn't appear to be usable." 1>&2; \
|
||||
echo "*** You need Mono version 3.8 or better installed to build MCS" 1>&2 ; \
|
||||
echo "*** You need Mono version 3.2 or better installed to build MCS" 1>&2 ; \
|
||||
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
|
||||
echo "*** The version of '$(BOOTSTRAP_MCS)' is: `$(BOOTSTRAP_MCS) --version`." 1>&2 ; \
|
||||
exit 1; fi; fi
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
NO_BUILD = yes
|
||||
NO_TEST = yes
|
||||
@@ -13,7 +13,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES)
|
||||
|
||||
NO_SIGN_ASSEMBLY = yes
|
||||
NO_TEST = yes
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
# -*- makefile -*-
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
FRAMEWORK_VERSION = 4.0
|
||||
XBUILD_VERSION = 4.0
|
||||
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
|
||||
|
||||
NO_BUILD = yes
|
||||
NO_TEST = yes
|
||||
@@ -11,7 +11,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_3_0 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MONO -d:DISABLE_CAS_USE -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 4.5
|
||||
XBUILD_VERSION = 4.0
|
||||
+2
-56
@@ -156,12 +156,6 @@ ifndef PROFILE_SUBDIRS
|
||||
PROFILE_SUBDIRS = $(SUBDIRS)
|
||||
endif
|
||||
|
||||
# These subdirs can be built in parallel
|
||||
PROFILE_PARALLEL_SUBDIRS := $($(PROFILE)_PARALLEL_SUBDIRS)
|
||||
ifndef PROFILE_PARALLEL_SUBDIRS
|
||||
PROFILE_PARALLEL_SUBDIRS = $(PARALLEL_SUBDIRS)
|
||||
endif
|
||||
|
||||
ifndef FRAMEWORK_VERSION_MAJOR
|
||||
FRAMEWORK_VERSION_MAJOR = $(basename $(FRAMEWORK_VERSION))
|
||||
endif
|
||||
@@ -173,57 +167,8 @@ endif
|
||||
list='$(PROFILE_SUBDIRS)'; for d in $$list ; do \
|
||||
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
|
||||
done; \
|
||||
if [ $* = "all" -a -n "$(PROFILE_PARALLEL_SUBDIRS)" ]; then \
|
||||
$(MAKE) do-all-parallel ENABLE_PARALLEL_SUBDIR_BUILD=1 || { final_exit="exit 1"; $$dk; } ; \
|
||||
else \
|
||||
list='$(PROFILE_PARALLEL_SUBDIRS)'; for d in $$list ; do \
|
||||
(cd $$d && $(MAKE) $*) || { final_exit="exit 1"; $$dk; } ; \
|
||||
done; \
|
||||
fi; \
|
||||
$$final_exit
|
||||
|
||||
#
|
||||
# Parallel build support
|
||||
#
|
||||
# The variable $(PROFILE)_PARALLEL_SUBDIRS should be set to the list of directories
|
||||
# which could be built in parallel. These directories are built after the directories in
|
||||
# $(PROFILE)_SUBDIRS.
|
||||
# Parallel building is currently only supported for the 'all' target.
|
||||
#
|
||||
# Each directory's Makefile may define DEP_LIBS and DEP_DIRS to specify the libraries and
|
||||
# directories it depends on.
|
||||
#
|
||||
ifneq ($(PROFILE_PARALLEL_SUBDIRS),)
|
||||
dep_dirs = .dep_dirs-$(PROFILE)
|
||||
$(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
|
||||
# The gen-deps target is in library.make/executable.make so it can pick up
|
||||
# DEP_LIBS/DEP_DIRS
|
||||
|
||||
clean-dep-dir:
|
||||
$(RM) $(dep_dirs)
|
||||
|
||||
clean-local: clean-dep-dir
|
||||
|
||||
ifdef ENABLE_PARALLEL_SUBDIR_BUILD
|
||||
.PHONY: do-all-parallel $(PROFILE_PARALLEL_SUBDIRS)
|
||||
|
||||
do-all-parallel: $(PROFILE_PARALLEL_SUBDIRS)
|
||||
|
||||
$(PROFILE_PARALLEL_SUBDIRS):
|
||||
@set . $$MAKEFLAGS; \
|
||||
cd $@ && $(MAKE)
|
||||
endif
|
||||
|
||||
ifndef DIST_SUBDIRS
|
||||
DIST_SUBDIRS = $(SUBDIRS) $(DIST_ONLY_SUBDIRS)
|
||||
endif
|
||||
@@ -265,5 +210,6 @@ dist-default:
|
||||
## Documentation stuff
|
||||
|
||||
Q_MDOC =$(if $(V),,@echo "MDOC [$(PROFILE)] $(notdir $(@))";)
|
||||
MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
|
||||
# net_2_0 is needed because monodoc is only compiled in that profile
|
||||
MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/$(DEFAULT_PROFILE)$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/class/lib/$(DEFAULT_PROFILE)/mdoc.exe
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -33,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -57,18 +57,18 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -41,6 +41,7 @@ namespace Commons.Xml.Nvdl
|
||||
public override XmlReader CreateValidator (XmlReader reader,
|
||||
XmlResolver resolver)
|
||||
{
|
||||
#if NET_2_0
|
||||
XmlReaderSettings s = new XmlReaderSettings ();
|
||||
s.ValidationType = ValidationType.Schema;
|
||||
// do not allow inline schema and schemaLocation.
|
||||
@@ -49,6 +50,14 @@ namespace Commons.Xml.Nvdl
|
||||
foreach (XmlSchema schema in schemas)
|
||||
s.Schemas.Add (schema);
|
||||
return XmlReader.Create (reader, s);
|
||||
#else
|
||||
XmlValidatingReader xvr =
|
||||
new XmlValidatingReader (reader);
|
||||
xvr.XmlResolver = resolver;
|
||||
foreach (XmlSchema schema in schemas)
|
||||
xvr.Schemas.Add (schema);
|
||||
return xvr;
|
||||
#endif
|
||||
}
|
||||
|
||||
public override bool AddOption (string name, string arg)
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -33,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -93,18 +93,18 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -417,6 +417,7 @@ namespace Commons.Xml.Relaxng.Inference
|
||||
|
||||
private QName InferMergedType (string value, QName typeName)
|
||||
{
|
||||
#if NET_2_0
|
||||
// examine value against specified type and
|
||||
// if unacceptable, then return a relaxed type.
|
||||
|
||||
@@ -435,6 +436,7 @@ namespace Commons.Xml.Relaxng.Inference
|
||||
typeName = st != null ? st.QualifiedName : QName.Empty;
|
||||
}
|
||||
} while (typeName != QName.Empty);
|
||||
#endif
|
||||
return QNameString;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,7 +34,11 @@ using System.IO;
|
||||
using System.Xml;
|
||||
using Commons.Xml.Relaxng;
|
||||
|
||||
#if NET_2_0
|
||||
using NSResolver = System.Xml.IXmlNamespaceResolver;
|
||||
#else
|
||||
using NSResolver = System.Xml.XmlNamespaceManager;
|
||||
#endif
|
||||
|
||||
namespace Commons.Xml.Relaxng.Rnc
|
||||
{
|
||||
@@ -213,6 +217,11 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
{
|
||||
string prefix = String.Empty;
|
||||
if (ns != null && ns != String.Empty) {
|
||||
#if NET_2_0
|
||||
#else
|
||||
// XmlNamespaceManager sucks.
|
||||
ns = nss.NameTable.Add (ns);
|
||||
#endif
|
||||
prefix = nss.LookupPrefix (ns);
|
||||
}
|
||||
if (prefix == null)
|
||||
@@ -269,8 +278,12 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
defaultNamespace);
|
||||
|
||||
if (nsmgr != null) {
|
||||
#if NET_2_0
|
||||
foreach (string s in nsmgr.GetNamespacesInScope (
|
||||
XmlNamespaceScope.All).Keys) {
|
||||
#else
|
||||
foreach (string s in nsmgr) {
|
||||
#endif
|
||||
switch (s) {
|
||||
case "xml":
|
||||
case "xmlns":
|
||||
|
||||
@@ -38,7 +38,11 @@ using System.Xml;
|
||||
using Commons.Xml.Relaxng.Derivative;
|
||||
using Commons.Xml.Relaxng.Rnc;
|
||||
|
||||
#if NET_2_0
|
||||
using NSResolver = System.Xml.IXmlNamespaceResolver;
|
||||
#else
|
||||
using NSResolver = System.Xml.XmlNamespaceManager;
|
||||
#endif
|
||||
|
||||
namespace Commons.Xml.Relaxng
|
||||
{
|
||||
|
||||
@@ -7,8 +7,7 @@ RESOURCE_FILES = resources/relaxng.rng
|
||||
OTHER_RES = $(RESOURCE_FILES)
|
||||
|
||||
LIBRARY = Commons.Xml.Relaxng.dll
|
||||
LIB_REFS = System System.Xml
|
||||
LIB_MCS_FLAGS = /r:$(corlib) \
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
|
||||
$(foreach r, $(OTHER_RES), /resource:$(r),$(notdir $(r)))
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
EXTRA_DISTFILES = \
|
||||
|
||||
@@ -47,7 +47,12 @@ using System.Runtime.CompilerServices;
|
||||
[assembly: AssemblyTrademark("")]
|
||||
[assembly: AssemblyCulture("")]
|
||||
|
||||
#if NET_2_0
|
||||
[assembly: AssemblyVersion("2.6.0.0")]
|
||||
#else
|
||||
// not worrying about the NET_1_0 profile for now.
|
||||
[assembly: AssemblyVersion("0.6.0.0")]
|
||||
#endif
|
||||
|
||||
[assembly: AssemblyDelaySign(true)]
|
||||
[assembly: AssemblyKeyFile ("SharpZipLib.pub")]
|
||||
@@ -7,8 +7,7 @@ LIBRARY_NAME = ICSharpCode.SharpZipLib.dll
|
||||
LIBRARY_COMPAT = yes
|
||||
LIBRARY_SNK = SharpZipLib.key
|
||||
|
||||
LIB_REFS = System System.Xml
|
||||
LIB_MCS_FLAGS = -r:$(corlib)
|
||||
LIB_MCS_FLAGS = -r:$(corlib) -r:System.dll -r:System.Xml.dll
|
||||
NO_TEST = yes
|
||||
EXTRA_DISTFILES = SharpZipLib.pub $(LIBRARY_SNK)
|
||||
|
||||
|
||||
@@ -33,7 +33,9 @@ using System.Reflection;
|
||||
using System.Resources;
|
||||
using System.Diagnostics;
|
||||
using System.Runtime.CompilerServices;
|
||||
#if NET_2_0
|
||||
using System.Runtime.ConstrainedExecution;
|
||||
#endif
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
// General Information about the cscompmgd assembly
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -33,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -60,18 +60,18 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -3,8 +3,7 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = Cscompmgd.dll
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = /r:$(corlib)
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
|
||||
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -nowarn:219 -nowarn:169
|
||||
LIBRARY_NAME = cscompmgd.dll
|
||||
|
||||
|
||||
@@ -36,7 +36,9 @@ using System.Text.RegularExpressions;
|
||||
|
||||
namespace Microsoft.CSharp {
|
||||
|
||||
#if NET_2_0
|
||||
[System.Obsolete]
|
||||
#endif
|
||||
public class Compiler {
|
||||
|
||||
private Compiler()
|
||||
|
||||
@@ -32,7 +32,9 @@ using System.Text;
|
||||
|
||||
namespace Microsoft.CSharp {
|
||||
|
||||
#if NET_2_0
|
||||
[System.Obsolete]
|
||||
#endif
|
||||
public class CompilerError {
|
||||
|
||||
public ErrorLevel ErrorLevel;
|
||||
|
||||
@@ -29,7 +29,9 @@
|
||||
|
||||
namespace Microsoft.CSharp {
|
||||
|
||||
#if NET_2_0
|
||||
[System.Obsolete]
|
||||
#endif
|
||||
public enum ErrorLevel {
|
||||
None,
|
||||
Warning,
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -33,7 +33,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -61,18 +61,18 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -3,8 +3,7 @@ SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = CustomMarshalers.dll
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = /r:$(corlib)
|
||||
LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll
|
||||
NO_TEST = yes
|
||||
|
||||
include ../../build/library.make
|
||||
@@ -0,0 +1,187 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{D1081004-B9C0-4982-BA68-EB5999440ACD}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_5</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>
|
||||
</RootNamespace>
|
||||
<AssemblyName>EntityFramework.SqlServer</AssemblyName>
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../ecma.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</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>
|
||||
<AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DbGeographyAdapter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DbGeometryAdapter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\DefaultSqlExecutionStrategy.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Expressions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\GlobalSuppressions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\IDbSpatialValue.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\IDbSpatialValueExtensionMethods.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\AssemblyVersion.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\InternalsVisibleTo.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Properties\Resources.SqlServer.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureDbConfiguration.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureExecutionStrategy.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlAzureRetriableExceptionDetector.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlDdlBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlExecutionStrategyResolver.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\BoolWrapper.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\DmlSqlGenerator.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\ISqlFragment.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\JoinSymbol.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\OptionalColumn.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Sql8ConformanceChecker.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Sql8ExpressionRewriter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlFunctionCallHandler.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlGenerator.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlSelectClauseBuilder.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlSelectStatement.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SqlWriter.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\Symbol.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolPair.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolTable.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\SymbolUsageManager.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlGen\TopClause.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderManifest.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderServices.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlProviderUtilities.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialDataReader.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialServices.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlSpatialServicesForConversions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlTypesAssembly.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlTypesAssemblyLoader.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlVersion.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\SqlVersionUtils.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\Check.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\DbExpressionExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\DebugCheck.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\EdmFunctionExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\FuncExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\IDictionaryExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\MetdataItemExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\PrimitiveTypeExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\SqlDataReaderWrapper.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\EntityFramework.SqlServer\Utilities\TypeUsageExtensions.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\SharedAssemblyInfo.cs" />
|
||||
<Compile Include="..\..\..\external\entityframework\src\SharedAssemblyVersionInfo.cs" />␍ </ItemGroup>
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
<Target Name="BeforeBuild">
|
||||
</Target>
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="../corlib/corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Name>corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System/System-net_4_5.csproj">
|
||||
<Project>{FFAC0B73-D997-493B-9C62-27656CD858BB}</Project>
|
||||
<Name>System-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.XML/System.Xml-net_4_5.csproj">
|
||||
<Project>{2951DEC2-4393-4A78-83F9-42EB39CB708F}</Project>
|
||||
<Name>System.Xml-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.Core/System.Core-net_4_5.csproj">
|
||||
<Project>{D92530F4-3F2B-4351-BD21-9D6BEE6D2A4E}</Project>
|
||||
<Name>System.Core-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../EntityFramework/EntityFramework-net_4_5.csproj">
|
||||
<Project>{CEE31F03-087E-4164-BBD4-990759B40C3E}</Project>
|
||||
<Name>EntityFramework-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="../System.Data/System.Data-net_4_5.csproj">
|
||||
<Project>{9A33954F-57A8-4D75-B1D8-0F81808A0DD4}</Project>
|
||||
<Name>System.Data-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<EmbeddedResource Include="System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources">
|
||||
<LogicalName>System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl">
|
||||
<LogicalName>System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
../../../external/entityframework/src/SharedAssemblyInfo.cs
|
||||
../../../external/entityframework/src/SharedAssemblyVersionInfo.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/DbGeographyAdapter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/DbGeometryAdapter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/DefaultSqlExecutionStrategy.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Expressions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/GlobalSuppressions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/IDbSpatialValue.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/IDbSpatialValueExtensionMethods.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/AssemblyVersion.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/InternalsVisibleTo.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Properties/Resources.SqlServer.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureDbConfiguration.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureExecutionStrategy.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlAzureRetriableExceptionDetector.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlDdlBuilder.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlExecutionStrategyResolver.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/BoolWrapper.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/DmlSqlGenerator.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialServicesForConversions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlTypesAssemblyLoader.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlVersionUtils.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/Check.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/SqlDataReaderWrapper.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/DbExpressionExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/DebugCheck.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/EdmFunctionExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/MetdataItemExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/FuncExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/IDictionaryExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/ISqlFragment.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/JoinSymbol.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/OptionalColumn.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Sql8ConformanceChecker.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Sql8ExpressionRewriter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlBuilder.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlFunctionCallHandler.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlGenerator.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlSelectClauseBuilder.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlSelectStatement.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SqlWriter.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/Symbol.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolPair.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolTable.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/SymbolUsageManager.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlGen/TopClause.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderManifest.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderServices.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlProviderUtilities.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialDataReader.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlSpatialServices.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlTypesAssembly.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/SqlVersion.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/PrimitiveTypeExtensions.cs
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Utilities/TypeUsageExtensions.cs
|
||||
@@ -0,0 +1,28 @@
|
||||
thisdir = class/EntityFramework.SqlServer
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = EntityFramework.SqlServer.dll
|
||||
|
||||
System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources: ../../../external/entityframework/src/EntityFramework.SqlServer/Properties/Resources.SqlServer.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
|
||||
RESOURCES = \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.ProviderManifest.xml \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinition_Sql8.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaDefinitionVersion3_Sql8.ssdl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMapping.msl \
|
||||
../../../external/entityframework/src/EntityFramework.SqlServer/Resources/System/Data/SqlClient/System.Data.Resources.SqlClient.SqlProviderServices.StoreSchemaMappingVersion3.msl
|
||||
|
||||
|
||||
LIB_MCS_FLAGS = -r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:EntityFramework.dll -r:System.Data.dll \
|
||||
-keyfile:../ecma.pub -delaysign -warn:1 \
|
||||
-resource:System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources \
|
||||
$(RESOURCES:%=-resource:%)
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
$(the_lib): System.Data.Entity.SqlServer.Properties.Resources.SqlServer.resources
|
||||
@@ -0,0 +1 @@
|
||||
System.Data.Resources.EntityStoreSchemaGenerator.xsd
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,50 @@
|
||||
thisdir = class/EntityFramework
|
||||
SUBDIRS =
|
||||
include ../../build/rules.make
|
||||
|
||||
LIBRARY = EntityFramework.dll
|
||||
|
||||
System.Data.Entity.Properties.Resources.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
System.Data.Entity.Properties.Resources.Migrate.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.Migrate.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
System.Data.Entity.Properties.Resources.PowerShell.resources: ../../../external/entityframework/src/EntityFramework/Properties/Resources.PowerShell.resx
|
||||
$(RESGEN) "$<" "$@"
|
||||
|
||||
RESOURCES = ../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.DbProviderServices.ConceptualSchemaDefinition.csdl \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.DbProviderServices.ConceptualSchemaDefinitionVersion3.csdl \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/System.Data.Resources.ProviderServices.ProviderManifest.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.AnnotationSchema.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CodeGenerationSchema.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_1.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_1_1.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_2.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.CSDLSchema_3.xsd \
|
||||
System.Data.Resources.EntityStoreSchemaGenerator.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema_2.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/System.Data.Resources.SSDLSchema_3.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_1.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_2.xsd \
|
||||
../../../external/entityframework/src/EntityFramework/Resources/System/Data/MappingSpecification/System.Data.Resources.CSMSL_3.xsd
|
||||
|
||||
LIB_MCS_FLAGS = -r:System.Data.dll -r:System.Transactions.dll -r:System.Xml.Linq.dll -r:System.Configuration.dll -r:System.ComponentModel.DataAnnotations.dll -r:System.Runtime.Serialization.dll \
|
||||
-r:System.dll -r:System.Xml.dll -r:System.Core.dll -r:Microsoft.CSharp.dll -keyfile:../ecma.pub -delaysign -warn:1 \
|
||||
-resource:System.Data.Entity.Properties.Resources.resources \
|
||||
-resource:System.Data.Entity.Properties.Resources.Migrate.resources \
|
||||
-resource:System.Data.Entity.Properties.Resources.PowerShell.resources \
|
||||
$(RESOURCES:%=-resource:%)
|
||||
|
||||
CLEAN_FILES = System.Data.Resources.EntityStoreSchemaGenerator.xsd
|
||||
|
||||
System.Data.Resources.EntityStoreSchemaGenerator.xsd:
|
||||
cp ../../../external/entityframework/src/EntityFramework/Resources/System/Data/EntityModel/system.data.resources.entitystoreschemagenerator.xsd System.Data.Resources.EntityStoreSchemaGenerator.xsd
|
||||
|
||||
include ../../build/library.make
|
||||
|
||||
$(the_lib): System.Data.Resources.EntityStoreSchemaGenerator.xsd \
|
||||
System.Data.Entity.Properties.Resources.resources \
|
||||
System.Data.Entity.Properties.Resources.Migrate.resources \
|
||||
System.Data.Entity.Properties.Resources.PowerShell.resources
|
||||
@@ -51,4 +51,4 @@ doc-update-local:
|
||||
@echo "not doing docs"
|
||||
|
||||
doc-update-recursive:
|
||||
@echo "do not recurse the Facades folder"
|
||||
@echo "do not recurse the Facades folder"
|
||||
@@ -11,8 +11,7 @@ LIBRARY = System.Collections.Concurrent.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_REFS = System
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
+19
-19
@@ -19,19 +19,19 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -39,7 +39,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -61,18 +61,18 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
@@ -11,8 +11,7 @@ LIBRARY = System.Collections.dll
|
||||
|
||||
KEY_FILE = ../../msfinal.pub
|
||||
SIGN_FLAGS = /delaysign /keyfile:$(KEY_FILE) /nowarn:1616,1699
|
||||
LIB_REFS = System System.Core
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib
|
||||
LIB_MCS_FLAGS = $(SIGN_FLAGS) /r:mscorlib /r:System /r:System.Core
|
||||
|
||||
PLATFORM_DEBUG_FLAGS =
|
||||
|
||||
|
||||
@@ -19,19 +19,19 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
<PropertyGroup>
|
||||
<SignAssembly>true</SignAssembly>
|
||||
<DelaySign>true</DelaySign>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<AssemblyOriginatorKeyFile>../../msfinal.pub</AssemblyOriginatorKeyFile>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<Optimize>false</Optimize>
|
||||
<DefineConstants>DEBUG;TRACE;NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>DEBUG;TRACE;NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -39,7 +39,7 @@
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<NoWarn>1699,1616,1699</NoWarn>
|
||||
<Optimize>true</Optimize>
|
||||
<DefineConstants>NET_4_0;NET_4_5;MONO;DISABLE_CAS_USE</DefineConstants>
|
||||
<DefineConstants>NET_1_1;NET_2_0;NET_3_0;NET_3_5;NET_4_0;NET_4_5</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
</PropertyGroup>
|
||||
@@ -61,18 +61,18 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
|
||||
Loaded 100 of 9360 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user