mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-17 19:10:23 -10:00
Compare commits
45
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b1e8599fb7 | ||
|
|
508e0a51cd | ||
|
|
e299219c3f | ||
|
|
36bff327c2 | ||
|
|
52ebfc6a5f | ||
|
|
21ba0055dd | ||
|
|
8497d797c1 | ||
|
|
2298db1166 | ||
|
|
8cfb2d6f14 | ||
|
|
0e5bfe7b13 | ||
|
|
9d8808f2e5 | ||
|
|
1fd9a5edae | ||
|
|
e317d346fb | ||
|
|
0a3328e8ab | ||
|
|
0ce68d6fec | ||
|
|
e486a575f6 | ||
|
|
176bfbc462 | ||
|
|
3555e32abd | ||
|
|
57ec3d8d41 | ||
|
|
81d238e2fc | ||
|
|
3a3cf737c3 | ||
|
|
d15c11b038 | ||
|
|
5c2959f9d0 | ||
|
|
8300404024 | ||
|
|
7bfa0c1771 | ||
|
|
5795ec2676 | ||
|
|
9bea602094 | ||
|
|
c773bf31dc | ||
|
|
0531c65cc8 | ||
|
|
1b62dca6cc | ||
|
|
0a425af914 | ||
|
|
472bc7bfa5 | ||
|
|
7c274c477d | ||
|
|
1bb562b8d5 | ||
|
|
3901f01875 | ||
|
|
cf7d241aab | ||
|
|
40f92d5cb6 | ||
|
|
0895a37089 | ||
|
|
5b8ba7e3ca | ||
|
|
0c35cf5ef0 | ||
|
|
d2a1623a18 | ||
|
|
cb725ff9de | ||
|
|
50f293135f | ||
|
|
11e1a399ac | ||
|
|
61740f8417 |
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
||||
# ensure LF endings on all checkouts
|
||||
configure.ac crlf=input
|
||||
configure.in crlf=input
|
||||
|
||||
# ensure native line endings on checkout
|
||||
*.c crlf
|
||||
|
||||
@@ -79,7 +79,6 @@ releases
|
||||
stamp-h
|
||||
stamp-h1
|
||||
stamp-h.in
|
||||
/test-driver
|
||||
*~
|
||||
*.swp
|
||||
*.o
|
||||
|
||||
@@ -22,6 +22,3 @@
|
||||
[submodule "external/Lucene.Net"]
|
||||
path = external/Lucene.Net
|
||||
url = git://github.com/mono/lucene.net.git
|
||||
[submodule "external/ikdasm"]
|
||||
path = external/ikdasm
|
||||
url = git://github.com/mono/ikdasm.git
|
||||
+12
-47
@@ -1,3 +1,4 @@
|
||||
|
||||
Guidelines
|
||||
==========
|
||||
|
||||
@@ -5,7 +6,7 @@ When contributing to the Mono project, please follow the [Mono Coding
|
||||
Guidelines][1]. We have been using a coding style for many years,
|
||||
please make your patches conform to these guidelines.
|
||||
|
||||
[1] http://www.mono-project.com/community/contributing/coding-guidelines/
|
||||
[1] http://www.mono-project.com/Coding_Guidelines
|
||||
|
||||
Etiquette
|
||||
=========
|
||||
@@ -31,54 +32,18 @@ file in this directory.
|
||||
|
||||
When contributing code, make sure that your contribution falls under
|
||||
the appropriate license. For example, contributions to code licensed
|
||||
under MIT/X11 code, should be MIT/X11 code.
|
||||
under MIT X11 code, should be MIT X11 code.
|
||||
|
||||
The runtime (`mono/...`) is a special case. The code is dual-licensed
|
||||
by Xamarin under both the GNU LGPL v2 license and is also available
|
||||
under commercial terms. For the runtime, you should either sign an
|
||||
The Runtime is a special case. The code is dual licensed by Xamarin
|
||||
under both the GNU LGPL v2 license and is also available under
|
||||
commercial terms. For the runtime, you should either sign an
|
||||
agreement that grants Xamarin the rights to relicense your code under
|
||||
other licenses other than the LGPL v2 or your contribution must be
|
||||
made as an MIT/X11 license which grants us the same rights, but
|
||||
involves no paperwork. For the latter case, please specify on your
|
||||
commit(s) that you are licensing the changes under MIT/X11.
|
||||
made as an MIT X11 license which grants us the same rights, but
|
||||
involves no paperwork.
|
||||
|
||||
For other parts of the project that are dual-licensed, please state
|
||||
on your commit(s) what license you are contributing the changes under.
|
||||
Submitting Patches
|
||||
==================
|
||||
|
||||
Testing
|
||||
=======
|
||||
|
||||
Pull requests go through testing on our [Jenkins server][2]. We will
|
||||
usually only merge a pull request if it causes no regressions in a
|
||||
test run there.
|
||||
|
||||
When you submit a pull request, one of two things happens:
|
||||
|
||||
* If you are a new contributor, Jenkins will ask for permissions (on
|
||||
the pull request) to test it. A maintainer will reply to approve
|
||||
the test run if they find the patch appropriate. After you have
|
||||
submitted a few patches, a maintainer will whitelist you so that
|
||||
all of your future pull requests are tested automatically.
|
||||
* If you are a well-known, whitelisted contributor, Jenkins will go
|
||||
ahead and test your pull request as soon as a test machine is
|
||||
available.
|
||||
|
||||
When your pull request has been built, Jenkins will update the build
|
||||
status of your pull request. If it succeeded and we like the changes,
|
||||
a maintainer will likely merge it. Otherwise, you can amend your pull
|
||||
request to fix build breakage and Jenkins will test it again.
|
||||
|
||||
[2] http://jenkins.mono-project.com/
|
||||
|
||||
# Inactivity
|
||||
|
||||
Occasionally, a pull request sits for several months without any
|
||||
response from the author. This isn't necessarily an issue, but we may
|
||||
sometimes decide to close pull requests that have not seen any
|
||||
progress for a long time. This is in interest of keeping the pull
|
||||
request list clean so that other pull requests don't get lost in the
|
||||
clutter.
|
||||
|
||||
If we do close your pull request due to inactivity, you're more than
|
||||
welcome to submit it anew after you address any comments or issues that
|
||||
were brought up on the original pull request.
|
||||
When Submitting patches to the dual-licensed portions, please specify
|
||||
on the commit the license that the code is under.
|
||||
+5
-15
@@ -1,28 +1,22 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
|
||||
if CROSS_COMPILING
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
|
||||
# Keep in sync with SUBDIRS
|
||||
## 'tools' is not normally built
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
|
||||
else
|
||||
if ONLY_MONOTOUCH
|
||||
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
|
||||
else
|
||||
if ONLY_XAMMAC
|
||||
SUBDIRS = $(libgc_dir) eglib/src mono runtime
|
||||
else
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
|
||||
# Keep in sync with SUBDIRS
|
||||
## 'tools' is not normally built
|
||||
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
all: update_submodules
|
||||
|
||||
@@ -50,11 +44,7 @@ GIT_DIR ?= $(srcdir)/.git
|
||||
dist-hook:
|
||||
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
|
||||
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll'`
|
||||
cp mcs/class/lib/basic/System.Configuration.dll mcs/class/lib/monolite/
|
||||
cp mcs/class/lib/basic/System.Security.dll mcs/class/lib/monolite/
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
|
||||
# Disable this for now because it is very slow and causes wrench to timeout:
|
||||
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
|
||||
|
||||
@@ -166,9 +156,9 @@ package-inputs:
|
||||
done
|
||||
echo "</root>" >> msvc/scripts/order.xml
|
||||
|
||||
# Update llvm version in configure.ac to the output of $LLVM_DIR/bin/llvm-config --version
|
||||
# Update llvm version in configure.in to the output of $LLVM_DIR/bin/llvm-config --version
|
||||
update-llvm-version:
|
||||
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
|
||||
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.ac > tmp && mv tmp configure.ac && echo "Version set to $$REV."
|
||||
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.in > tmp && mv tmp configure.in && echo "Version set to $$REV."
|
||||
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
Mono is a software platform designed to allow developers to easily create cross platform applications.
|
||||
Mono is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
|
||||
|
||||
[](http://jenkins.mono-project.com/job/test-mono-mainline/)
|
||||
|
||||
1. [Installation](#compilation-and-installation)
|
||||
2. [Using Mono](#using-mono)
|
||||
3. [Directory Roadmap](#directory-roadmap)
|
||||
4. [Contributing to Mono] (#contributing-to-mono)
|
||||
5. [Git submodules maintenance](#git-submodules-maintenance)
|
||||
6. [Reporting bugs](#reporting-bugs)
|
||||
4. [Git submodules maintenance](#git-submodules-maintenance)
|
||||
5. [Reporting bugs](#reporting-bugs)
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@@ -36,10 +33,6 @@ a. Build Requirements
|
||||
* libzlib - This library and the development headers are required for compression
|
||||
file support in the 2.0 profile.
|
||||
|
||||
4. Mono is required to build Mono. Use a system package or monolite (explained further below)
|
||||
|
||||
5. If you have a system Mono (not monolite), you will need to read this: http://mono-project.com/Parallel_Mono_Environments#Setting_up_a_Build_Environment
|
||||
|
||||
b. Building the Software
|
||||
------------------------
|
||||
|
||||
@@ -90,13 +83,10 @@ For people with non-standard installations of the auto* utils and of
|
||||
pkg-config (common on misconfigured OSX and windows boxes), you could get
|
||||
an error like this:
|
||||
|
||||
./configure: line 19176: syntax error near unexpected token 'PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
|
||||
`./configure: line 19176: syntax error near unexpected token 'PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...`
|
||||
|
||||
This means that you need to set the ACLOCAL_FLAGS environment variable
|
||||
when invoking autogen.sh, like this:
|
||||
|
||||
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/local
|
||||
|
||||
when invoking autogen.sh, like this: `ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/local`
|
||||
where $acprefix is the prefix where aclocal has been installed.
|
||||
This will automatically go into the mcs/ tree and build the
|
||||
binaries there.
|
||||
@@ -107,7 +97,7 @@ runtime called 'mono'. You can use two make variables
|
||||
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
|
||||
can say:
|
||||
|
||||
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
|
||||
`make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono`
|
||||
|
||||
If you don't have a working Mono installation
|
||||
---------------------------------------------
|
||||
@@ -146,7 +136,7 @@ class libraries, you need to re-run 'configure' with the
|
||||
Expect to find a few test suite failures. As a sanity check, you
|
||||
can compare the failures you got with
|
||||
|
||||
https://wrench.mono-project.com/Wrench/
|
||||
`https://wrench.mono-project.com/Wrench/`
|
||||
|
||||
You can now install mono with: `make install`
|
||||
|
||||
@@ -163,9 +153,10 @@ 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.
|
||||
|
||||
* 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.
|
||||
* 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.
|
||||
|
||||
* `--with-gc=[boehm, included, sgen, none]` - Selects the default Boehm garbage
|
||||
collector engine to use.
|
||||
@@ -494,12 +485,16 @@ Directory Roadmap
|
||||
|
||||
* `dis/` - CIL executable Disassembler
|
||||
|
||||
* `cli/` - Common code for the JIT and the interpreter.
|
||||
|
||||
* `io-layer/` - The I/O layer and system abstraction for
|
||||
emulating the .NET IO model.
|
||||
|
||||
* `cil/` - Common Intermediate Representation, XML
|
||||
definition of the CIL bytecodes.
|
||||
|
||||
* `interp/` - Interpreter for CLI executables (obsolete).
|
||||
|
||||
* `arch/` - Architecture specific portions.
|
||||
|
||||
* `man/` - Manual pages for the various Mono commands and programs.
|
||||
@@ -519,10 +514,6 @@ 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 at http://mono-project.com/Contributing. Please pay particular attention to the [Important Rules](http://mono-project.com/Contributing#Important_Rules) section.
|
||||
|
||||
|
||||
Git submodules maintenance
|
||||
==========================
|
||||
|
||||
+4
-4
@@ -22,11 +22,11 @@ if test x$GCC != xyes; then
|
||||
dolt_supported=no
|
||||
fi
|
||||
case $host in
|
||||
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
|
||||
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*)
|
||||
pic_options='-fPIC'
|
||||
;;
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*)
|
||||
pic_options='-DDLL_EXPORT'
|
||||
;;
|
||||
i?86-apple-darwin*|arm-apple-darwin*)
|
||||
@@ -158,7 +158,7 @@ modeok=false
|
||||
tagok=false
|
||||
for arg in "$[]@"; do
|
||||
case "$arg" in
|
||||
--silent) ;;
|
||||
--silent) ;;
|
||||
--mode=compile) modeok=true ;;
|
||||
--tag=CC|--tag=CXX) tagok=true ;;
|
||||
--quiet) ;;
|
||||
|
||||
@@ -1,98 +0,0 @@
|
||||
#
|
||||
# Appveyor configuration file for CI build of Mono on Windows (under Cygwin)
|
||||
#
|
||||
# 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_MIRROR: http://cygwin.mirror.constant.com
|
||||
CYG_CACHE: C:/cygwin/var/cache/setup
|
||||
NSIS_ROOT: C:\nsis
|
||||
|
||||
#
|
||||
# Initialisation prior to pulling the Mono repository
|
||||
#
|
||||
init:
|
||||
- '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:
|
||||
# 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
|
||||
#
|
||||
# NOTES:
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
build_script:
|
||||
- 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
|
||||
|
||||
#
|
||||
# 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.
|
||||
#
|
||||
artifacts:
|
||||
- path: install
|
||||
name: mono-binaries
|
||||
type: zip
|
||||
+6
-5
@@ -37,7 +37,7 @@ if [ -z "$LIBTOOL" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
|
||||
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
|
||||
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`libtool' installed to compile Mono."
|
||||
@@ -47,8 +47,8 @@ fi
|
||||
}
|
||||
}
|
||||
|
||||
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
|
||||
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
|
||||
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
|
||||
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
|
||||
(gettext --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`gettext' installed to compile Mono."
|
||||
@@ -95,7 +95,7 @@ xlc )
|
||||
esac
|
||||
|
||||
|
||||
if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
|
||||
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
|
||||
if test -z "$NO_LIBTOOLIZE" ; then
|
||||
echo "Running libtoolize..."
|
||||
${LIBTOOL}ize --force --copy
|
||||
@@ -123,6 +123,7 @@ if test x$has_ext_mod = xtrue; then
|
||||
popd
|
||||
else
|
||||
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
|
||||
cat mono/metadata/Makefile.am.in > mono/metadata/Makefile.am
|
||||
fi
|
||||
|
||||
|
||||
@@ -137,7 +138,7 @@ aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
|
||||
exit 1
|
||||
}
|
||||
|
||||
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
|
||||
echo "Running autoheader..."
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
+1
-1
@@ -57,7 +57,7 @@ function setup ()
|
||||
CROSS_DLL_DIR="$CROSS_DIR/bin"
|
||||
PATH=$CROSS_BIN_DIR:$PATH
|
||||
|
||||
MONO_VERSION=`grep AC_INIT configure.ac | cut -d ',' -f 2|tr -d '\[ \]'`
|
||||
MONO_VERSION=`grep AC_INIT configure.in | cut -d ',' -f 2|tr -d '\[ \]'`
|
||||
|
||||
if [ -d ./.git ]; then
|
||||
MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
|
||||
|
||||
+170
-213
@@ -1,7 +1,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
#AC_PREREQ([2.62])
|
||||
|
||||
AC_INIT(mono, [3.12.0],
|
||||
AC_INIT(mono, [3.2.8],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README.md])
|
||||
@@ -36,15 +36,20 @@ case $host_os in
|
||||
*cygwin* ) LN_S='cp -p';;
|
||||
esac
|
||||
|
||||
#
|
||||
# libgc defaults
|
||||
#
|
||||
dnl
|
||||
dnl libgc checks
|
||||
dnl
|
||||
|
||||
gc_headers=no
|
||||
gc=included
|
||||
gc_msg="included Boehm"
|
||||
use_included_gc=no
|
||||
libgc_configure_args=
|
||||
|
||||
if test -d $srcdir/libgc ; then
|
||||
libgc_default=included
|
||||
gc_default=included
|
||||
else
|
||||
libgc_default=boehm
|
||||
gc_default=boehm
|
||||
fi
|
||||
|
||||
# These variables are the CPPFLAGS/CFLAGS passed to libgc's configure
|
||||
@@ -54,9 +59,6 @@ CFLAGS_FOR_LIBGC=$CFLAGS
|
||||
CPPFLAGS_FOR_EGLIB=$CPPFLAGS
|
||||
CFLAGS_FOR_EGLIB=$CFLAGS
|
||||
|
||||
# libgc uses some deprecated APIs
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS -Wno-deprecated-declarations"
|
||||
|
||||
#
|
||||
# These are the flags that need to be stored in the mono.pc file for
|
||||
# compiling code that will embed Mono
|
||||
@@ -115,16 +117,15 @@ case "$host" in
|
||||
AC_DEFINE(MINGW_CROSS_COMPILE,1,[Cross-compiling using MinGW])
|
||||
fi
|
||||
HOST_CC="gcc"
|
||||
# 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"
|
||||
# Windows 2000 is required that includes Internet Explorer 5.01
|
||||
CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
|
||||
LDFLAGS="$LDFLAGS -lmswsock -lws2_32 -lole32 -loleaut32 -lpsapi -lversion -ladvapi32 -lwinmm -lkernel32"
|
||||
libmono_cflags="-mms-bitfields -mwindows"
|
||||
libmono_ldflags="-mms-bitfields -mwindows"
|
||||
libdl=
|
||||
libgc_threads=win32
|
||||
libgc_default=included
|
||||
gc_default=included
|
||||
with_sigaltstack=no
|
||||
with_tls=pthread
|
||||
LN_S=cp
|
||||
# This forces libgc to use the DllMain based thread registration code on win32
|
||||
libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
|
||||
@@ -142,17 +143,6 @@ case "$host" in
|
||||
with_sigaltstack=no
|
||||
use_sigposix=yes
|
||||
;;
|
||||
*-*-kfreebsd*-gnu)
|
||||
host_win32=no
|
||||
CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP -DTHREAD_LOCAL_ALLOC -pthread"
|
||||
libmono_cflags="-D_REENTRANT -DTHREAD_LOCAL_ALLOC -pthread"
|
||||
libmono_ldflags="-lpthread -pthread"
|
||||
libdl="-ldl"
|
||||
libgc_threads=pthreads
|
||||
need_link_unlink=yes
|
||||
with_sigaltstack=no
|
||||
use_sigposix=yes
|
||||
;;
|
||||
*-*-*freebsd*)
|
||||
host_win32=no
|
||||
if test "x$PTHREAD_CFLAGS" = "x"; then
|
||||
@@ -188,7 +178,7 @@ case "$host" in
|
||||
need_link_unlink=yes
|
||||
AC_DEFINE(PTHREAD_POINTER_ID)
|
||||
libdl=
|
||||
libgc_default=boehm
|
||||
gc_default=boehm
|
||||
libgc_threads=pthreads
|
||||
with_sigaltstack=no
|
||||
use_sigposix=yes
|
||||
@@ -247,12 +237,6 @@ case "$host" in
|
||||
# available during cross-compilation
|
||||
mono_cv_uscore=no
|
||||
fi
|
||||
case "$host" in
|
||||
aarch64-*)
|
||||
support_boehm=no
|
||||
with_gc=sgen
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*-*-nacl*)
|
||||
host_win32=no
|
||||
@@ -263,7 +247,7 @@ case "$host" in
|
||||
libmono_cflags="-D_REENTRANT"
|
||||
libdl=
|
||||
libgc_threads=pthreads
|
||||
libgc_default=boehm
|
||||
gc_default=boehm
|
||||
use_sigposix=yes
|
||||
ikvm_native=no
|
||||
AC_DEFINE(DISABLE_SOCKETS,1,[Disable sockets support])
|
||||
@@ -354,7 +338,7 @@ case "$host" in
|
||||
use_sigposix=yes
|
||||
;;
|
||||
*)
|
||||
AC_MSG_WARN([*** Please add $host to configure.ac checks!])
|
||||
AC_MSG_WARN([*** Please add $host to configure.in checks!])
|
||||
host_win32=no
|
||||
libdl="-ldl"
|
||||
;;
|
||||
@@ -368,7 +352,6 @@ fi
|
||||
AC_SUBST(extra_runtime_ldflags)
|
||||
AM_CONDITIONAL(HOST_WIN32, test x$host_win32 = xyes)
|
||||
AM_CONDITIONAL(TARGET_WIN32, test x$target_win32 = xyes)
|
||||
AM_CONDITIONAL(PLATFORM_GNU, echo x$target_os | grep -q -- -gnu)
|
||||
AM_CONDITIONAL(PLATFORM_LINUX, echo x$target_os | grep -q linux)
|
||||
AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
|
||||
AM_CONDITIONAL(PLATFORM_SIGPOSIX, test x$use_sigposix = xyes)
|
||||
@@ -492,7 +475,7 @@ AC_CHECK_HEADERS(wchar.h)
|
||||
AC_CHECK_HEADERS(ieeefp.h)
|
||||
AC_MSG_CHECKING(for isinf)
|
||||
AC_TRY_LINK([#include <math.h>], [
|
||||
int f = isinf (1.0);
|
||||
int f = isinf (1);
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_ISINF, 1, [isinf available])
|
||||
@@ -533,9 +516,6 @@ if test x"$GCC" = xyes; then
|
||||
# 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"
|
||||
|
||||
ORIG_CFLAGS=$CFLAGS
|
||||
CFLAGS="$CFLAGS -Wdeclaration-after-statement"
|
||||
AC_MSG_CHECKING(for -Wdeclaration-after-statement option to gcc)
|
||||
@@ -565,7 +545,7 @@ if test x"$GCC" = xyes; then
|
||||
if test "x$mono_cv_clang" = "xyes"; then
|
||||
# https://bugzilla.samba.org/show_bug.cgi?id=8118
|
||||
WARN="$WARN -Qunused-arguments"
|
||||
WARN="$WARN -Wno-unused-function -Wno-tautological-compare -Wno-parentheses-equality -Wno-self-assign"
|
||||
WARN="$WARN -Wno-unused-function -Wno-tautological-compare"
|
||||
fi
|
||||
else
|
||||
# The Sun Forte compiler complains about inline functions that access static variables
|
||||
@@ -657,6 +637,18 @@ if test "x$USE_NLS" = "xyes"; then
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_WITH([libgdiplus],
|
||||
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to installed)],
|
||||
[], [with_libgdiplus=installed])
|
||||
|
||||
case $with_libgdiplus in
|
||||
no|installed) libgdiplus_loc= ;;
|
||||
yes|sibling) libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la ;;
|
||||
/*) libgdiplus_loc=$with_libgdiplus ;;
|
||||
*) libgdiplus_loc=`pwd`/$with_libgdiplus ;;
|
||||
esac
|
||||
AC_SUBST([libgdiplus_loc])
|
||||
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
|
||||
pkg_config_path=
|
||||
@@ -672,12 +664,6 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
|
||||
fi
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
|
||||
if test x$werror_flag = xyes; then
|
||||
WERROR_CFLAGS="-Werror"
|
||||
fi
|
||||
AC_SUBST([WERROR_CFLAGS])
|
||||
|
||||
ac_configure_args="$ac_configure_args \"CPPFLAGS_FOR_EGLIB=$EGLIB_CPPFLAGS\" \"CFLAGS_FOR_EGLIB=$CFLAGS_FOR_EGLIB\""
|
||||
AC_CONFIG_SUBDIRS(eglib)
|
||||
|
||||
@@ -695,6 +681,8 @@ AC_SUBST(GMODULE_LIBS)
|
||||
AC_SUBST(BUILD_GLIB_CFLAGS)
|
||||
AC_SUBST(BUILD_GLIB_LIBS)
|
||||
|
||||
AC_ARG_WITH(gc, [ --with-gc=boehm,included,none Controls the Boehm GC config, default=included],[gc=$with_gc],[gc=$gc_default])
|
||||
|
||||
# Enable support for fast thread-local storage
|
||||
# Some systems have broken support, so we allow to disable it.
|
||||
AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation (defaults to __thread)],[],[with_tls=__thread])
|
||||
@@ -767,7 +755,7 @@ DISABLED_FEATURES=none
|
||||
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
|
||||
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug, appdomains, verifier,
|
||||
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd, soft_debug, perfcounters, normalization, assembly_remapping, shared_perfcounters, remoting,
|
||||
security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying, shared_handles.],
|
||||
security, sgen_remset, sgen_marksweep_par, sgen_marksweep_fixed, sgen_marksweep_fixed_par, sgen_copying.],
|
||||
[
|
||||
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
|
||||
eval "mono_feature_disable_$feature='yes'"
|
||||
@@ -941,11 +929,6 @@ if test "x$mono_feature_disable_sgen_copying" = "xyes"; then
|
||||
AC_MSG_NOTICE([Disabled major=copying support in SGEN.])
|
||||
fi
|
||||
|
||||
if test "x$mono_feature_disable_shared_handles" = "xyes"; then
|
||||
AC_DEFINE(DISABLE_SHARED_HANDLES, 1, [Disable inter-process shared handles])
|
||||
AC_SUBST(DISABLE_SHARED_HANDLES)
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(executables, [ --disable-executables disable the build of the runtime executables], enable_executables=$enableval, enable_executables=yes)
|
||||
AM_CONDITIONAL(DISABLE_EXECUTABLES, test x$enable_executables = xno)
|
||||
|
||||
@@ -969,15 +952,6 @@ if test x$has_extension_module != xno ; then
|
||||
AC_MSG_NOTICE([Enabling mono extension module.])
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(gsharing, [ --enable-gsharing Enable gsharing], enable_gsharing=$enableval, enable_gsharing=no)
|
||||
if test x$enable_gsharing = xyes; then
|
||||
AC_DEFINE(ENABLE_GSHAREDVT,1,[Gsharing])
|
||||
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])
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for visibility __attribute__)
|
||||
AC_COMPILE_IFELSE([
|
||||
@@ -1007,28 +981,22 @@ AC_TRY_COMPILE([
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
|
||||
dnl
|
||||
dnl Boehm GC configuration
|
||||
dnl
|
||||
|
||||
AC_ARG_WITH(libgc, [ --with-gc=boehm,included,none Controls the Boehm GC config, default=included],[libgc=$with_gc],[libgc=$libgc_default])
|
||||
|
||||
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
|
||||
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
|
||||
|
||||
AC_ARG_ENABLE(parallel-mark, [ --enable-parallel-mark Enables GC Parallel Marking], enable_parallel_mark=$enableval, enable_parallel_mark=$parallel_mark)
|
||||
if test x$enable_parallel_mark = xyes; then
|
||||
libgc_configure_args="$libgc_configure_args --enable-parallel-mark"
|
||||
fi
|
||||
|
||||
gc_headers=no
|
||||
gc_msg=""
|
||||
use_included_gc=no
|
||||
AC_ARG_ENABLE(boehm, [ --disable-boehm Disable the Boehm GC.], support_boehm=$enableval,support_boehm=${support_boehm:-yes})
|
||||
AM_CONDITIONAL(SUPPORT_BOEHM, test x$support_boehm = xyes)
|
||||
|
||||
dnl
|
||||
dnl Boehm GC configuration
|
||||
dnl
|
||||
LIBGC_CPPFLAGS=
|
||||
LIBGC_LIBS=
|
||||
LIBGC_STATIC_LIBS=
|
||||
libgc_dir=
|
||||
case "x$libgc" in
|
||||
case "x$gc" in
|
||||
xboehm|xbohem|xyes)
|
||||
AC_CHECK_HEADERS(gc.h gc/gc.h, gc_headers=yes)
|
||||
AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
|
||||
@@ -1061,18 +1029,17 @@ case "x$libgc" in
|
||||
fi
|
||||
|
||||
# check whether we need to explicitly allow
|
||||
# thread registering
|
||||
AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
|
||||
if test "x$found_allow_register_threads" = "xyes"; then
|
||||
AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
|
||||
fi
|
||||
# thread registering
|
||||
AC_CHECK_LIB(gc, GC_allow_register_threads, found_allow_register_threads="yes",,$libdl)
|
||||
if test "x$found_allow_register_threads" = "xyes"; then
|
||||
AC_DEFINE(HAVE_GC_ALLOW_REGISTER_THREADS, 1, [GC requires thread registration])
|
||||
fi
|
||||
|
||||
;;
|
||||
|
||||
xincluded)
|
||||
use_included_gc=yes
|
||||
if test "x$support_boehm" = "xyes"; then
|
||||
libgc_dir=libgc
|
||||
fi
|
||||
libgc_dir=libgc
|
||||
|
||||
LIBGC_CPPFLAGS='-I$(top_srcdir)/libgc/include'
|
||||
LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
|
||||
@@ -1085,7 +1052,7 @@ case "x$libgc" in
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DGC_BUILD -DGC_NOT_DLL"
|
||||
fi
|
||||
|
||||
gc_msg="Included Boehm GC with typed GC"
|
||||
gc_msg="bundled Boehm GC with typed GC"
|
||||
if test x$enable_parallel_mark = xyes; then
|
||||
AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "Included Boehm (with typed GC and Parallel Mark)", [GC description])
|
||||
gc_msg="$gc_msg and parallel mark"
|
||||
@@ -1102,7 +1069,6 @@ case "x$libgc" in
|
||||
AC_MSG_WARN("Compiling mono without GC.")
|
||||
AC_DEFINE_UNQUOTED(DEFAULT_GC_NAME, "none", [GC description])
|
||||
AC_DEFINE(HAVE_NULL_GC,1,[No GC support.])
|
||||
gc_msg="none"
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Invalid argument to --with-gc.])
|
||||
@@ -1122,7 +1088,7 @@ AC_SUBST(libgc_dir)
|
||||
AC_SUBST(BOEHM_DEFINES)
|
||||
|
||||
dnl
|
||||
dnl End of Boehm GC Configuration
|
||||
dnl End of libgc checks
|
||||
dnl
|
||||
|
||||
dnl *************************************
|
||||
@@ -1158,7 +1124,7 @@ if test x$target_win32 = xno; then
|
||||
else
|
||||
LIBS="$LIBS $DL_LIB"
|
||||
AC_DEFINE(HAVE_DL_LOADER,1,[dlopen-based dynamic loader available])
|
||||
dnl from glib's configure.ac
|
||||
dnl from glib's configure.in
|
||||
AC_CACHE_CHECK([for preceeding underscore in symbols],
|
||||
mono_cv_uscore,[
|
||||
AC_TRY_RUN([#include <dlfcn.h>
|
||||
@@ -1199,7 +1165,7 @@ if test x$target_win32 = xno; then
|
||||
|
||||
AC_CHECK_HEADERS(execinfo.h)
|
||||
|
||||
AC_CHECK_HEADERS(sys/auxv.h sys/resource.h)
|
||||
AC_CHECK_HEADERS(sys/auxv.h)
|
||||
|
||||
AC_CHECK_FUNCS(getgrgid_r)
|
||||
AC_CHECK_FUNCS(getgrnam_r)
|
||||
@@ -1218,7 +1184,6 @@ if test x$target_win32 = xno; then
|
||||
AC_CHECK_FUNCS(dl_iterate_phdr)
|
||||
AC_CHECK_FUNCS(dladdr)
|
||||
AC_CHECK_FUNCS(sysconf)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
|
||||
AC_CHECK_FUNCS(sched_setaffinity)
|
||||
AC_CHECK_FUNCS(sched_getcpu)
|
||||
@@ -1539,6 +1504,30 @@ if test x$target_win32 = xno; then
|
||||
|
||||
AC_CHECK_FUNCS(inet_pton inet_aton)
|
||||
|
||||
dnl ***********************************************
|
||||
dnl *** Checks for size of sockaddr_un.sun_path ***
|
||||
dnl ***********************************************
|
||||
# AC_CHECK_SIZEOF can't cope with struct members :-(
|
||||
AC_MSG_CHECKING(size of sockaddr_un.sun_path)
|
||||
AC_CACHE_VAL(mono_cv_sizeof_sunpath,
|
||||
[AC_TRY_RUN([
|
||||
#include <sys/types.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/un.h>
|
||||
|
||||
int main(void) {
|
||||
struct sockaddr_un sock_un;
|
||||
FILE *f=fopen("conftestval", "w");
|
||||
if(!f) exit(1);
|
||||
fprintf(f, "%d\n", sizeof(sock_un.sun_path));
|
||||
exit(0);
|
||||
}
|
||||
], mono_cv_sizeof_sunpath=`cat conftestval`,
|
||||
mono_cv_sizeof_sunpath=0,
|
||||
mono_cv_sizeof_sunpath=0)])dnl
|
||||
AC_MSG_RESULT($mono_cv_sizeof_sunpath)
|
||||
AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $mono_cv_sizeof_sunpath, [Sizeof sock_un.sun_path])
|
||||
|
||||
dnl *****************************
|
||||
dnl *** Checks for libxnet ***
|
||||
dnl *****************************
|
||||
@@ -1581,7 +1570,7 @@ if test x$target_win32 = xno; then
|
||||
AC_CHECK_HEADERS(pthread.h)
|
||||
AC_CHECK_HEADERS(pthread_np.h)
|
||||
AC_CHECK_FUNCS(pthread_mutex_timedlock)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np pthread_setname_np)
|
||||
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np)
|
||||
AC_CHECK_FUNCS(pthread_kill)
|
||||
AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
|
||||
AC_TRY_COMPILE([ #include <pthread.h>], [
|
||||
@@ -1862,7 +1851,7 @@ if test x$target_win32 = xno; then
|
||||
dnl * back
|
||||
dnl **************************************
|
||||
if test "x$havekqueue" = "xyes" -a "x$ac_cv_header_sys_event_h" = "xyes"; then
|
||||
if test "x$platform_darwin" = "xno"; then
|
||||
if x$platform_darwin = xno; then
|
||||
AC_DEFINE(USE_KQUEUE_FOR_THREADPOOL, 1, [Use kqueue for the threadpool])
|
||||
fi
|
||||
fi
|
||||
@@ -2155,6 +2144,7 @@ else
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
])
|
||||
AC_CHECK_FUNCS(GetProcessId)
|
||||
AC_CHECK_DECLS(InterlockedExchange64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedCompareExchange64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedDecrement64, [], [], [[#include <windows.h>]])
|
||||
@@ -2162,16 +2152,6 @@ else
|
||||
AC_CHECK_DECLS(InterlockedAdd, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(InterlockedAdd64, [], [], [[#include <windows.h>]])
|
||||
AC_CHECK_DECLS(__readfsdword, [], [], [[#include <windows.h>]])
|
||||
|
||||
AC_MSG_CHECKING(for GetProcessId)
|
||||
AC_TRY_COMPILE([#include <windows.h>], [
|
||||
GetProcessId (0);
|
||||
], [
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_DEFINE(HAVE_GETPROCESSID)
|
||||
], [
|
||||
AC_MSG_RESULT(no)
|
||||
])
|
||||
fi
|
||||
|
||||
dnl socklen_t check
|
||||
@@ -2288,7 +2268,6 @@ if test "x$ac_cv_have_dev_random" = "xno" \
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING([if inter-process shared handles are requested])
|
||||
# Same as --enable-minimal=shared_handles
|
||||
AC_ARG_ENABLE(shared-handles, [ --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
|
||||
AC_MSG_RESULT($try_shared_handles)
|
||||
if test "x$try_shared_handles" != "xyes"; then
|
||||
@@ -2445,15 +2424,13 @@ if test "x$enable_llvm" = "xyes"; then
|
||||
# from LLVM classes.
|
||||
LLVM_CXXFLAGS="`$LLVM_CONFIG --cxxflags` -fno-rtti"
|
||||
LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
|
||||
# This might include empty lines
|
||||
LLVM_SYSTEM_LIBS=`$LLVM_CONFIG --system-libs 2>/dev/null | grep -- -`
|
||||
if test "x$host" != "x$target"; then
|
||||
# No need for jit libs
|
||||
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter`
|
||||
else
|
||||
LLVM_LIBS=`$LLVM_CONFIG --libs core bitwriter jit mcjit $llvm_codegen`
|
||||
fi
|
||||
LLVM_LIBS="$LLVM_LIBS $LLVM_LDFLAGS $LLVM_SYSTEM_LIBS -lstdc++"
|
||||
LLVM_LIBS="$LLVM_LDFLAGS $LLVM_LIBS -lstdc++"
|
||||
|
||||
expected_llvm_version="3.4svn-mono-mono/e656cac"
|
||||
|
||||
@@ -2461,22 +2438,16 @@ if test "x$enable_llvm" = "xyes"; then
|
||||
llvm_version=`$LLVM_CONFIG --version`
|
||||
major_version=`echo $llvm_version | cut -c 1`
|
||||
minor_version=`echo $llvm_version | cut -c 3`
|
||||
llvm_api_version=`$LLVM_CONFIG --mono-api-version 2>/dev/null`
|
||||
AC_MSG_CHECKING(LLVM version)
|
||||
AC_MSG_RESULT($llvm_version)
|
||||
if echo $llvm_version | grep -q 'mono'; then
|
||||
AC_DEFINE(LLVM_MONO_BRANCH, 1, [Whenever we are using the mono branch of LLVM])
|
||||
LLVM_CXXFLAGS="$LLVM_CXXFLAGS -DLLVM_MONO_BRANCH"
|
||||
if test "x$enable_llvm_version_check" == "xyes"; then
|
||||
if test "$llvm_version" != "$expected_llvm_version"; 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
|
||||
@@ -2505,26 +2476,26 @@ AM_CONDITIONAL(LOADED_LLVM, [test x$enable_loadedllvm = xyes])
|
||||
TARGET="unknown"
|
||||
ACCESS_UNALIGNED="yes"
|
||||
|
||||
JIT_SUPPORTED=no
|
||||
INTERP_SUPPORTED=no
|
||||
LIBC="libc.so.6"
|
||||
INTL="libc.so.6"
|
||||
SQLITE="libsqlite.so.0"
|
||||
SQLITE3="libsqlite3.so.0"
|
||||
X11="libX11.so"
|
||||
GDKX11="libgdk-x11-2.0.so.0"
|
||||
GTKX11="libgtk-x11-2.0.so.0"
|
||||
XINERAMA="libXinerama.so.1"
|
||||
|
||||
sizeof_register="SIZEOF_VOID_P"
|
||||
|
||||
jit_wanted=true
|
||||
interp_wanted=false
|
||||
sgen_supported=false
|
||||
boehm_supported=true
|
||||
case "$host" in
|
||||
mips*)
|
||||
TARGET=MIPS;
|
||||
arch_target=mips;
|
||||
sgen_supported=true
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=yes
|
||||
|
||||
AC_MSG_CHECKING(for mips n32)
|
||||
AC_TRY_COMPILE([],[
|
||||
@@ -2542,6 +2513,7 @@ case "$host" in
|
||||
i*86-*-*)
|
||||
TARGET=X86;
|
||||
arch_target=x86;
|
||||
JIT_SUPPORTED=yes
|
||||
case $host_os in
|
||||
solaris*)
|
||||
LIBC="libc.so"
|
||||
@@ -2579,7 +2551,7 @@ case "$host" in
|
||||
sgen_supported=true
|
||||
AOT_SUPPORTED="yes"
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
darwin*|openbsd*|freebsd*)
|
||||
sgen_supported=true
|
||||
;;
|
||||
esac
|
||||
@@ -2587,6 +2559,7 @@ case "$host" in
|
||||
x86_64-*-* | amd64-*-*)
|
||||
TARGET=AMD64;
|
||||
arch_target=amd64;
|
||||
JIT_SUPPORTED=yes
|
||||
if test "x$ac_cv_sizeof_void_p" = "x4"; then
|
||||
AC_DEFINE(__mono_ilp32__, 1, [64 bit mode with 4 byte longs and pointers])
|
||||
sizeof_register=8
|
||||
@@ -2596,14 +2569,7 @@ case "$host" in
|
||||
sgen_supported=true
|
||||
AOT_SUPPORTED="yes"
|
||||
;;
|
||||
darwin*)
|
||||
sgen_supported=true
|
||||
AOT_SUPPORTED="yes"
|
||||
;;
|
||||
openbsd*|freebsd*|kfreebsd-gnu*)
|
||||
sgen_supported=true
|
||||
;;
|
||||
mingw*)
|
||||
darwin*|openbsd*|freebsd*)
|
||||
sgen_supported=true
|
||||
;;
|
||||
esac
|
||||
@@ -2618,6 +2584,7 @@ case "$host" in
|
||||
TARGET=IA64
|
||||
arch_target=ia64
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=yes
|
||||
LIBC="libc.so.6.1"
|
||||
INTL="libc.so.6.1"
|
||||
AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
|
||||
@@ -2630,6 +2597,7 @@ case "$host" in
|
||||
TARGET=SPARC
|
||||
fi
|
||||
arch_target=sparc;
|
||||
JIT_SUPPORTED=yes
|
||||
ACCESS_UNALIGNED="no"
|
||||
case $host_os in
|
||||
linux*) ;;
|
||||
@@ -2662,6 +2630,7 @@ case "$host" in
|
||||
CPPFLAGS="$CPPFLAGS -D__mono_ppc__"
|
||||
fi
|
||||
arch_target=ppc;
|
||||
JIT_SUPPORTED=yes
|
||||
case $host_os in
|
||||
linux*|darwin*)
|
||||
sgen_supported=true
|
||||
@@ -2672,13 +2641,17 @@ case "$host" in
|
||||
TARGET=ARM;
|
||||
arch_target=arm;
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=yes
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
# libgc's gc_locks.h depends on this
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC"
|
||||
sgen_supported=true
|
||||
;;
|
||||
arm*-linux*)
|
||||
TARGET=ARM;
|
||||
arch_target=arm;
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=yes
|
||||
sgen_supported=true
|
||||
AOT_SUPPORTED="yes"
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
@@ -2688,20 +2661,15 @@ case "$host" in
|
||||
# TARGET=ARM;
|
||||
# arch_target=arm;
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# JIT_SUPPORTED=yes
|
||||
# sgen_supported=true
|
||||
# AOT_SUPPORTED="no"
|
||||
# ;;
|
||||
aarch64-*)
|
||||
# https://lkml.org/lkml/2012/7/15/133
|
||||
TARGET=ARM64
|
||||
arch_target=arm64
|
||||
sgen_supported=true
|
||||
boehm_supported=false
|
||||
;;
|
||||
s390x-*-linux*)
|
||||
TARGET=S390X;
|
||||
arch_target=s390x;
|
||||
ACCESS_UNALIGNED="yes"
|
||||
JIT_SUPPORTED=yes
|
||||
sgen_supported=true
|
||||
CFLAGS="$CFLAGS -mbackchain -D__USE_STRING_INLINES"
|
||||
;;
|
||||
@@ -2717,7 +2685,9 @@ if test "x$host" != "x$target"; then
|
||||
TARGET=ARM;
|
||||
arch_target=arm;
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=yes
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
jit_wanted=true
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
@@ -2733,6 +2703,7 @@ if test "x$host" != "x$target"; then
|
||||
sizeof_register=8
|
||||
target_byte_order=G_BIG_ENDIAN
|
||||
;;
|
||||
|
||||
powerpc64-xbox360-linux-gnu)
|
||||
TARGET=POWERPC64
|
||||
arch_target=powerpc64
|
||||
@@ -2755,6 +2726,7 @@ if test "x$host" != "x$target"; then
|
||||
# arch_target=arm
|
||||
# AC_DEFINE(TARGET_ARM, 1, [...])
|
||||
# ACCESS_UNALIGNED="no"
|
||||
# JIT_SUPPORTED=yes
|
||||
# sizeof_register=4
|
||||
# CPPFLAGS="$CPPFLAGS \
|
||||
# -D__ARM_EABI__ \
|
||||
@@ -2764,6 +2736,7 @@ if test "x$host" != "x$target"; then
|
||||
# -DDISABLE_SOCKETS \
|
||||
# -DDISABLE_ATTACH \
|
||||
# -DUSE_NEWLIB"
|
||||
# jit_wanted=true
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
# with_tls=pthread
|
||||
@@ -2778,9 +2751,10 @@ if test "x$host" != "x$target"; then
|
||||
TARGET=ARM;
|
||||
arch_target=arm;
|
||||
AC_DEFINE(TARGET_ARM, 1, [...])
|
||||
AC_DEFINE(TARGET_ANDROID, 1, [...])
|
||||
ACCESS_UNALIGNED="no"
|
||||
JIT_SUPPORTED=yes
|
||||
CPPFLAGS="$CPPFLAGS -D__ARM_EABI__"
|
||||
jit_wanted=true
|
||||
# Can't use tls, since it depends on the runtime detection of tls offsets
|
||||
# in mono-compiler.h
|
||||
with_tls=pthread
|
||||
@@ -2791,25 +2765,11 @@ if test "x$host" != "x$target"; then
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
;;
|
||||
armv5-*-linux-androideabi*)
|
||||
AC_DEFINE(TARGET_ANDROID, 1, [...])
|
||||
CPPFLAGS="$CPPFLAGS"
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
i686*-linux-*)
|
||||
TARGET=X86;
|
||||
arch_target=x86;
|
||||
AC_DEFINE(TARGET_X86, 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
|
||||
;;
|
||||
aarch64-*)
|
||||
TARGET=ARM64
|
||||
;;
|
||||
*)
|
||||
AC_MSG_ERROR([Cross compiling is not supported for target $target])
|
||||
esac
|
||||
@@ -2825,9 +2785,6 @@ AMD64)
|
||||
ARM)
|
||||
AC_DEFINE(TARGET_ARM, 1, [...])
|
||||
;;
|
||||
ARM64)
|
||||
AC_DEFINE(TARGET_ARM64, 1, [...])
|
||||
;;
|
||||
POWERPC)
|
||||
AC_DEFINE(TARGET_POWERPC, 1, [...])
|
||||
;;
|
||||
@@ -2855,14 +2812,14 @@ esac
|
||||
dnl Use GCC atomic ops if they work on the target.
|
||||
if test x$GCC = "xyes"; then
|
||||
case $TARGET in
|
||||
X86 | AMD64 | ARM | ARM64 | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64)
|
||||
X86 | AMD64 | ARM | POWERPC | POWERPC64 | MIPS | S390X | SPARC | SPARC64)
|
||||
AC_DEFINE(USE_GCC_ATOMIC_OPS, 1, [...])
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "x$target_mach" = "xyes"; then
|
||||
if test "x$TARGET" = "xARM" -o "x$TARGET" = "xARM64"; then
|
||||
if test "x$TARGET" = "xARM"; then
|
||||
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
|
||||
CPPFLAGS_FOR_LIBGC="$CPPFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
CFLAGS_FOR_LIBGC="$CFLAGS_FOR_LIBGC -DTARGET_IOS"
|
||||
@@ -2931,7 +2888,27 @@ fi
|
||||
AC_SUBST(SGEN_DEFINES)
|
||||
AM_CONDITIONAL(SUPPORT_SGEN, test x$buildsgen = xyes)
|
||||
|
||||
jit_status="Building and using the JIT"
|
||||
USEJIT=false
|
||||
if test x$JIT_SUPPORTED = xyes; then
|
||||
if $jit_wanted; then
|
||||
USEJIT=true
|
||||
jit_status="Building and using the JIT"
|
||||
else
|
||||
if $interp_wanted; then
|
||||
jit_status="Building the JIT, defaulting to the interpreter"
|
||||
else
|
||||
AC_ERROR(No JIT or interpreter support available or selected.)
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test x$interp_wanted = xtrue; then
|
||||
jit_status="interpreter"
|
||||
else
|
||||
AC_ERROR(No JIT or interpreter support available or selected.)
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
|
||||
|
||||
libsuffix=".so"
|
||||
|
||||
@@ -2943,18 +2920,11 @@ case "$host" in
|
||||
SQLITE="libsqlite.0.dylib"
|
||||
SQLITE3="libsqlite3.0.dylib"
|
||||
X11="libX11.dylib"
|
||||
GDKX11="libgdk-x11-2.0.dylib"
|
||||
GTKX11="libgtk-x11-2.0.dylib"
|
||||
;;
|
||||
*-*-*netbsd*)
|
||||
LIBC="libc.so.12"
|
||||
INTL="libintl.so.0"
|
||||
;;
|
||||
*-*-kfreebsd*-gnu)
|
||||
LIBC="libc.so.0.1"
|
||||
INTL="libc.so.0.1"
|
||||
X11="libX11.so.6"
|
||||
;;
|
||||
*-*-*freebsd*)
|
||||
LIBC="libc.so"
|
||||
INTL="libintl.so"
|
||||
@@ -2969,9 +2939,8 @@ case "$host" in
|
||||
;;
|
||||
*-*-*linux*)
|
||||
AC_PATH_X
|
||||
dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh`
|
||||
AC_MSG_CHECKING(for the soname of libX11.so)
|
||||
for i in $x_libraries $dlsearch_path; do
|
||||
for i in $x_libraries /usr/lib /usr/lib64; do
|
||||
for r in 4 5 6; do
|
||||
if test -f $i/libX11.so.$r; then
|
||||
X11=libX11.so.$r
|
||||
@@ -2981,7 +2950,7 @@ case "$host" in
|
||||
done
|
||||
|
||||
if test "x$X11" = "xlibX11.so"; then
|
||||
AC_MSG_WARN([Could not find libX11.so. Do you have X.org or XFree86 installed? Assuming libX11.so.6...]);
|
||||
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? Assuming libX11.so.6...]);
|
||||
X11=libX11.so.6
|
||||
fi
|
||||
;;
|
||||
@@ -2990,32 +2959,24 @@ esac
|
||||
|
||||
AC_SUBST(libsuffix)
|
||||
|
||||
AC_ARG_WITH([libgdiplus],
|
||||
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to installed)],
|
||||
[], [with_libgdiplus=installed])
|
||||
|
||||
# default install location
|
||||
libgdiplus_install_loc=libgdiplus${libsuffix}
|
||||
case $with_libgdiplus in
|
||||
no|installed)
|
||||
libgdiplus_loc=
|
||||
;;
|
||||
|
||||
yes|sibling)
|
||||
libgdiplus_loc=`cd ../libgdiplus && pwd`/src/libgdiplus.la
|
||||
;;
|
||||
|
||||
/*) # absolute path, assume it is an install location
|
||||
libgdiplus_loc=$with_libgdiplus
|
||||
libgdiplus_install_loc=$with_libgdiplus
|
||||
;;
|
||||
|
||||
*)
|
||||
libgdiplus_loc=`pwd`/$with_libgdiplus
|
||||
;;
|
||||
esac
|
||||
AC_SUBST([libgdiplus_loc])
|
||||
AC_SUBST([libgdiplus_install_loc])
|
||||
if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
|
||||
if test "x$with_tls" = "x__thread"; then
|
||||
#
|
||||
# On some linux distributions, TLS works in executables, but linking
|
||||
# against a shared library containing TLS fails with:
|
||||
# undefined reference to `__tls_get_addr'
|
||||
#
|
||||
rm -f conftest.c conftest.so conftest
|
||||
echo "static __thread int foo; int main () { foo = 5; return 0; }" > conftest.c
|
||||
$CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
|
||||
$CC -o conftest conftest.so > /dev/null 2>&1
|
||||
if test ! -f conftest; then
|
||||
AC_MSG_WARN([Disabling usage of __thread.]);
|
||||
with_tls=pthread
|
||||
fi
|
||||
rm -f conftest.c conftest.so conftest
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_ARG_ENABLE(icall-symbol-map,[ --enable-icall-symbol-map Generate tables which map icall functions to their C symbols], icall_symbol_map=$enableval, icall_symbol_map=no)
|
||||
if test "x$icall_symbol_map" = "xyes"; then
|
||||
@@ -3182,7 +3143,7 @@ if test ${ACCESS_UNALIGNED} = no; then
|
||||
CPPFLAGS="$CPPFLAGS -DNO_UNALIGNED_ACCESS"
|
||||
fi
|
||||
|
||||
case "x$libgc" in
|
||||
case "x$gc" in
|
||||
xincluded)
|
||||
# Pass CPPFLAGS to libgc configure
|
||||
# We should use a separate variable for this to avoid passing useless and
|
||||
@@ -3200,9 +3161,7 @@ case "x$libgc" in
|
||||
# (infinite recursion, undefined parking behavior, etc)
|
||||
TMP_CPPFLAGS=`echo $TMP_CPPFLAGS | sed -e 's/-finstrument-for-thread-suspension//g'`
|
||||
ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args \"CPPFLAGS_FOR_LIBGC=$TMP_CPPFLAGS\" \"CFLAGS_FOR_LIBGC=$CFLAGS_FOR_LIBGC\""
|
||||
if test "x$support_boehm" = "xyes"; then
|
||||
AC_CONFIG_SUBDIRS(libgc)
|
||||
fi
|
||||
AC_CONFIG_SUBDIRS(libgc)
|
||||
;;
|
||||
esac
|
||||
|
||||
@@ -3211,7 +3170,7 @@ AC_ARG_WITH(profile4, [ --with-profile4=yes,no If you want to install
|
||||
AC_ARG_WITH(profile4_5,[ --with-profile4_5=yes,no If you want to install the 4.5 FX (defaults to yes)], [], [with_profile4_5=yes])
|
||||
AC_ARG_WITH(monodroid, [ --with-monodroid=yes,no If you want to build the MonoDroid assemblies (defaults to no)], [], [with_monodroid=no])
|
||||
AC_ARG_WITH(monotouch, [ --with-monotouch=yes,no,only If you want to build the MonoTouch assemblies (defaults to no)], [], [with_monotouch=no])
|
||||
AC_ARG_WITH(xammac, [ --with-xammac=yes,no,only If you want to build the Xamarin.Mac assemblies (defaults to no)], [], [with_xammac=no])
|
||||
AC_ARG_WITH(mobile, [ --with-mobile=yes,no If you want to build the Mobile assemblies (defaults to no)], [], [with_mobile=no])
|
||||
|
||||
OPROFILE=no
|
||||
AC_ARG_WITH(oprofile,[ --with-oprofile=no,<oprofile install dir> Enable oprofile support (defaults to no)],[
|
||||
@@ -3287,7 +3246,6 @@ if test x$cross_compiling = xyes -o x$enable_mcs_build = xno; then
|
||||
with_profile4_5=no
|
||||
with_monodroid=no
|
||||
with_monotouch=no
|
||||
with_xammac=no
|
||||
fi
|
||||
|
||||
if test x$DISABLE_MCS_DOCS = xyes; then
|
||||
@@ -3311,9 +3269,8 @@ AM_CONDITIONAL(INSTALL_4_0, [test "x$with_profile4" = xyes])
|
||||
AM_CONDITIONAL(INSTALL_4_5, [test "x$with_profile4_5" = xyes])
|
||||
AM_CONDITIONAL(INSTALL_MONODROID, [test "x$with_monodroid" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_MONOTOUCH, [test "x$with_monotouch" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_XAMMAC, [test "x$with_xammac" != "xno"])
|
||||
AM_CONDITIONAL(INSTALL_MOBILE, [test "x$with_mobile" = xyes])
|
||||
AM_CONDITIONAL(ONLY_MONOTOUCH, [test "x$with_monotouch" = "xonly"])
|
||||
AM_CONDITIONAL(ONLY_XAMMAC, [test "x$with_xammac" = "xonly"])
|
||||
|
||||
AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
|
||||
AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
|
||||
@@ -3326,24 +3283,21 @@ AM_CONDITIONAL(MIPS, test x$TARGET = xMIPS)
|
||||
AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
|
||||
AM_CONDITIONAL(POWERPC64, test x$TARGET = xPOWERPC64)
|
||||
AM_CONDITIONAL(ARM, test x$TARGET = xARM)
|
||||
AM_CONDITIONAL(ARM64, test x$TARGET = xARM64)
|
||||
AM_CONDITIONAL(S390X, test x$TARGET = xS390X)
|
||||
AM_CONDITIONAL(HOST_X86, test x$HOST = xX86)
|
||||
AM_CONDITIONAL(HOST_AMD64, test x$HOST = xAMD64)
|
||||
AM_CONDITIONAL(HOST_ARM, test x$HOST = xARM)
|
||||
AM_CONDITIONAL(HOST_ARM64, test x$HOST = xARM64)
|
||||
AM_CONDITIONAL(CROSS_COMPILE, test "x$host" != "x$target")
|
||||
|
||||
AM_CONDITIONAL(INCLUDED_LIBGC, test x$libgc = xincluded)
|
||||
AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
|
||||
AM_CONDITIONAL(INTERP_SUPPORTED, test x$interp_wanted = xtrue)
|
||||
AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
|
||||
|
||||
AC_SUBST(LIBC)
|
||||
AC_SUBST(INTL)
|
||||
AC_SUBST(SQLITE)
|
||||
AC_SUBST(SQLITE3)
|
||||
AC_SUBST(X11)
|
||||
AC_SUBST(GDKX11)
|
||||
AC_SUBST(GTKX11)
|
||||
AC_SUBST(XINERAMA)
|
||||
AC_DEFINE_UNQUOTED(ARCHITECTURE,"$arch_target",[The architecture this is running on])
|
||||
AC_SUBST(arch_target)
|
||||
AC_SUBST(CFLAGS)
|
||||
@@ -3353,7 +3307,11 @@ AC_SUBST(LDFLAGS)
|
||||
mono_build_root=`pwd`
|
||||
AC_SUBST(mono_build_root)
|
||||
|
||||
mono_runtime=mono/mini/mono
|
||||
if test x$USEJIT = xtrue; then
|
||||
mono_runtime=mono/mini/mono
|
||||
else
|
||||
mono_runtime=mono/interpreter/mint
|
||||
fi
|
||||
AC_SUBST(mono_runtime)
|
||||
|
||||
mono_cfg_root=$mono_build_root/runtime
|
||||
@@ -3547,9 +3505,9 @@ mono/arch/ppc/Makefile
|
||||
mono/arch/sparc/Makefile
|
||||
mono/arch/s390x/Makefile
|
||||
mono/arch/arm/Makefile
|
||||
mono/arch/arm64/Makefile
|
||||
mono/arch/ia64/Makefile
|
||||
mono/arch/mips/Makefile
|
||||
mono/interpreter/Makefile
|
||||
mono/tests/Makefile
|
||||
mono/tests/tests-config
|
||||
mono/tests/assemblyresolve/Makefile
|
||||
@@ -3560,7 +3518,6 @@ mono/tests/cas/inheritance/Makefile
|
||||
mono/tests/cas/linkdemand/Makefile
|
||||
mono/tests/cas/threads/Makefile
|
||||
mono/tests/gc-descriptors/Makefile
|
||||
mono/unit-tests/Makefile
|
||||
mono/benchmark/Makefile
|
||||
mono/monograph/Makefile
|
||||
mono/io-layer/Makefile
|
||||
@@ -3587,6 +3544,7 @@ data/mono-nunit.pc
|
||||
data/mono-options.pc
|
||||
data/mono-lineeditor.pc
|
||||
data/monodoc.pc
|
||||
data/mono.web.pc
|
||||
data/dotnet.pc
|
||||
data/dotnet35.pc
|
||||
data/wcf.pc
|
||||
@@ -3678,6 +3636,11 @@ fi
|
||||
enable_system_aot=yes
|
||||
fi
|
||||
|
||||
if test "x$enable_loadedllvm" = "xyes"; then
|
||||
# This seems to fail on the x86 buildbots
|
||||
enable_system_aot=no
|
||||
fi
|
||||
|
||||
if test x$host_win32 = xno -a x$enable_system_aot = xyes; then
|
||||
echo "ENABLE_AOT = 1" >> $mcs_topdir/build/config.make
|
||||
fi
|
||||
@@ -3700,9 +3663,6 @@ fi
|
||||
if test -z "$INSTALL_MONOTOUCH_TRUE"; then :
|
||||
default_profile=monotouch
|
||||
fi
|
||||
if test -z "$INSTALL_XAMMAC_TRUE"; then :
|
||||
default_profile=xammac
|
||||
fi
|
||||
if test -z "$INSTALL_4_5_TRUE"; then :
|
||||
default_profile=net_4_5
|
||||
fi
|
||||
@@ -3739,8 +3699,6 @@ echo "
|
||||
mcs source: $mcsdir
|
||||
|
||||
Engine:
|
||||
Host: $host
|
||||
Target: $target
|
||||
GC: $gc_msg
|
||||
TLS: $with_tls
|
||||
SIGALTSTACK: $with_sigaltstack
|
||||
@@ -3756,7 +3714,6 @@ echo "
|
||||
.NET 4.5: $with_profile4_5
|
||||
MonoDroid: $with_monodroid
|
||||
MonoTouch: $with_monotouch
|
||||
Xamarin.Mac: $with_xammac
|
||||
JNI support: $jdk_headers_found
|
||||
libgdiplus: $libgdiplus_msg
|
||||
zlib: $zlib_msg
|
||||
+12
-3
@@ -12,7 +12,7 @@ EXTRA_DIST = \
|
||||
mono.pc.in mono-2.pc.in monosgen-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
|
||||
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
|
||||
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
|
||||
dtrace-prelink.sh system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
|
||||
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
|
||||
reactive.pc.in xbuild12.pc \
|
||||
net_1_1/machine.config \
|
||||
gdb/mono-gdb.py \
|
||||
@@ -26,11 +26,20 @@ else
|
||||
SGENPCFILE=
|
||||
endif
|
||||
|
||||
if JIT_SUPPORTED
|
||||
if INTERP_SUPPORTED
|
||||
pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
|
||||
else
|
||||
pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
|
||||
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
|
||||
endif
|
||||
else
|
||||
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
|
||||
endif
|
||||
|
||||
DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
|
||||
system.web.extensions.design_1.0.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
|
||||
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
|
||||
|
||||
mono_DATA = config \
|
||||
browscap.ini
|
||||
|
||||
+3
-8
@@ -10,15 +10,12 @@
|
||||
<dllmap dll="i:odbc32.dll" target="libiodbc.dylib" os="osx"/>
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="@prefix@/@reloc_libdir@/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="i:msvcrt" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="i:msvcrt.dll" target="@LIBC@" os="!windows"/>
|
||||
<dllmap dll="sqlite" target="@SQLITE@" os="!windows"/>
|
||||
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
|
||||
<dllmap dll="libX11" target="@X11@" os="!windows" />
|
||||
<dllmap dll="libgdk-x11-2.0" target="@GDKX11@" os="!windows"/>
|
||||
<dllmap dll="libgtk-x11-2.0" target="@GTKX11@" os="!windows"/>
|
||||
<dllmap dll="libXinerama" target="@XINERAMA@" os="!windows" />
|
||||
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
|
||||
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
|
||||
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
|
||||
@@ -29,8 +26,6 @@
|
||||
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
|
||||
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
|
||||
</dllmap>
|
||||
<dllmap dll="gdiplus" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdiplus.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdi32.dll" target="@libgdiplus_install_loc@" os="!windows"/>
|
||||
<dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
|
||||
</configuration>
|
||||
+1
-1
@@ -2,4 +2,4 @@
|
||||
Name: Standard libraries in a .NET setup
|
||||
Description: References all the standard .NET libraries for compilation
|
||||
Version: @VERSION@
|
||||
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Xml.Linq.dll
|
||||
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll
|
||||
+20
-21
@@ -15,7 +15,6 @@
|
||||
# When attaching to a mono process, make sure you are in the same directory.
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
|
||||
class StringPrinter:
|
||||
@@ -36,7 +35,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 = "\u%X".format (val)
|
||||
c = "\u%X" % val
|
||||
else:
|
||||
c = chr (val)
|
||||
res.append (c)
|
||||
@@ -53,7 +52,7 @@ def stringify_class_name(ns, name):
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "%s.%s".format (ns, name)
|
||||
return "%s.%s" % (ns, name)
|
||||
|
||||
class ArrayPrinter:
|
||||
"Print a C# array"
|
||||
@@ -66,7 +65,7 @@ class ArrayPrinter:
|
||||
def to_string(self):
|
||||
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
|
||||
length = obj ['max_length']
|
||||
return "%s [%d]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
|
||||
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
|
||||
class ObjectPrinter:
|
||||
"Print a C# object"
|
||||
@@ -96,7 +95,7 @@ class ObjectPrinter:
|
||||
return (field.name, self.obj [field.name])
|
||||
except:
|
||||
# Superclass
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("%s".format (field.name))))
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
|
||||
|
||||
def children(self):
|
||||
# FIXME: It would be easier if gdb.Value would support iteration itself
|
||||
@@ -109,11 +108,11 @@ class ObjectPrinter:
|
||||
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
|
||||
if class_name [-2:len(class_name)] == "[]":
|
||||
return {}.__iter__ ()
|
||||
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
|
||||
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
|
||||
return self._iterator(obj.cast (gdb_type))
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
print (sys.exc_info ()[1])
|
||||
print sys.exc_info ()[0]
|
||||
print sys.exc_info ()[1]
|
||||
return {}.__iter__ ()
|
||||
|
||||
def to_string(self):
|
||||
@@ -129,16 +128,16 @@ class ObjectPrinter:
|
||||
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
|
||||
if class_ns != "":
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct %s.%s".format (class_ns, class_name))
|
||||
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
|
||||
except:
|
||||
# Maybe there is no debug info for that type
|
||||
return "%s.%s".format (class_ns, class_name)
|
||||
return "%s.%s" % (class_ns, class_name)
|
||||
#return obj.cast (gdb_type)
|
||||
return "%s.%s".format (class_ns, class_name)
|
||||
return "%s.%s" % (class_ns, class_name)
|
||||
return class_name
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
print (sys.exc_info ()[1])
|
||||
print sys.exc_info ()[0]
|
||||
print sys.exc_info ()[1]
|
||||
# FIXME: This can happen because we don't have liveness information
|
||||
return self.val.cast (gdb.lookup_type ("guint64"))
|
||||
|
||||
@@ -154,9 +153,9 @@ class MonoMethodPrinter:
|
||||
val = self.val.dereference ()
|
||||
klass = val ["klass"].dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"%s:%s ()\"".format (class_name, val ["name"].string ())
|
||||
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
|
||||
class MonoClassPrinter:
|
||||
"Print a MonoClass structure"
|
||||
@@ -169,9 +168,9 @@ class MonoClassPrinter:
|
||||
return "0x0"
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"%s\"".format (class_name)
|
||||
return "\"%s\"" % (class_name)
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
|
||||
def lookup_pretty_printer(val):
|
||||
t = str (val.type)
|
||||
@@ -217,9 +216,9 @@ class MonoSupport(object):
|
||||
new_size = os.stat ("xdb.s").st_size
|
||||
if new_size > self.s_size:
|
||||
sofile = "xdb.so"
|
||||
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o".format (sofile))
|
||||
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o" % sofile)
|
||||
# FIXME: This prints messages which couldn't be turned off
|
||||
gdb.execute ("add-symbol-file %s 0".format (sofile))
|
||||
gdb.execute ("add-symbol-file %s 0" % sofile)
|
||||
self.s_size = new_size
|
||||
|
||||
class RunHook (gdb.Command):
|
||||
@@ -230,7 +229,7 @@ class RunHook (gdb.Command):
|
||||
def invoke(self, arg, from_tty):
|
||||
mono_support.run_hook ()
|
||||
|
||||
print ("Mono support loaded.")
|
||||
print "Mono support loaded."
|
||||
|
||||
mono_support = MonoSupport ()
|
||||
|
||||
@@ -245,4 +244,4 @@ exec_file = gdb.current_objfile ().filename
|
||||
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
|
||||
exec_file = os.readlink (exec_file)
|
||||
exec_dir = os.path.dirname (exec_file)
|
||||
gdb.execute ("source %s/%s-gdbinit".format (exec_dir, os.path.basename (exec_file)))
|
||||
gdb.execute ("source %s/%s-gdbinit" % (exec_dir, os.path.basename (exec_file)))
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
import sys
|
||||
|
||||
gdb.execute ("file %s".format (sys.argv [0]))
|
||||
gdb.execute ("r --break *:* %s".format (" ".join (sys.argv [1:len (sys.argv)])))
|
||||
gdb.execute ("file %s" % sys.argv [0])
|
||||
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
|
||||
|
||||
while True:
|
||||
try:
|
||||
|
||||
+31
-32
@@ -10,7 +10,6 @@
|
||||
# - run mono under gdb, or attach to a mono process started with --debug=gdb using gdb.
|
||||
#
|
||||
|
||||
from __future__ import print_function
|
||||
import os
|
||||
|
||||
class StringPrinter:
|
||||
@@ -31,7 +30,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 = "\u%X".format (val)
|
||||
c = "\u%X" % val
|
||||
else:
|
||||
c = chr (val)
|
||||
res.append (c)
|
||||
@@ -48,7 +47,7 @@ def stringify_class_name(ns, name):
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "%s.%s".format (ns, name)
|
||||
return "%s.%s" % (ns, name)
|
||||
|
||||
class ArrayPrinter:
|
||||
"Print a C# array"
|
||||
@@ -61,7 +60,7 @@ class ArrayPrinter:
|
||||
def to_string(self):
|
||||
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
|
||||
length = obj ['max_length']
|
||||
return "%s [%d]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
|
||||
class ObjectPrinter:
|
||||
"Print a C# object"
|
||||
@@ -91,7 +90,7 @@ class ObjectPrinter:
|
||||
return (field.name, self.obj [field.name])
|
||||
except:
|
||||
# Superclass
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("%s".format (field.name))))
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
|
||||
|
||||
def children(self):
|
||||
# FIXME: It would be easier if gdb.Value would support iteration itself
|
||||
@@ -105,13 +104,13 @@ class ObjectPrinter:
|
||||
if class_name [-2:len(class_name)] == "[]":
|
||||
return {}.__iter__ ()
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
|
||||
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
|
||||
return self._iterator(obj.cast (gdb_type))
|
||||
except:
|
||||
return {}.__iter__ ()
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
print (sys.exc_info ()[1])
|
||||
print sys.exc_info ()[0]
|
||||
print sys.exc_info ()[1]
|
||||
return {}.__iter__ ()
|
||||
|
||||
def to_string(self):
|
||||
@@ -127,16 +126,16 @@ class ObjectPrinter:
|
||||
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
|
||||
if class_ns != "":
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct %s.%s".format (class_ns, class_name))
|
||||
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
|
||||
except:
|
||||
# Maybe there is no debug info for that type
|
||||
return "%s.%s".format (class_ns, class_name)
|
||||
return "%s.%s" % (class_ns, class_name)
|
||||
#return obj.cast (gdb_type)
|
||||
return "%s.%s".format (class_ns, class_name)
|
||||
return "%s.%s" % (class_ns, class_name)
|
||||
return class_name
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
print (sys.exc_info ()[1])
|
||||
print sys.exc_info ()[0]
|
||||
print sys.exc_info ()[1]
|
||||
# FIXME: This can happen because we don't have liveness information
|
||||
return self.val.cast (gdb.lookup_type ("guint64"))
|
||||
|
||||
@@ -152,9 +151,9 @@ class MonoMethodPrinter:
|
||||
val = self.val.dereference ()
|
||||
klass = val ["klass"].dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"%s:%s ()\"".format (class_name, val ["name"].string ())
|
||||
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
|
||||
class MonoClassPrinter:
|
||||
"Print a MonoClass structure"
|
||||
@@ -168,20 +167,20 @@ class MonoClassPrinter:
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
if klass ["generic_class"].cast (gdb.lookup_type ("guint64")) != 0:
|
||||
class_name = "%s<%s>".format (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
|
||||
class_name = "%s<%s>" % (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
|
||||
if add_quotes:
|
||||
return "\"%s\"".format (class_name)
|
||||
return "\"%s\"" % (class_name)
|
||||
else:
|
||||
return class_name
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
|
||||
def to_string(self):
|
||||
try:
|
||||
return self.to_string_inner (True)
|
||||
except:
|
||||
#print (sys.exc_info ()[0])
|
||||
#print (sys.exc_info ()[1])
|
||||
#print sys.exc_info ()[0]
|
||||
#print sys.exc_info ()[1]
|
||||
return str(self.val.cast (gdb.lookup_type ("gpointer")))
|
||||
|
||||
class MonoGenericInstPrinter:
|
||||
@@ -198,7 +197,7 @@ class MonoGenericInstPrinter:
|
||||
inst_args = inst ["type_argv"]
|
||||
inst_str = ""
|
||||
for i in range(0, inst_len):
|
||||
print (inst_args)
|
||||
print inst_args
|
||||
type_printer = MonoTypePrinter (inst_args [i])
|
||||
if i > 0:
|
||||
inst_str = inst_str + ", "
|
||||
@@ -222,14 +221,14 @@ class MonoGenericClassPrinter:
|
||||
method_inst_str = ""
|
||||
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
|
||||
method_inst_str = str(method_inst)
|
||||
return "%s, [%s], [%s]>".format (container_str, class_inst_str, method_inst_str)
|
||||
return "%s, [%s], [%s]>" % (container_str, class_inst_str, method_inst_str)
|
||||
|
||||
def to_string(self):
|
||||
try:
|
||||
return self.to_string_inner ()
|
||||
except:
|
||||
#print (sys.exc_info ()[0])
|
||||
#print (sys.exc_info ()[1])
|
||||
#print sys.exc_info ()[0]
|
||||
#print sys.exc_info ()[1]
|
||||
return str(self.val.cast (gdb.lookup_type ("gpointer")))
|
||||
|
||||
class MonoTypePrinter:
|
||||
@@ -252,12 +251,12 @@ class MonoTypePrinter:
|
||||
info = str(t ["data"]["generic_class"])
|
||||
|
||||
if info != "":
|
||||
return "{%s, %s}".format (kind, info)
|
||||
return "{%s, %s}" % (kind, info)
|
||||
else:
|
||||
return "{%s}".format (kind)
|
||||
return "{%s}" % (kind)
|
||||
except:
|
||||
#print (sys.exc_info ()[0])
|
||||
#print (sys.exc_info ()[1])
|
||||
#print sys.exc_info ()[0]
|
||||
#print sys.exc_info ()[1]
|
||||
return str(self.val.cast (gdb.lookup_type ("gpointer")))
|
||||
|
||||
def to_string(self):
|
||||
@@ -278,12 +277,12 @@ class MonoMethodRgctxPrinter:
|
||||
inst_args = inst ["type_argv"]
|
||||
inst_str = ""
|
||||
for i in range(0, inst_len):
|
||||
print (inst_args)
|
||||
print inst_args
|
||||
type_printer = MonoTypePrinter (inst_args [i])
|
||||
if i > 0:
|
||||
inst_str = inst_str + ", "
|
||||
inst_str = inst_str + type_printer.to_string ()
|
||||
return "MRGCTX[%s, [%s]]".format (klass_printer.to_string(), inst_str)
|
||||
return "MRGCTX[%s, [%s]]" % (klass_printer.to_string(), inst_str)
|
||||
|
||||
class MonoVTablePrinter:
|
||||
"Print a MonoVTable structure"
|
||||
@@ -298,7 +297,7 @@ class MonoVTablePrinter:
|
||||
klass = vtable ["klass"]
|
||||
klass_printer = MonoClassPrinter (klass)
|
||||
|
||||
return "vtable(%s)".format (klass_printer.to_string ())
|
||||
return "vtable(%s)" % (klass_printer.to_string ())
|
||||
|
||||
def lookup_pretty_printer(val):
|
||||
t = str (val.type)
|
||||
@@ -349,6 +348,6 @@ XdbCommand ()
|
||||
|
||||
gdb.execute ("set environment MONO_XDEBUG gdb")
|
||||
|
||||
print ("Mono support loaded.")
|
||||
print "Mono support loaded."
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
|
||||
import sys
|
||||
|
||||
gdb.execute ("file %s".format (sys.argv [0]))
|
||||
gdb.execute ("r --break *:* %s".format (" ".join (sys.argv [1:len (sys.argv)])))
|
||||
gdb.execute ("file %s" % sys.argv [0])
|
||||
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
|
||||
|
||||
while True:
|
||||
try:
|
||||
|
||||
@@ -0,0 +1,4 @@
|
||||
Name: Mono.Web
|
||||
Description: Mono ASP.NET extension classes
|
||||
Version: 2.0.0.0
|
||||
Libs: -r:@prefix@/lib/mono/gac/Mono.Web/2.0.0.0__0738eb9f132ed756/Mono.Web.dll
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<settingsMap>
|
||||
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
|
||||
platform="Unix">
|
||||
|
||||
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
|
||||
@@ -24,7 +24,7 @@
|
||||
</map>
|
||||
|
||||
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
|
||||
platform="Unix">
|
||||
|
||||
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<settingsMap>
|
||||
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
|
||||
platform="Unix">
|
||||
|
||||
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
|
||||
@@ -24,7 +24,7 @@
|
||||
</map>
|
||||
|
||||
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
|
||||
platform="Unix">
|
||||
|
||||
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<settingsMap>
|
||||
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.MembershipSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
|
||||
platform="Unix">
|
||||
|
||||
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
|
||||
@@ -24,7 +24,7 @@
|
||||
</map>
|
||||
|
||||
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.RoleManagerSectionMapper, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
|
||||
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
|
||||
platform="Unix">
|
||||
|
||||
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
|
||||
|
||||
+26
-25
@@ -73,40 +73,41 @@ dist-hook:
|
||||
cp HtmlAgilityPack/* $(distdir)/HtmlAgilityPack
|
||||
|
||||
clean-local:
|
||||
-rm -Rf html
|
||||
-rm -f deploy/* convert.exe* AgilityPack.dll*
|
||||
-rm -f $(ASSEMBLED_DOCS)
|
||||
|
||||
TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
|
||||
-rm -Rf $(srcdir)/html
|
||||
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* $(srcdir)/AgilityPack.dll*
|
||||
-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
|
||||
|
||||
monoapi.zip: monoapi.tree
|
||||
|
||||
monoapi.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/toc.xml $(srcdir)/deploy/.stamp
|
||||
-mkdir -p deploy
|
||||
cp -f $(srcdir)/api-style.css deploy
|
||||
$(TOOL_MAKE) $@
|
||||
@test -f $@ || { rm -f $(srcdir)/monoapi.tree && $(MAKE) monoapi.tree; }
|
||||
monoapi.tree: docs.make Makefile.am toc.xml $(srcdir)/deploy/.stamp perms
|
||||
cd $(srcdir) && cp -f api-style.css deploy
|
||||
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
|
||||
|
||||
mono-tools.zip: mono-tools.tree
|
||||
@test -f $@ || { rm -f $(srcdir)/mono-tools.tree && $(MAKE) mono-tools.tree; }
|
||||
mono-tools.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp perms
|
||||
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
|
||||
|
||||
mono-tools.tree: $(srcdir)/docs.make Makefile.am deploy/.stamp
|
||||
$(TOOL_MAKE) $@
|
||||
mono-file-formats.zip: mono-file-formats.tree perms
|
||||
@test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree && $(MAKE) mono-file-formats.tree; }
|
||||
mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
|
||||
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
|
||||
|
||||
mono-file-formats.zip: mono-file-formats.tree
|
||||
|
||||
mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp
|
||||
$(TOOL_MAKE) $@
|
||||
|
||||
deploy/.stamp: convert.exe Makefile.am
|
||||
$(mkdir_p) html
|
||||
$(srcdir)/deploy/.stamp: convert.exe Makefile.am perms
|
||||
$(mkdir_p) $(srcdir)/html
|
||||
runtimedir=`cd ../runtime && pwd`; export runtimedir; \
|
||||
MONO_PATH=../mcs/class/lib/net_2_0 perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
|
||||
cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
|
||||
touch $@
|
||||
|
||||
extract: deploy/.stamp
|
||||
extract: $(srcdir)/deploy/.stamp
|
||||
|
||||
convert.exe: convert.cs AgilityPack.dll
|
||||
$(TOOL_MAKE) PROFILE=net_2_0 convert.exe
|
||||
convert.exe: convert.cs AgilityPack.dll perms
|
||||
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
|
||||
|
||||
AgilityPack.dll:
|
||||
$(TOOL_MAKE) PROFILE=net_2_0 AgilityPack.dll
|
||||
AgilityPack.dll: perms
|
||||
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) AgilityPack.dll
|
||||
|
||||
.PHONY: perms
|
||||
perms:
|
||||
-@test -w $(srcdir) || chmod a+w $(srcdir)
|
||||
|
||||
+5
-13
@@ -1,8 +1,3 @@
|
||||
#
|
||||
# This makefile is here because it uses the configuration from the
|
||||
# in-place built mono to run and compile a few C# tools
|
||||
#
|
||||
|
||||
thisdir = docs
|
||||
SUBDIRS =
|
||||
include $(topdir)/build/rules.make
|
||||
@@ -12,28 +7,25 @@ ASSEMBLED_DOCS = \
|
||||
mono-tools.tree mono-tools.zip \
|
||||
monoapi.tree monoapi.zip
|
||||
|
||||
convert.exe: $(srcdir)/convert.cs AgilityPack.dll
|
||||
convert.exe: convert.cs AgilityPack.dll
|
||||
$(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
|
||||
|
||||
AgilityPack.dll:
|
||||
$(CSCOMPILE) -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
$(CSCOMPILE) -target:library -out:$@ HtmlAgilityPack/*.cs
|
||||
|
||||
monoapi.zip: monoapi.tree
|
||||
@test -f $@ || { rm -f $< && $(MAKE) $<; }
|
||||
|
||||
monoapi.tree: $(srcdir)/toc.xml $(srcdir)/docs.make
|
||||
monoapi.tree: toc.xml docs.make
|
||||
$(MDOC) assemble -o monoapi -f hb $<
|
||||
|
||||
mono-tools.zip: mono-tools.tree
|
||||
@test -f $@ || { rm -f $< && $(MAKE) $<; }
|
||||
|
||||
mono-tools.tree: $(srcdir)/mono-tools.config $(srcdir)/docs.make
|
||||
mono-tools.tree: mono-tools.config docs.make
|
||||
$(MDOC) assemble -o mono-tools -f man $<
|
||||
|
||||
mono-file-formats.zip: mono-file-formats.tree
|
||||
@test -f $@ || { rm -f $< && $(MAKE) $<; }
|
||||
|
||||
mono-file-formats.tree: $(srcdir)/mono-file-formats.config $(srcdir)/docs.make
|
||||
mono-file-formats.tree: mono-file-formats.config docs.make
|
||||
$(MDOC) assemble -o mono-file-formats -f man $<
|
||||
|
||||
.doc-stamp:
|
||||
|
||||
+3
-9
@@ -1,23 +1,17 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
if ($ARGV[0] eq "-h"){
|
||||
$sourcedir = $ARGV[1];
|
||||
$dir = $sourcedir;
|
||||
$dir = $ARGV[1];
|
||||
$html = 1;
|
||||
shift @ARGV;
|
||||
shift @ARGV;
|
||||
}
|
||||
|
||||
if ($ARGV[0] eq "-t"){
|
||||
$dir = $ARGV[1];
|
||||
shift @ARGV;
|
||||
}
|
||||
|
||||
if ($html){
|
||||
opendir (D, "$sourcedir/sources/") || die "Can not open $dir";
|
||||
opendir (D, "$dir/sources/") || die "Can not open $dir";
|
||||
while ($n = readdir (D)){
|
||||
if ($n =~ /mono-api-.*\.html$/){
|
||||
open (IN, "$sourcedir/sources/$n") || die "Can not open $n";
|
||||
open (IN, "$dir/sources/$n") || die "Can not open $n";
|
||||
$files[$filecount] = $n;
|
||||
while (<IN>){
|
||||
@files_content[$filecount] .= $_;
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
<h4><a name="api:mono_custom_attrs_from_property">mono_custom_attrs_from_property</a></h4>
|
||||
<h4><a name="api:mono_custom_attrs_has_attr">mono_custom_attrs_has_attr</a></h4>
|
||||
|
||||
<h2></h2>
|
||||
<h2>
|
||||
<h4><a name="api:mono_module_file_get_object">mono_module_file_get_object</a></h4>
|
||||
<h4><a name="api:mono_module_get_object">mono_module_get_object</a></h4>
|
||||
<h4><a name="api:mono_method_body_get_object">mono_method_body_get_object</a></h4>
|
||||
|
||||
@@ -19,12 +19,12 @@
|
||||
<h4><a name="api:CreateMutex">CreateMutex</a></h4>
|
||||
<h4><a name="api:CreatePipe">CreatePipe</a></h4>
|
||||
<h4><a name="api:CreateProcess">CreateProcess</a></h4>
|
||||
<h4><a name="api:CreateProcessWithLogonW">CreateProcessWithLogonW</a></h4>
|
||||
<h4><a name="api:CreateProcessWithLogonW">CreateProcessWithLogonW</a>
|
||||
<h4><a name="api:CreateSemaphore">CreateSemaphore</a></h4>
|
||||
<h4><a name="api:CreateThread">CreateThread</a></h4>
|
||||
<h4><a name="api:DeleteCriticalSection">DeleteCriticalSection</a></h4>
|
||||
<h4><a name="api:DeleteFile">DeleteFile</a></h4>
|
||||
<h4><a name="api:DuplicateHandle">DuplicateHandle</a></h4>
|
||||
<h4><a name="api:DuplicateHandle">DuplicateHandle</a>
|
||||
<h4><a name="api:EnterCriticalSection">EnterCriticalSection</a></h4>
|
||||
<h4><a name="api:EnumProcesses">EnumProcesses</a></h4>
|
||||
<h4><a name="api:EnumProcessModules">EnumProcessModules</a></h4>
|
||||
@@ -35,14 +35,14 @@
|
||||
<h4><a name="api:FindFirstFile">FindFirstFile</a></h4>
|
||||
<h4><a name="api:FindNextFile">FindNextFile</a></h4>
|
||||
<h4><a name="api:FlushFileBuffers">FlushFileBuffers</a></h4>
|
||||
<h4><a name="api:FormatMessage">FormatMessage</a></h4>
|
||||
<h4><a name="api:FormatMessage">FormatMessage</a>
|
||||
<h4><a name="api:GetCurrentDirectory">GetCurrentDirectory</a></h4>
|
||||
<h4><a name="api:GetCurrentProcess">GetCurrentProcess</a></h4>
|
||||
<h4><a name="api:GetCurrentProcessId">GetCurrentProcessId</a></h4>
|
||||
<h4><a name="api:GetCurrentThread">GetCurrentThread</a></h4>
|
||||
<h4><a name="api:GetCurrentThreadId">GetCurrentThreadId</a></h4>
|
||||
<h4><a name="api:GetDiskFreeSpaceEx">GetDiskFreeSpaceEx</a></h4>
|
||||
<h4><a name="api:GetDriveType">GetDriveType</a></h4>
|
||||
<h4><a name="api:GetDiskFreeSpaceEx">GetDiskFreeSpaceEx</a>
|
||||
<h4><a name="api:GetDriveType">GetDriveType</a>
|
||||
<h4><a name="api:GetExitCodeProcess">GetExitCodeProcess</a></h4>
|
||||
<h4><a name="api:GetExitCodeThread">GetExitCodeThread</a></h4>
|
||||
<h4><a name="api:GetFileAttributesEx">GetFileAttributesEx</a></h4>
|
||||
@@ -50,14 +50,14 @@
|
||||
<h4><a name="api:GetFileSize">GetFileSize</a></h4>
|
||||
<h4><a name="api:GetFileTime">GetFileTime</a></h4>
|
||||
<h4><a name="api:GetFileType">GetFileType</a></h4>
|
||||
<h4><a name="api:GetFileVersionInfo">GetFileVersionInfo</a></h4>
|
||||
<h4><a name="api:GetFileVersionInfoSize">GetFileVersionInfoSize</a></h4>
|
||||
<h4><a name="api:GetFileVersionInfo">GetFileVersionInfo</a>
|
||||
<h4><a name="api:GetFileVersionInfoSize">GetFileVersionInfoSize</a>
|
||||
<h4><a name="api:GetLastError">GetLastError</a></h4>
|
||||
<h4><a name="api:GetLogicalDriveStrings">GetLogicalDriveStrings</a></h4>
|
||||
<h4><a name="api:GetModuleBaseName">GetModuleBaseName</a></h4>
|
||||
<h4><a name="api:GetModuleFileNameEx">GetModuleFileNameEx</a></h4>
|
||||
<h4><a name="api:GetModuleInformation">GetModuleInformation</a></h4>
|
||||
<h4><a name="api:GetPriorityClass">GetPriorityClass</a></h4>
|
||||
<h4><a name="api:GetModuleFileNameEx">GetModuleFileNameEx</a>
|
||||
<h4><a name="api:GetModuleInformation">GetModuleInformation</a>
|
||||
<h4><a name="api:GetPriorityClass">GetPriorityClass</a>
|
||||
<h4><a name="api:GetProcessId">GetProcessId</a></h4>
|
||||
<h4><a name="api:GetProcessTimes">GetProcessTimes</a></h4>
|
||||
<h4><a name="api:GetProcessWorkingSetSize">GetProcessWorkingSetSize</a></h4>
|
||||
@@ -86,7 +86,7 @@
|
||||
<h4><a name="api:ReleaseMutex">ReleaseMutex</a></h4>
|
||||
<h4><a name="api:ReleaseSemaphore">ReleaseSemaphore</a></h4>
|
||||
<h4><a name="api:RemoveDirectory">RemoveDirectory</a></h4>
|
||||
<h4><a name="api:ReplaceFile">ReplaceFile</a></h4>
|
||||
<h4><a name="api:ReplaceFile">ReplaceFile</a>
|
||||
<h4><a name="api:ResetEvent">ResetEvent</a></h4>
|
||||
<h4><a name="api:ResumeThread">ResumeThread</a></h4>
|
||||
<h4><a name="api:RevertToSelf">RevertToSelf</a></h4>
|
||||
@@ -98,7 +98,7 @@
|
||||
<h4><a name="api:SetFilePointer">SetFilePointer</a></h4>
|
||||
<h4><a name="api:SetFileTime">SetFileTime</a></h4>
|
||||
<h4><a name="api:SetLastError">SetLastError</a></h4>
|
||||
<h4><a name="api:SetPriorityClass">SetPriorityClass</a></h4>
|
||||
<h4><a name="api:SetPriorityClass">SetPriorityClass</a>
|
||||
<h4><a name="api:SetProcessWorkingSetSize">SetProcessWorkingSetSize</a></h4>
|
||||
<h4><a name="api:ShellExecuteEx">ShellExecuteEx</a></h4>
|
||||
<h4><a name="api:SignalObjectAndWait">SignalObjectAndWait</a></h4>
|
||||
@@ -110,12 +110,12 @@
|
||||
<h4><a name="api:TlsFree">TlsFree</a></h4>
|
||||
<h4><a name="api:TlsGetValue">TlsGetValue</a></h4>
|
||||
<h4><a name="api:TlsSetValue">TlsSetValue</a></h4>
|
||||
<h4><a name="api:TransmitFile">TransmitFile</a></h4>
|
||||
<h4><a name="api:TransmitFile">TransmitFile</a>
|
||||
<h4><a name="api:TryEnterCriticalSection">TryEnterCriticalSection</a></h4>
|
||||
<h4><a name="api:UnlockFile">UnlockFile</a></h4>
|
||||
<h4><a name="api:VerLanguageName">VerLanguageName</a></h4>
|
||||
<h4><a name="api:VerQueryValue">VerQueryValue</a></h4>
|
||||
<h4><a name="api:WaitForInputIdle">WaitForInputIdle</a></h4>
|
||||
<h4><a name="api:VerLanguageName">VerLanguageName</a>
|
||||
<h4><a name="api:VerQueryValue">VerQueryValue</a>
|
||||
<h4><a name="api:WaitForInputIdle">WaitForInputIdle</a>
|
||||
<h4><a name="api:WaitForMultipleObjectsEx">WaitForMultipleObjectsEx</a></h4>
|
||||
<h4><a name="api:WaitForMultipleObjects">WaitForMultipleObjects</a></h4>
|
||||
<h4><a name="api:WaitForSingleObjectEx">WaitForSingleObjectEx</a></h4>
|
||||
@@ -136,9 +136,9 @@
|
||||
APIs.
|
||||
|
||||
<h4><a name="api:mono_once">mono_once</a></h4>
|
||||
<h4><a name="api:wapi_clear_interruption">wapi_clear_interruption</a></h4>
|
||||
<h4><a name="api:wapi_current_thread_desc">wapi_current_thread_desc</a></h4>
|
||||
<h4><a name="api:wapi_interrupt_thread">wapi_interrupt_thread</a></h4>
|
||||
<h4><a name="api:wapi_self_interrupt">wapi_self_interrupt</a></h4>
|
||||
<h4><a name="api:wapi_thread_clear_wait_handle">wapi_thread_clear_wait_handle</a></h4>
|
||||
<h4><a name="api:wapi_thread_set_wait_handle">wapi_thread_set_wait_handle</a></h4>
|
||||
<h4><a name="api:wapi_clear_interruption">wapi_clear_interruption</a>
|
||||
<h4><a name="api:wapi_current_thread_desc">wapi_current_thread_desc</a>
|
||||
<h4><a name="api:wapi_interrupt_thread">wapi_interrupt_thread</a>
|
||||
<h4><a name="api:wapi_self_interrupt">wapi_self_interrupt</a>
|
||||
<h4><a name="api:wapi_thread_clear_wait_handle">wapi_thread_clear_wait_handle</a>
|
||||
<h4><a name="api:wapi_thread_set_wait_handle">wapi_thread_set_wait_handle</a>
|
||||
@@ -1,7 +1,5 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
if HOST_WIN32
|
||||
SUBDIRS = m4 src
|
||||
else
|
||||
|
||||
+3
-3
@@ -22,11 +22,11 @@ if test x$GCC != xyes; then
|
||||
dolt_supported=no
|
||||
fi
|
||||
case $host in
|
||||
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
|
||||
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*)
|
||||
pic_options='-fPIC'
|
||||
;;
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*)
|
||||
pic_options='-DDLL_EXPORT'
|
||||
;;
|
||||
i?86-apple-darwin*|arm-apple-darwin*)
|
||||
|
||||
+13
-7
@@ -88,7 +88,7 @@ case $host in
|
||||
esac
|
||||
|
||||
case $target in
|
||||
arm*-darwin*|aarch64*-*)
|
||||
arm*-darwin*)
|
||||
CFLAGS="$CFLAGS -U_FORTIFY_SOURCE"
|
||||
;;
|
||||
i*86-*-darwin*)
|
||||
@@ -135,7 +135,6 @@ AC_CHECK_SIZEOF(void *)
|
||||
AC_CHECK_SIZEOF(long)
|
||||
AC_CHECK_SIZEOF(long long)
|
||||
AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf)
|
||||
AC_CHECK_FUNCS(getrlimit)
|
||||
|
||||
#
|
||||
# Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding
|
||||
@@ -180,7 +179,7 @@ if test "x$have_iso_varargs" = "xyes"; then
|
||||
fi
|
||||
AC_SUBST(G_HAVE_ISO_VARARGS)
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h sys/resource.h)
|
||||
AC_CHECK_HEADERS(getopt.h sys/time.h sys/wait.h pwd.h langinfo.h iconv.h localcharset.h sys/types.h)
|
||||
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
|
||||
AC_SUBST(HAVE_ALLOCA_H)
|
||||
|
||||
@@ -236,11 +235,18 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Chan
|
||||
fi
|
||||
)
|
||||
|
||||
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
|
||||
if test x$werror_flag = xyes; then
|
||||
WERROR_CFLAGS="-Werror"
|
||||
dnl
|
||||
dnl No, you can not replace the call below with a pkg.m4 macro
|
||||
dnl
|
||||
have_glib=false
|
||||
if test "x$PKG_CONFIG" != "xno"; then
|
||||
if $PKG_CONFIG --atleast-version=$GLIB_REQUIRED_VERSION glib-2.0; then
|
||||
have_glib=true;
|
||||
else
|
||||
have_glib=false;
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([WERROR_CFLAGS])
|
||||
AM_CONDITIONAL(HAVE_GLIB, $have_glib)
|
||||
|
||||
AC_SUBST(GPOINTER_TO_INT)
|
||||
AC_SUBST(GPOINTER_TO_UINT)
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
noinst_LTLIBRARIES = libeglib.la libeglib-static.la
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
win_files = \
|
||||
eglib-config.hw \
|
||||
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
|
||||
@@ -32,7 +30,6 @@ libeglib_la_SOURCES = \
|
||||
garray.c \
|
||||
gbytearray.c \
|
||||
gerror.c \
|
||||
vasprintf.h \
|
||||
ghashtable.c \
|
||||
giconv.c \
|
||||
gmem.c \
|
||||
|
||||
@@ -273,9 +273,3 @@
|
||||
#define g_utf8_get_char_validated monoeg_utf8_get_char_validated
|
||||
#define g_utf8_prev_char monoeg_utf8_prev_char
|
||||
#define g_utf8_to_ucs4 monoeg_utf8_to_ucs4
|
||||
|
||||
|
||||
#define g_log_default_handler monoeg_log_default_handler
|
||||
#define g_log_set_default_handler monoeg_log_set_default_handler
|
||||
#define g_set_print_handler monoeg_set_print_handler
|
||||
#define g_set_printerr_handler monoeg_set_printerr_handler
|
||||
@@ -30,8 +30,6 @@
|
||||
#include <string.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "vasprintf.h"
|
||||
|
||||
GError *
|
||||
g_error_new (gpointer domain, gint code, const char *format, ...)
|
||||
{
|
||||
|
||||
+23
-15
@@ -49,6 +49,12 @@
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
/* MSC and Cross-compilatin will use this */
|
||||
int vasprintf (char **strp, const char *fmt, va_list ap);
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Basic data types
|
||||
*/
|
||||
@@ -176,6 +182,7 @@ typedef struct _GMemChunk GMemChunk;
|
||||
/*
|
||||
* Misc.
|
||||
*/
|
||||
#define g_atexit(func) ((void) atexit (func))
|
||||
|
||||
const gchar * g_getenv(const gchar *variable);
|
||||
gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);
|
||||
@@ -602,14 +609,10 @@ void g_assertion_message (const gchar *format, ...) G_GNUC_NORETURN
|
||||
#define g_message(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_MESSAGE, __VA_ARGS__)
|
||||
#define g_debug(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, __VA_ARGS__)
|
||||
#endif /* ndef HAVE_C99_SUPPORT */
|
||||
#define g_log_set_handler(a,b,c,d)
|
||||
|
||||
typedef void (*GLogFunc) (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer user_data);
|
||||
typedef void (*GPrintFunc) (const gchar *string);
|
||||
#define G_GNUC_INTERNAL
|
||||
|
||||
void g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data);
|
||||
GLogFunc g_log_set_default_handler (GLogFunc log_func, gpointer user_data);
|
||||
GPrintFunc g_set_print_handler (GPrintFunc func);
|
||||
GPrintFunc g_set_printerr_handler (GPrintFunc func);
|
||||
/*
|
||||
* Conversions
|
||||
*/
|
||||
@@ -724,16 +727,8 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
|
||||
#define G_UNLIKELY(x) (x)
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
#define eg_unreachable() __assume(0)
|
||||
#elif defined(__GNUC__) && ((__GNUC__ > 4) || (__GNUC__ == 4 && (__GNUC_MINOR__ >= 5)))
|
||||
#define eg_unreachable() __builtin_unreachable()
|
||||
#else
|
||||
#define eg_unreachable()
|
||||
#endif
|
||||
|
||||
#define g_assert(x) G_STMT_START { if (G_UNLIKELY (!(x))) g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x); } G_STMT_END
|
||||
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); eg_unreachable(); } G_STMT_END
|
||||
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); } G_STMT_END
|
||||
|
||||
/*
|
||||
* Unicode conversion
|
||||
@@ -1013,6 +1008,19 @@ glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
|
||||
#define G_PRIORITY_DEFAULT 0
|
||||
#define G_PRIORITY_DEFAULT_IDLE 200
|
||||
|
||||
/*
|
||||
* Empty thread functions, not used by eglib
|
||||
*/
|
||||
#define g_thread_supported() TRUE
|
||||
#define g_thread_init(x) G_STMT_START { if (x != NULL) { g_error ("No vtable supported in g_thread_init"); } } G_STMT_END
|
||||
|
||||
#define G_LOCK_DEFINE(name) int name;
|
||||
#define G_LOCK_DEFINE_STATIC(name) static int name;
|
||||
#define G_LOCK_EXTERN(name)
|
||||
#define G_LOCK(name)
|
||||
#define G_TRYLOCK(name)
|
||||
#define G_UNLOCK(name)
|
||||
|
||||
#define GUINT16_SWAP_LE_BE_CONSTANT(x) ((((guint16) x) >> 8) | ((((guint16) x) << 8)))
|
||||
|
||||
#define GUINT16_SWAP_LE_BE(x) ((guint16) (((guint16) x) >> 8) | ((((guint16)(x)) & 0xff) << 8))
|
||||
|
||||
+92
-167
@@ -31,51 +31,87 @@
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "vasprintf.h"
|
||||
|
||||
/* The current fatal levels, error is always fatal */
|
||||
static GLogLevelFlags fatal = G_LOG_LEVEL_ERROR;
|
||||
static GLogFunc default_log_func;
|
||||
static gpointer default_log_func_user_data;
|
||||
static GPrintFunc stdout_handler, stderr_handler;
|
||||
|
||||
static void default_stdout_handler (const gchar *string);
|
||||
static void default_stderr_handler (const gchar *string);
|
||||
#if PLATFORM_ANDROID
|
||||
#include <android/log.h>
|
||||
|
||||
static android_LogPriority
|
||||
to_android_priority (GLogLevelFlags log_level)
|
||||
{
|
||||
switch (log_level & G_LOG_LEVEL_MASK)
|
||||
{
|
||||
case G_LOG_LEVEL_ERROR: return ANDROID_LOG_FATAL;
|
||||
case G_LOG_LEVEL_CRITICAL: return ANDROID_LOG_ERROR;
|
||||
case G_LOG_LEVEL_WARNING: return ANDROID_LOG_WARN;
|
||||
case G_LOG_LEVEL_MESSAGE: return ANDROID_LOG_INFO;
|
||||
case G_LOG_LEVEL_INFO: return ANDROID_LOG_DEBUG;
|
||||
case G_LOG_LEVEL_DEBUG: return ANDROID_LOG_VERBOSE;
|
||||
}
|
||||
return ANDROID_LOG_UNKNOWN;
|
||||
}
|
||||
|
||||
static void
|
||||
out_vfprintf (FILE *ignore, const gchar *format, va_list args)
|
||||
{
|
||||
/* TODO: provide a proper app name */
|
||||
__android_log_vprint (ANDROID_LOG_ERROR, "mono", format, args);
|
||||
}
|
||||
#elif MONOTOUCH && defined(__arm__)
|
||||
#include <asl.h>
|
||||
|
||||
static int
|
||||
to_asl_priority (GLogLevelFlags log_level)
|
||||
{
|
||||
switch (log_level & G_LOG_LEVEL_MASK)
|
||||
{
|
||||
case G_LOG_LEVEL_ERROR: return ASL_LEVEL_CRIT;
|
||||
case G_LOG_LEVEL_CRITICAL: return ASL_LEVEL_ERR;
|
||||
case G_LOG_LEVEL_WARNING: return ASL_LEVEL_WARNING;
|
||||
case G_LOG_LEVEL_MESSAGE: return ASL_LEVEL_NOTICE;
|
||||
case G_LOG_LEVEL_INFO: return ASL_LEVEL_INFO;
|
||||
case G_LOG_LEVEL_DEBUG: return ASL_LEVEL_DEBUG;
|
||||
}
|
||||
return ASL_LEVEL_ERR;
|
||||
}
|
||||
|
||||
static void
|
||||
out_vfprintf (FILE *ignore, const gchar *format, va_list args)
|
||||
{
|
||||
asl_vlog (NULL, NULL, ASL_LEVEL_WARNING, format, args);
|
||||
}
|
||||
|
||||
#else
|
||||
static void
|
||||
out_vfprintf (FILE *file, const gchar *format, va_list args)
|
||||
{
|
||||
vfprintf (file, format, args);
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
g_print (const gchar *format, ...)
|
||||
{
|
||||
char *msg;
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
if (vasprintf (&msg, format, args) < 0)
|
||||
return;
|
||||
|
||||
out_vfprintf (stdout, format, args);
|
||||
|
||||
va_end (args);
|
||||
|
||||
if (!stdout_handler)
|
||||
stdout_handler = default_stdout_handler;
|
||||
|
||||
stdout_handler (msg);
|
||||
free (msg);
|
||||
}
|
||||
|
||||
void
|
||||
g_printerr (const gchar *format, ...)
|
||||
{
|
||||
char *msg;
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
if (vasprintf (&msg, format, args) < 0)
|
||||
return;
|
||||
|
||||
out_vfprintf (stderr, format, args);
|
||||
|
||||
va_end (args);
|
||||
|
||||
if (!stderr_handler)
|
||||
stderr_handler = default_stderr_handler;
|
||||
|
||||
stderr_handler (msg);
|
||||
free (msg);
|
||||
}
|
||||
|
||||
GLogLevelFlags
|
||||
@@ -102,16 +138,42 @@ g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask)
|
||||
void
|
||||
g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args)
|
||||
{
|
||||
#if PLATFORM_ANDROID
|
||||
__android_log_vprint (to_android_priority (log_level), log_domain, format, args);
|
||||
#elif MONOTOUCH && defined(__arm__)
|
||||
asl_vlog (NULL, NULL, to_asl_priority (log_level), format, args);
|
||||
#else
|
||||
char *msg;
|
||||
|
||||
if (!default_log_func)
|
||||
default_log_func = g_log_default_handler;
|
||||
|
||||
if (vasprintf (&msg, format, args) < 0)
|
||||
return;
|
||||
|
||||
default_log_func (log_domain, log_level, msg, default_log_func_user_data);
|
||||
#ifdef G_OS_WIN32
|
||||
printf ("%s%s%s\n",
|
||||
log_domain != NULL ? log_domain : "",
|
||||
log_domain != NULL ? ": " : "",
|
||||
msg);
|
||||
#else
|
||||
#if MONOTOUCH
|
||||
FILE *target = stderr;
|
||||
#else
|
||||
FILE *target = stdout;
|
||||
#endif
|
||||
|
||||
fprintf (target, "%s%s%s\n",
|
||||
log_domain != NULL ? log_domain : "",
|
||||
log_domain != NULL ? ": " : "",
|
||||
msg);
|
||||
#endif
|
||||
free (msg);
|
||||
if (log_level & fatal){
|
||||
fflush (stdout);
|
||||
fflush (stderr);
|
||||
}
|
||||
#endif
|
||||
if (log_level & fatal){
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
@@ -132,143 +194,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);
|
||||
}
|
||||
|
||||
|
||||
#if PLATFORM_ANDROID
|
||||
#include <android/log.h>
|
||||
|
||||
static android_LogPriority
|
||||
to_android_priority (GLogLevelFlags log_level)
|
||||
{
|
||||
switch (log_level & G_LOG_LEVEL_MASK)
|
||||
{
|
||||
case G_LOG_LEVEL_ERROR: return ANDROID_LOG_FATAL;
|
||||
case G_LOG_LEVEL_CRITICAL: return ANDROID_LOG_ERROR;
|
||||
case G_LOG_LEVEL_WARNING: return ANDROID_LOG_WARN;
|
||||
case G_LOG_LEVEL_MESSAGE: return ANDROID_LOG_INFO;
|
||||
case G_LOG_LEVEL_INFO: return ANDROID_LOG_DEBUG;
|
||||
case G_LOG_LEVEL_DEBUG: return ANDROID_LOG_VERBOSE;
|
||||
}
|
||||
return ANDROID_LOG_UNKNOWN;
|
||||
}
|
||||
|
||||
void
|
||||
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
|
||||
{
|
||||
__android_log_write (to_android_priority (log_level), log_domain, message);
|
||||
if (log_level & fatal)
|
||||
abort ();
|
||||
}
|
||||
|
||||
static void
|
||||
default_stdout_handler (const gchar *message)
|
||||
{
|
||||
/* TODO: provide a proper app name */
|
||||
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
|
||||
}
|
||||
|
||||
static void
|
||||
default_stderr_handler (const gchar *message)
|
||||
{
|
||||
/* TODO: provide a proper app name */
|
||||
__android_log_write (ANDROID_LOG_ERROR, "mono", message);
|
||||
}
|
||||
|
||||
|
||||
#elif defined(HOST_IOS)
|
||||
#include <asl.h>
|
||||
|
||||
static int
|
||||
to_asl_priority (GLogLevelFlags log_level)
|
||||
{
|
||||
switch (log_level & G_LOG_LEVEL_MASK)
|
||||
{
|
||||
case G_LOG_LEVEL_ERROR: return ASL_LEVEL_CRIT;
|
||||
case G_LOG_LEVEL_CRITICAL: return ASL_LEVEL_ERR;
|
||||
case G_LOG_LEVEL_WARNING: return ASL_LEVEL_WARNING;
|
||||
case G_LOG_LEVEL_MESSAGE: return ASL_LEVEL_NOTICE;
|
||||
case G_LOG_LEVEL_INFO: return ASL_LEVEL_INFO;
|
||||
case G_LOG_LEVEL_DEBUG: return ASL_LEVEL_DEBUG;
|
||||
}
|
||||
return ASL_LEVEL_ERR;
|
||||
}
|
||||
|
||||
void
|
||||
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
|
||||
{
|
||||
asl_log (NULL, NULL, to_asl_priority (log_level), "%s", message);
|
||||
if (log_level & fatal)
|
||||
abort ();
|
||||
}
|
||||
|
||||
static void
|
||||
default_stdout_handler (const gchar *message)
|
||||
{
|
||||
asl_log (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
|
||||
}
|
||||
|
||||
static void
|
||||
default_stderr_handler (const gchar *message)
|
||||
{
|
||||
asl_log (NULL, NULL, ASL_LEVEL_WARNING, "%s", message);
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void
|
||||
g_log_default_handler (const gchar *log_domain, GLogLevelFlags log_level, const gchar *message, gpointer unused_data)
|
||||
{
|
||||
FILE *target = stdout;
|
||||
|
||||
fprintf (target, "%s%s%s\n",
|
||||
log_domain != NULL ? log_domain : "",
|
||||
log_domain != NULL ? ": " : "",
|
||||
message);
|
||||
|
||||
if (log_level & fatal) {
|
||||
fflush (stdout);
|
||||
fflush (stderr);
|
||||
abort ();
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
default_stdout_handler (const gchar *string)
|
||||
{
|
||||
fprintf (stdout, "%s", string);
|
||||
}
|
||||
|
||||
static void
|
||||
default_stderr_handler (const gchar *string)
|
||||
{
|
||||
fprintf (stderr, "%s", string);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
GLogFunc
|
||||
g_log_set_default_handler (GLogFunc log_func, gpointer user_data)
|
||||
{
|
||||
GLogFunc old = default_log_func;
|
||||
default_log_func = log_func;
|
||||
default_log_func_user_data = user_data;
|
||||
return old;
|
||||
}
|
||||
|
||||
GPrintFunc
|
||||
g_set_print_handler (GPrintFunc func)
|
||||
{
|
||||
GPrintFunc old = stdout_handler;
|
||||
stdout_handler = func;
|
||||
return old;
|
||||
}
|
||||
|
||||
GPrintFunc
|
||||
g_set_printerr_handler (GPrintFunc func)
|
||||
{
|
||||
GPrintFunc old = stderr_handler;
|
||||
stderr_handler = func;
|
||||
return old;
|
||||
abort ();
|
||||
}
|
||||
|
||||
+2
-3
@@ -216,8 +216,8 @@ cont:
|
||||
gchar *
|
||||
g_find_program_in_path (const gchar *program)
|
||||
{
|
||||
char *p;
|
||||
char *x, *l;
|
||||
char *p = g_strdup (g_getenv ("PATH"));
|
||||
char *x = p, *l;
|
||||
gchar *curdir = NULL;
|
||||
char *save = NULL;
|
||||
#ifdef G_OS_WIN32
|
||||
@@ -228,7 +228,6 @@ g_find_program_in_path (const gchar *program)
|
||||
#endif
|
||||
|
||||
g_return_val_if_fail (program != NULL, NULL);
|
||||
x = p = g_strdup (g_getenv ("PATH"));
|
||||
|
||||
if (x == NULL || *x == '\0') {
|
||||
curdir = g_get_current_dir ();
|
||||
|
||||
@@ -126,7 +126,7 @@ g_ptr_array_remove_index(GPtrArray *array, guint index)
|
||||
gpointer removed_node;
|
||||
|
||||
g_return_val_if_fail(array != NULL, NULL);
|
||||
g_return_val_if_fail(index < array->len, NULL);
|
||||
g_return_val_if_fail(index >= 0 || index < array->len, NULL);
|
||||
|
||||
removed_node = array->pdata[index];
|
||||
|
||||
@@ -147,7 +147,7 @@ g_ptr_array_remove_index_fast(GPtrArray *array, guint index)
|
||||
gpointer removed_node;
|
||||
|
||||
g_return_val_if_fail(array != NULL, NULL);
|
||||
g_return_val_if_fail(index < array->len, NULL);
|
||||
g_return_val_if_fail(index >= 0 || index < array->len, NULL);
|
||||
|
||||
removed_node = array->pdata[index];
|
||||
|
||||
|
||||
+2
-27
@@ -41,10 +41,6 @@
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_SELECT_H
|
||||
#include <sys/select.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_TIME_H
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
@@ -53,10 +49,6 @@
|
||||
#include <sys/wait.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SYS_RESOURCE_H
|
||||
# include <sys/resource.h>
|
||||
#endif
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#include <io.h>
|
||||
#include <winsock2.h>
|
||||
@@ -217,23 +209,6 @@ write_all (int fd, const void *vbuf, size_t n)
|
||||
return nwritten;
|
||||
}
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static int
|
||||
g_getdtablesize (void)
|
||||
{
|
||||
#ifdef HAVE_GETRLIMIT
|
||||
struct rlimit limit;
|
||||
int res;
|
||||
|
||||
res = getrlimit (RLIMIT_NOFILE, &limit);
|
||||
g_assert (res == 0);
|
||||
return limit.rlim_cur;
|
||||
#else
|
||||
return getdtablesize ();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
|
||||
gboolean
|
||||
g_spawn_command_line_sync (const gchar *command_line,
|
||||
gchar **standard_output,
|
||||
@@ -277,7 +252,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
close (stderr_pipe [0]);
|
||||
dup2 (stderr_pipe [1], STDERR_FILENO);
|
||||
}
|
||||
for (i = g_getdtablesize () - 1; i >= 3; i--)
|
||||
for (i = getdtablesize () - 1; i >= 3; i--)
|
||||
close (i);
|
||||
|
||||
/* G_SPAWN_SEARCH_PATH is always enabled for g_spawn_command_line_sync */
|
||||
@@ -438,7 +413,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
}
|
||||
|
||||
if ((flags & G_SPAWN_LEAVE_DESCRIPTORS_OPEN) != 0) {
|
||||
for (i = g_getdtablesize () - 1; i >= 3; i--)
|
||||
for (i = getdtablesize () - 1; i >= 3; i--)
|
||||
close (i);
|
||||
}
|
||||
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#include "vasprintf.h"
|
||||
|
||||
/* This is not a macro, because I dont want to put _GNU_SOURCE in the glib.h header */
|
||||
gchar *
|
||||
g_strndup (const gchar *str, gsize n)
|
||||
|
||||
@@ -88,24 +88,12 @@ merge_lists (list_node *first, list_node *second, GCompareFunc func)
|
||||
static inline list_node *
|
||||
sweep_up (struct sort_info *si, list_node *list, int upto)
|
||||
{
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
/*
|
||||
* GCC incorrectly thinks we're writing below si->ranks array bounds.
|
||||
*/
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
||||
#endif
|
||||
|
||||
int i;
|
||||
for (i = si->min_rank; i < upto; ++i) {
|
||||
list = merge_lists (si->ranks [i], list, si->func);
|
||||
si->ranks [i] = NULL;
|
||||
}
|
||||
return list;
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -136,14 +124,6 @@ sweep_up (struct sort_info *si, list_node *list, int upto)
|
||||
static inline void
|
||||
insert_list (struct sort_info *si, list_node* list, int rank)
|
||||
{
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
/*
|
||||
* GCC incorrectly thinks we're writing below si->ranks array bounds.
|
||||
*/
|
||||
#pragma GCC diagnostic push
|
||||
#pragma GCC diagnostic ignored "-Warray-bounds"
|
||||
#endif
|
||||
|
||||
int i;
|
||||
|
||||
if (rank > si->n_ranks) {
|
||||
@@ -169,10 +149,6 @@ insert_list (struct sort_info *si, list_node* list, int rank)
|
||||
si->n_ranks = i + 1;
|
||||
si->min_rank = i;
|
||||
si->ranks [i] = list;
|
||||
|
||||
#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 406)
|
||||
#pragma GCC diagnostic pop
|
||||
#endif
|
||||
}
|
||||
|
||||
#undef stringify2
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
#ifndef __VASPRINTF_H
|
||||
#define __VASPRINTF_H
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <config.h>
|
||||
|
||||
#ifndef HAVE_VASPRINTF
|
||||
int vasprintf(char **ret, const char *fmt, va_list ap);
|
||||
#endif
|
||||
|
||||
#endif /* __VASPRINTF_H */
|
||||
@@ -37,8 +37,26 @@ test_eglib_LDADD = ../src/libeglib.la $(LIBICONV)
|
||||
run-eglib: all
|
||||
srcdir=`readlink -f $(srcdir)` ./test-eglib
|
||||
|
||||
if HAVE_GLIB
|
||||
|
||||
noinst_PROGRAMS = test-glib test-eglib
|
||||
|
||||
test_glib_SOURCES = $(SOURCES)
|
||||
|
||||
test_glib_CFLAGS = `pkg-config --cflags glib-2.0` -DDRIVER_NAME=\"GLib\"
|
||||
test_glib_LDFLAGS = `pkg-config --libs glib-2.0 gmodule-2.0`
|
||||
|
||||
run-glib: all
|
||||
srcdir=`readlink -f $(srcdir)` ./test-glib
|
||||
|
||||
run-both: run-glib run-eglib
|
||||
|
||||
else
|
||||
|
||||
noinst_PROGRAMS = test-eglib
|
||||
|
||||
run-both: run-eglib
|
||||
|
||||
endif
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
+1
-1
@@ -115,7 +115,7 @@ test_file ()
|
||||
|
||||
#ifndef G_OS_WIN32 /* FIXME */
|
||||
gchar *sympath;
|
||||
gint ignored G_GNUC_UNUSED;
|
||||
gint ignored;
|
||||
#endif
|
||||
|
||||
res = g_file_test (NULL, 0);
|
||||
|
||||
Vendored
+1
-1
Submodule external/cecil updated: 33d50b874f...89cfb1d407.
Vendored
-1
Submodule external/ikdasm deleted from 7ded4decb9.
Vendored
+1
-1
Submodule external/ikvm updated: 22534de209...92df59f033.
+1
-7
@@ -486,15 +486,11 @@ static void* JNIEnv_vtable[] =
|
||||
0 // jlong JNICALL GetDirectBufferCapacity(jobject buf);
|
||||
};
|
||||
|
||||
void** ikvm_GetJNIEnvVTable(void);
|
||||
|
||||
JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable(void)
|
||||
JNIEXPORT void** JNICALL ikvm_GetJNIEnvVTable()
|
||||
{
|
||||
return JNIEnv_vtable;
|
||||
}
|
||||
|
||||
void* JNICALL ikvm_MarshalDelegate(void* p);
|
||||
|
||||
JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
|
||||
{
|
||||
return p;
|
||||
@@ -502,8 +498,6 @@ JNIEXPORT void* JNICALL ikvm_MarshalDelegate(void* p)
|
||||
|
||||
typedef jint (JNICALL *PJNI_ONLOAD)(JavaVM* vm, void* reserved);
|
||||
|
||||
jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved);
|
||||
|
||||
JNIEXPORT jint JNICALL ikvm_CallOnLoad(PJNI_ONLOAD method, JavaVM* vm, void* reserved)
|
||||
{
|
||||
return method(vm, reserved);
|
||||
|
||||
@@ -61,22 +61,16 @@
|
||||
#include <sys/mman.h>
|
||||
#include "jni.h"
|
||||
|
||||
void* JNICALL ikvm_LoadLibrary(char* psz);
|
||||
|
||||
JNIEXPORT void* JNICALL ikvm_LoadLibrary(char* psz)
|
||||
{
|
||||
return g_module_open(psz, 0);
|
||||
}
|
||||
|
||||
void JNICALL ikvm_FreeLibrary(GModule* handle);
|
||||
|
||||
JNIEXPORT void JNICALL ikvm_FreeLibrary(GModule* handle)
|
||||
{
|
||||
g_module_close(handle);
|
||||
}
|
||||
|
||||
void* JNICALL ikvm_GetProcAddress(GModule* handle, char* name, jint argc);
|
||||
|
||||
JNIEXPORT void* JNICALL ikvm_GetProcAddress(GModule* handle, char* name, jint argc)
|
||||
{
|
||||
void *symbol;
|
||||
@@ -89,22 +83,16 @@
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void* JNICALL ikvm_mmap(int fd, jboolean writeable, jboolean copy_on_write, jlong position, jint size);
|
||||
|
||||
JNIEXPORT void* JNICALL ikvm_mmap(int fd, jboolean writeable, jboolean copy_on_write, jlong position, jint size)
|
||||
{
|
||||
return mmap(0, size, writeable ? PROT_WRITE | PROT_READ : PROT_READ, copy_on_write ? MAP_PRIVATE : MAP_SHARED, fd, position);
|
||||
}
|
||||
|
||||
int JNICALL ikvm_munmap(void* address, jint size);
|
||||
|
||||
JNIEXPORT int JNICALL ikvm_munmap(void* address, jint size)
|
||||
{
|
||||
return munmap(address, size);
|
||||
}
|
||||
|
||||
int JNICALL ikvm_msync(void* address, jint size);
|
||||
|
||||
JNIEXPORT int JNICALL ikvm_msync(void* address, jint size)
|
||||
{
|
||||
#if defined(__native_client__) && defined(USE_NEWLIB)
|
||||
|
||||
+1
-1
@@ -68,7 +68,7 @@ libmonogc_static_la_LDFLAGS = -static
|
||||
|
||||
EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS) @GC_CFLAGS@
|
||||
AM_CFLAGS = @GC_CFLAGS@
|
||||
|
||||
if CPLUSPLUS
|
||||
extra_checks = test_cpp
|
||||
|
||||
@@ -331,7 +331,7 @@ DOC_FILES= README.QUICK doc/README.Mac doc/README.MacOSX doc/README.OS2 \
|
||||
TESTS= tests/test.c tests/test_cpp.cc tests/trace_test.c \
|
||||
tests/leak_test.c tests/thread_leak_test.c tests/middle.c
|
||||
|
||||
GNU_BUILD_FILES= configure.ac Makefile.am configure acinclude.m4 \
|
||||
GNU_BUILD_FILES= configure.in Makefile.am configure acinclude.m4 \
|
||||
libtool.m4 install-sh configure.host Makefile.in \
|
||||
aclocal.m4 config.sub config.guess \
|
||||
include/Makefile.am include/Makefile.in \
|
||||
|
||||
+3
-3
@@ -5,8 +5,8 @@ This is a modified version of Boehm GC 6.1 for Mono.
|
||||
- Makefile changes:
|
||||
|
||||
libgc has a lot of configurable options which are AC_DEFINE()d in its
|
||||
configure.ac. To make it easier to build and bundle it with Mono, I
|
||||
replaced most of the orignal configure.ac and the makefiles with custom
|
||||
configure.in. To make it easier to build and bundle it with Mono, I
|
||||
replaced most of the orignal configure.in and the makefiles with custom
|
||||
versions which just define what we actually need for Mono.
|
||||
|
||||
This means that you can just run configure in this directory and it'll
|
||||
@@ -58,7 +58,7 @@ This is a modified version of Boehm GC 6.1 for Mono.
|
||||
|
||||
cvs diff -u -r LIBGC
|
||||
|
||||
When importing new upstream versions, don't import the new configure.ac or any of the
|
||||
When importing new upstream versions, don't import the new configure.in or any of the
|
||||
Makefile.am's; they've been replaced by custom versions. Just import all the new source
|
||||
files and it should be fine.
|
||||
|
||||
|
||||
+3
-3
@@ -22,11 +22,11 @@ if test x$GCC != xyes; then
|
||||
dolt_supported=no
|
||||
fi
|
||||
case $host in
|
||||
i?86-*-linux*|i?86-apple-darwin*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*|aarch64*)
|
||||
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|
||||
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*)
|
||||
pic_options='-fPIC'
|
||||
;;
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*)
|
||||
pic_options='-DDLL_EXPORT'
|
||||
;;
|
||||
i?86-apple-darwin*|arm-apple-darwin*)
|
||||
|
||||
+5
-5
@@ -22,7 +22,7 @@ if [ -z "$LIBTOOL" ]; then
|
||||
fi
|
||||
fi
|
||||
|
||||
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
|
||||
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
|
||||
($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`libtool' installed to compile Mono."
|
||||
@@ -32,8 +32,8 @@ fi
|
||||
}
|
||||
}
|
||||
|
||||
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
|
||||
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
|
||||
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
|
||||
grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
|
||||
(gettext --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`gettext' installed to compile Mono."
|
||||
@@ -80,7 +80,7 @@ xlc )
|
||||
esac
|
||||
|
||||
|
||||
if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
|
||||
if grep "^AC_PROG_LIBTOOL" configure.in >/dev/null; then
|
||||
if test -z "$NO_LIBTOOLIZE" ; then
|
||||
echo "Running libtoolize..."
|
||||
${LIBTOOL}ize --force --copy
|
||||
@@ -99,7 +99,7 @@ aclocal $ACLOCAL_FLAGS || {
|
||||
exit 1
|
||||
}
|
||||
|
||||
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
|
||||
echo "Running autoheader..."
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
@@ -114,17 +114,6 @@ case "$THREADS" in
|
||||
AC_DEFINE(THREAD_LOCAL_ALLOC)
|
||||
THREADDLLIBS="-lpthread -lrt"
|
||||
;;
|
||||
*-*-kfreebsd*-gnu)
|
||||
AC_DEFINE(GC_FREEBSD_THREADS)
|
||||
INCLUDES="$INCLUDES -pthread"
|
||||
THREADDLLIBS=-pthread
|
||||
AC_DEFINE(_REENTRANT)
|
||||
if test "${enable_parallel_mark}" = yes; then
|
||||
AC_DEFINE(PARALLEL_MARK)
|
||||
fi
|
||||
AC_DEFINE(THREAD_LOCAL_ALLOC)
|
||||
AC_DEFINE(USE_COMPILER_TLS)
|
||||
;;
|
||||
*-*-freebsd*)
|
||||
AC_DEFINE(GC_FREEBSD_THREADS)
|
||||
if test "x$PTHREAD_CFLAGS" != "x"; then
|
||||
@@ -542,12 +531,6 @@ fi
|
||||
AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet libgc build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
|
||||
AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
|
||||
|
||||
AC_ARG_ENABLE(werror, [ --enable-werror Pass -Werror to the C compiler], werror_flag=$enableval, werror_flag=no)
|
||||
if test x$werror_flag = xyes; then
|
||||
WERROR_CFLAGS="-Werror"
|
||||
fi
|
||||
AC_SUBST([WERROR_CFLAGS])
|
||||
|
||||
if test "${multilib}" = "yes"; then
|
||||
multilib_arg="--enable-multilib"
|
||||
else
|
||||
@@ -580,7 +580,6 @@ void GC_stop_world()
|
||||
|
||||
if (GC_notify_event)
|
||||
GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
|
||||
GC_process_togglerefs ();
|
||||
|
||||
# if DEBUG_THREADS
|
||||
GC_printf1("Stopping the world from 0x%lx\n", mach_thread_self());
|
||||
|
||||
+1
-1
@@ -6,7 +6,7 @@ Copyright (c) 1999-2004 Hewlett-Packard Development Company, L.P.
|
||||
The file linux_threads.c is also
|
||||
Copyright (c) 1998 by Fergus Henderson. All rights reserved.
|
||||
|
||||
The files Makefile.am, and configure.ac are
|
||||
The files Makefile.am, and configure.in are
|
||||
Copyright (c) 2001 by Red Hat Inc. All rights reserved.
|
||||
|
||||
Several files supporting GNU-style builds are copyrighted by the Free
|
||||
|
||||
@@ -1269,7 +1269,7 @@ Since 6.0alpha6:
|
||||
many places. (Thanks to Benjamin Lerman.)
|
||||
- Made win32_threads.c more tolerant of detaching a thread that it didn't
|
||||
know about. (Thanks to Paul Nash.)
|
||||
- Added Makefile.am and configure.ac from gcc to the distribution, with
|
||||
- Added Makefile.am and configure.in from gcc to the distribution, with
|
||||
minimal changes. For the moment, those are just placeholders. In the
|
||||
future, we're planning to switch to a GNU-style build environment for
|
||||
Un*x-like systems, though the old Makefile will remain as a backup.
|
||||
@@ -1491,7 +1491,7 @@ Since 6.1alpha3:
|
||||
- Fixed a formatting error in dbg_mlc.c. Added prototype to GC_abort()
|
||||
declaration. (Thanks to Michael Smith.)
|
||||
- Removed "source" argument to GC_find_start(). Eliminate GC_FIND_START().
|
||||
- Added win32 recognition code in configure.ac. Changed some of the
|
||||
- Added win32 recognition code in configure.in. Changed some of the
|
||||
dllimport/export defines in gc.h. (Thanks to Adam Megacz.)
|
||||
- GC_malloc_many didn't set hb_last_reclaimed when it called
|
||||
GC_reclaim_generic. (I'm not sure this matters much, but ...)
|
||||
@@ -1629,7 +1629,7 @@ Since 6.1alpha4:
|
||||
|
||||
Since 6.1alpha5:
|
||||
- Added GC_MAXIMUM_HEAP_SIZE environment variable.
|
||||
- Fix configure.ac for MIPS/LINUX. (Thanks to H.J. Lu.)
|
||||
- Fix configure.in for MIPS/LINUX. (Thanks to H.J. Lu.)
|
||||
- Double page hash table size for -DLARGE_CONFIG.
|
||||
- Integrated Bo Thorsen's X86-64 support.
|
||||
- STACKBOTTOM definition for LINUX/MIPS was partially changed back.
|
||||
@@ -1942,7 +1942,7 @@ Since 6.3alpha1:
|
||||
There is also still some code duplication with pthread_support.c.
|
||||
(Thread descriptors did become much smaller, since Ben Hutchings
|
||||
removed the thread context from them.)
|
||||
- Integrated a Solaris configure.ac patch from Rainer Orth.
|
||||
- Integrated a Solaris configure.in patch from Rainer Orth.
|
||||
- Added GC_IGNORE_FB and associated warning to very partially address
|
||||
the issue of the collector treating a mapped frame buffer as part
|
||||
of the root set. (Thanks to David Peroutka for providing some
|
||||
@@ -2151,7 +2151,7 @@ Since 6.3:
|
||||
it seems to be incorrect if the preceding memory op is a load.
|
||||
- Fixed print_block_list to print the correct kind number for
|
||||
STUBBORN. (Thanks to Rutger Ovidus.)
|
||||
- Have configure.ac generate an error if it is asked to support
|
||||
- Have configure.in generate an error if it is asked to support
|
||||
pthreads, but doesn't know how to.
|
||||
- Added Kazuhiro Inaoka's patch for Renesas M32R support.
|
||||
- Have the GNU build mechanism link with -ldl. Rename THREADLIBS
|
||||
|
||||
+2
-2
@@ -26,7 +26,7 @@
|
||||
* None of this is safe with dlclose and incremental collection.
|
||||
* But then not much of anything is safe in the presence of dlclose.
|
||||
*/
|
||||
#if (defined(__linux__) || defined(__GLIBC__) || defined(__native_client__)) && !defined(_GNU_SOURCE)
|
||||
#if (defined(__linux__) || defined(__native_client__)) && !defined(_GNU_SOURCE)
|
||||
/* Can't test LINUX, since this must be define before other includes */
|
||||
# define _GNU_SOURCE
|
||||
#endif
|
||||
@@ -394,7 +394,7 @@ GC_bool GC_register_main_static_data()
|
||||
/* For glibc 2.2.4+. Unfortunately, it doesn't work for older */
|
||||
/* versions. Thanks to Jakub Jelinek for most of the code. */
|
||||
|
||||
# if (defined(LINUX) || defined (__GLIBC__) || defined(NACL)) /* Are others OK here, too? */ \
|
||||
# if (defined(LINUX) || defined(NACL)) /* Are others OK here, too? */ \
|
||||
&& (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
|
||||
|| (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))
|
||||
|
||||
|
||||
+1
-175
@@ -307,172 +307,6 @@ out:
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* toggleref support */
|
||||
typedef struct {
|
||||
GC_PTR strong_ref;
|
||||
GC_hidden_pointer weak_ref;
|
||||
} GCToggleRef;
|
||||
|
||||
static int (*GC_toggleref_callback) (GC_PTR obj);
|
||||
static GCToggleRef *GC_toggleref_array;
|
||||
static int GC_toggleref_array_size;
|
||||
static int GC_toggleref_array_capacity;
|
||||
|
||||
|
||||
void
|
||||
GC_process_togglerefs (void)
|
||||
{
|
||||
int i, w;
|
||||
int toggle_ref_counts [3] = { 0, 0, 0 };
|
||||
|
||||
for (i = w = 0; i < GC_toggleref_array_size; ++i) {
|
||||
int res;
|
||||
GCToggleRef r = GC_toggleref_array [i];
|
||||
|
||||
GC_PTR obj;
|
||||
|
||||
if (r.strong_ref)
|
||||
obj = r.strong_ref;
|
||||
else if (r.weak_ref)
|
||||
obj = REVEAL_POINTER (r.weak_ref);
|
||||
else
|
||||
continue;
|
||||
|
||||
res = GC_toggleref_callback (obj);
|
||||
++toggle_ref_counts [res];
|
||||
switch (res) {
|
||||
case 0:
|
||||
break;
|
||||
case 1:
|
||||
GC_toggleref_array [w].strong_ref = obj;
|
||||
GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
|
||||
++w;
|
||||
break;
|
||||
case 2:
|
||||
GC_toggleref_array [w].strong_ref = NULL;
|
||||
GC_toggleref_array [w].weak_ref = HIDE_POINTER (obj);
|
||||
++w;
|
||||
break;
|
||||
default:
|
||||
ABORT("Invalid callback result");
|
||||
}
|
||||
}
|
||||
|
||||
for (i = w; i < GC_toggleref_array_size; ++i) {
|
||||
GC_toggleref_array [w].strong_ref = NULL;
|
||||
GC_toggleref_array [w].weak_ref = (GC_hidden_pointer)NULL;
|
||||
}
|
||||
|
||||
GC_toggleref_array_size = w;
|
||||
}
|
||||
|
||||
/* Finalizer proc support */
|
||||
static void (*GC_object_finalized_proc) (GC_PTR obj);
|
||||
|
||||
void
|
||||
GC_set_finalizer_notify_proc (void (*proc) (GC_PTR obj))
|
||||
{
|
||||
GC_object_finalized_proc = proc;
|
||||
}
|
||||
|
||||
|
||||
static void push_and_mark_object (GC_PTR p)
|
||||
{
|
||||
hdr * hhdr = HDR(p);
|
||||
|
||||
PUSH_OBJ((word *)p, hhdr, GC_mark_stack_top,
|
||||
&(GC_mark_stack[GC_mark_stack_size]));
|
||||
|
||||
while (!GC_mark_stack_empty()) MARK_FROM_MARK_STACK();
|
||||
GC_set_mark_bit (p);
|
||||
if (GC_mark_state != MS_NONE)
|
||||
while (!GC_mark_some((ptr_t)0)) {}
|
||||
}
|
||||
|
||||
static void GC_mark_togglerefs ()
|
||||
{
|
||||
int i;
|
||||
if (!GC_toggleref_array)
|
||||
return;
|
||||
|
||||
GC_set_mark_bit ((GC_PTR)GC_toggleref_array);
|
||||
for (i = 0; i < GC_toggleref_array_size; ++i) {
|
||||
if (GC_toggleref_array [i].strong_ref) {
|
||||
GC_PTR object = GC_toggleref_array [i].strong_ref;
|
||||
|
||||
push_and_mark_object (object);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void GC_clear_togglerefs ()
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < GC_toggleref_array_size; ++i) {
|
||||
if (GC_toggleref_array [i].weak_ref) {
|
||||
GC_PTR object = REVEAL_POINTER (GC_toggleref_array [i].weak_ref);
|
||||
|
||||
if (!GC_is_marked (object)) {
|
||||
GC_toggleref_array [i].weak_ref = (GC_hidden_pointer)NULL; /* We defer compaction to only happen on the callback step. */
|
||||
} else {
|
||||
/*No need to copy, boehm is non-moving */
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void GC_toggleref_register_callback(int (*proccess_toggleref) (GC_PTR obj))
|
||||
{
|
||||
GC_toggleref_callback = proccess_toggleref;
|
||||
}
|
||||
|
||||
static void
|
||||
ensure_toggleref_capacity (int capacity)
|
||||
{
|
||||
if (!GC_toggleref_array) {
|
||||
GC_toggleref_array_capacity = 32;
|
||||
GC_toggleref_array = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
}
|
||||
if (GC_toggleref_array_size + capacity >= GC_toggleref_array_capacity) {
|
||||
GCToggleRef *tmp;
|
||||
int old_capacity = GC_toggleref_array_capacity;
|
||||
while (GC_toggleref_array_capacity < GC_toggleref_array_size + capacity)
|
||||
GC_toggleref_array_capacity *= 2;
|
||||
|
||||
tmp = (GCToggleRef *) GC_INTERNAL_MALLOC_IGNORE_OFF_PAGE (GC_toggleref_array_capacity * sizeof (GCToggleRef), NORMAL);
|
||||
memcpy (tmp, GC_toggleref_array, GC_toggleref_array_size * sizeof (GCToggleRef));
|
||||
GC_INTERNAL_FREE (GC_toggleref_array);
|
||||
GC_toggleref_array = tmp;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
GC_toggleref_add (GC_PTR object, int strong_ref)
|
||||
{
|
||||
DCL_LOCK_STATE;
|
||||
# ifdef THREADS
|
||||
DISABLE_SIGNALS();
|
||||
LOCK();
|
||||
# endif
|
||||
|
||||
if (!GC_toggleref_callback)
|
||||
goto end;
|
||||
|
||||
ensure_toggleref_capacity (1);
|
||||
GC_toggleref_array [GC_toggleref_array_size].strong_ref = strong_ref ? object : NULL;
|
||||
GC_toggleref_array [GC_toggleref_array_size].weak_ref = strong_ref ? (GC_hidden_pointer)NULL : HIDE_POINTER (object);
|
||||
++GC_toggleref_array_size;
|
||||
|
||||
end:
|
||||
# ifdef THREADS
|
||||
UNLOCK();
|
||||
ENABLE_SIGNALS();
|
||||
# endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
# if defined(__STDC__) || defined(__cplusplus)
|
||||
int GC_register_long_link(GC_PTR * link, GC_PTR obj)
|
||||
@@ -845,9 +679,7 @@ void GC_finalize()
|
||||
ptr_t real_ptr;
|
||||
register int i;
|
||||
int fo_size = (log_fo_table_size == -1 ) ? 0 : (1 << log_fo_table_size);
|
||||
|
||||
GC_mark_togglerefs();
|
||||
|
||||
|
||||
/* Make non-tracking disappearing links disappear */
|
||||
GC_make_disappearing_links_disappear(&GC_dl_hashtbl);
|
||||
|
||||
@@ -886,10 +718,6 @@ void GC_finalize()
|
||||
fo_set_next(prev_fo, next_fo);
|
||||
}
|
||||
GC_fo_entries--;
|
||||
|
||||
if (GC_object_finalized_proc)
|
||||
GC_object_finalized_proc (real_ptr);
|
||||
|
||||
/* Add to list of objects awaiting finalization. */
|
||||
fo_set_next(curr_fo, GC_finalize_now);
|
||||
GC_finalize_now = curr_fo;
|
||||
@@ -927,8 +755,6 @@ void GC_finalize()
|
||||
/* Remove dangling disappearing links. */
|
||||
GC_remove_dangling_disappearing_links(&GC_dl_hashtbl);
|
||||
|
||||
GC_clear_togglerefs ();
|
||||
|
||||
/* Make long links disappear and remove dangling ones. */
|
||||
GC_make_disappearing_links_disappear(&GC_ll_hashtbl);
|
||||
GC_remove_dangling_disappearing_links(&GC_ll_hashtbl);
|
||||
|
||||
+1
-14
@@ -429,10 +429,6 @@ GC_API size_t GC_get_total_bytes GC_PROTO((void));
|
||||
/* Return -1 otherwise. */
|
||||
int GC_get_suspend_signal GC_PROTO((void));
|
||||
|
||||
/* Return the signal used by the gc to resume threads on posix platforms. */
|
||||
/* Return -1 otherwise. */
|
||||
int GC_get_restart_signal GC_PROTO((void));
|
||||
|
||||
/* Disable garbage collection. Even GC_gcollect calls will be */
|
||||
/* ineffective. */
|
||||
GC_API void GC_disable GC_PROTO((void));
|
||||
@@ -497,7 +493,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb));
|
||||
# define GC_RETURN_ADDR (GC_word)__return_address
|
||||
#endif
|
||||
|
||||
#if defined(__linux__) || defined(__GLIBC__)
|
||||
#ifdef __linux__
|
||||
# include <features.h>
|
||||
# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
|
||||
&& !defined(__ia64__)
|
||||
@@ -773,15 +769,6 @@ GC_API int GC_unregister_disappearing_link GC_PROTO((GC_PTR * /* link */));
|
||||
GC_API int GC_register_long_link GC_PROTO((GC_PTR * /* link */, GC_PTR obj));
|
||||
GC_API int GC_unregister_long_link GC_PROTO((GC_PTR * /* link */));
|
||||
|
||||
|
||||
/* toggleref support */
|
||||
GC_API void GC_toggleref_register_callback GC_PROTO((int (*proccess_toggleref) (GC_PTR obj)));
|
||||
GC_API void GC_toggleref_add (GC_PTR object, int strong_ref);
|
||||
|
||||
/* finalizer callback support */
|
||||
GC_API void GC_set_finalizer_notify_proc GC_PROTO((void (*object_finalized) (GC_PTR obj)));
|
||||
|
||||
|
||||
/* Returns !=0 if GC_invoke_finalizers has something to do. */
|
||||
GC_API int GC_should_invoke_finalizers GC_PROTO((void));
|
||||
|
||||
|
||||
@@ -1454,10 +1454,6 @@ GC_bool GC_is_tmp_root GC_PROTO((ptr_t p));
|
||||
void GC_register_dynamic_libraries GC_PROTO((void));
|
||||
/* Add dynamic library data sections to the root set. */
|
||||
|
||||
void GC_cond_register_dynamic_libraries GC_PROTO((void));
|
||||
/* Remove and reregister dynamic libraries if we're */
|
||||
/* configured to do that at each GC. */
|
||||
|
||||
GC_bool GC_register_main_static_data GC_PROTO((void));
|
||||
/* We need to register the main data segment. Returns */
|
||||
/* TRUE unless this is done implicitly as part of */
|
||||
@@ -1692,9 +1688,6 @@ void GC_finalize GC_PROTO((void));
|
||||
/* for processing by GC_invoke_finalizers. */
|
||||
/* Invoked with lock. */
|
||||
|
||||
void GC_process_togglerefs (void);
|
||||
/*Process the togglerefs before GC starts */
|
||||
|
||||
void GC_notify_or_invoke_finalizers GC_PROTO((void));
|
||||
/* If GC_finalize_on_demand is not set, invoke */
|
||||
/* eligible finalizers. Otherwise: */
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
# endif
|
||||
|
||||
/* And one for FreeBSD: */
|
||||
# if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(FREEBSD)
|
||||
# if defined(__FreeBSD__) && !defined(FREEBSD)
|
||||
# define FREEBSD
|
||||
# endif
|
||||
|
||||
@@ -1371,15 +1371,8 @@
|
||||
# ifndef GC_FREEBSD_THREADS
|
||||
# define MPROTECT_VDB
|
||||
# endif
|
||||
# ifdef __GLIBC__
|
||||
# define SIG_SUSPEND (32+6)
|
||||
# define SIG_THR_RESTART (32+5)
|
||||
extern int _end[];
|
||||
# define DATAEND (_end)
|
||||
# else
|
||||
# define SIG_SUSPEND SIGTSTP
|
||||
# define SIG_THR_RESTART SIGCONT
|
||||
# endif
|
||||
# define SIG_SUSPEND SIGTSTP
|
||||
# define SIG_THR_RESTART SIGCONT
|
||||
# define FREEBSD_STACKBOTTOM
|
||||
# ifdef __ELF__
|
||||
# define DYNAMIC_LOADING
|
||||
@@ -2139,15 +2132,8 @@
|
||||
# ifndef GC_FREEBSD_THREADS
|
||||
# define MPROTECT_VDB
|
||||
# endif
|
||||
# ifdef __GLIBC__
|
||||
# define SIG_SUSPEND (32+6)
|
||||
# define SIG_THR_RESTART (32+5)
|
||||
extern int _end[];
|
||||
# define DATAEND (_end)
|
||||
# else
|
||||
# define SIG_SUSPEND SIGUSR1
|
||||
# define SIG_THR_RESTART SIGUSR2
|
||||
# endif
|
||||
# define SIG_SUSPEND SIGTSTP
|
||||
# define SIG_THR_RESTART SIGCONT
|
||||
# define NEED_FIND_LIMIT
|
||||
# define FREEBSD_STACKBOTTOM
|
||||
# ifdef __ELF__
|
||||
@@ -2244,7 +2230,7 @@
|
||||
# define SUNOS5SIGS
|
||||
# endif
|
||||
|
||||
# if defined(FREEBSD) && ((__FreeBSD__ >= 4) || (__FreeBSD_kernel__ >= 4))
|
||||
# if defined(FREEBSD) && (__FreeBSD__ >= 4)
|
||||
# define SUNOS5SIGS
|
||||
# endif
|
||||
|
||||
@@ -2307,7 +2293,7 @@
|
||||
# define CACHE_LINE_SIZE 32 /* Wild guess */
|
||||
# endif
|
||||
|
||||
# if defined(LINUX) || defined(__GLIBC__)
|
||||
# ifdef LINUX
|
||||
# define REGISTER_LIBRARIES_EARLY
|
||||
/* We sometimes use dl_iterate_phdr, which may acquire an internal */
|
||||
/* lock. This isn't safe after the world has stopped. So we must */
|
||||
@@ -2388,7 +2374,7 @@
|
||||
#if defined(SPARC)
|
||||
# define CAN_SAVE_CALL_ARGS
|
||||
#endif
|
||||
#if (defined(I386) || defined(X86_64)) && (defined(LINUX) || defined(__GLIBC__))
|
||||
#if (defined(I386) || defined(X86_64)) && defined(LINUX)
|
||||
/* SAVE_CALL_CHAIN is supported if the code is compiled to save */
|
||||
/* frame pointers by default, i.e. no -fomit-frame-pointer flag. */
|
||||
# define CAN_SAVE_CALL_ARGS
|
||||
|
||||
@@ -375,15 +375,8 @@ ptr_t GC_approx_sp()
|
||||
/* doing something wrong. */
|
||||
# ifdef _MSC_VER
|
||||
# pragma warning(disable:4172)
|
||||
# endif
|
||||
# if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wreturn-local-addr"
|
||||
# endif
|
||||
return((ptr_t)(&dummy));
|
||||
# if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ >= 408)
|
||||
# pragma GCC diagnostic pop
|
||||
# endif
|
||||
# ifdef _MSC_VER
|
||||
# pragma warning(default:4172)
|
||||
# endif
|
||||
|
||||
@@ -480,17 +480,6 @@ int GC_get_suspend_signal GC_PROTO(())
|
||||
#endif
|
||||
}
|
||||
|
||||
int GC_get_restart_signal GC_PROTO(())
|
||||
{
|
||||
#if defined(SIG_THR_RESTART) && defined(GC_PTHREADS) && !defined(GC_MACOSX_THREADS) && !defined(GC_OPENBSD_THREADS)
|
||||
return SIG_THR_RESTART;
|
||||
#else
|
||||
return -1;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
GC_bool GC_is_initialized = FALSE;
|
||||
|
||||
void GC_init()
|
||||
|
||||
@@ -611,7 +611,6 @@ void GC_stop_world()
|
||||
{
|
||||
if (GC_notify_event)
|
||||
GC_notify_event (GC_EVENT_PRE_STOP_WORLD);
|
||||
GC_process_togglerefs ();
|
||||
/* Make sure all free list construction has stopped before we start. */
|
||||
/* No new construction can start, since free list construction is */
|
||||
/* required to acquire and release the GC lock before it starts, */
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
/* The version here should match that in configure/configure.ac */
|
||||
/* The version here should match that in configure/configure.in */
|
||||
/* Eventually this one may become unnecessary. For now we need */
|
||||
/* it to keep the old-style build process working. */
|
||||
#define GC_TMP_VERSION_MAJOR 6
|
||||
@@ -14,7 +14,7 @@
|
||||
GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
|
||||
defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
|
||||
defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
|
||||
# error Inconsistent version info. Check README, version.h, and configure.ac.
|
||||
# error Inconsistent version info. Check README, version.h, and configure.in.
|
||||
# endif
|
||||
#else
|
||||
# define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR
|
||||
|
||||
+18
-39
@@ -937,11 +937,11 @@ Override the automatic cpu detection mechanism. Currently used only on arm.
|
||||
The format of the value is as follows:
|
||||
.nf
|
||||
|
||||
"armvV [thumb[2]]"
|
||||
"armvV [thumb]"
|
||||
|
||||
.fi
|
||||
where V is the architecture number 4, 5, 6, 7 and the options can be currently be
|
||||
"thumb" or "thumb2". Example:
|
||||
"thunb". Example:
|
||||
.nf
|
||||
|
||||
MONO_CPU_ARCH="armv4 thumb" mono ...
|
||||
@@ -1075,10 +1075,19 @@ first generation (of two). A larger nursery will usually speed up the
|
||||
program but will obviously use more memory. The default nursery size
|
||||
4 MB.
|
||||
.TP
|
||||
\fBmajor=\fIcollector\fR Specifies which major collector to use.
|
||||
Options are `marksweep' for the Mark&Sweep collector, and
|
||||
`marksweep-conc' for concurrent Mark&Sweep. The non-concurrent
|
||||
Mark&Sweep collector is the default.
|
||||
\fBmajor=\fIcollector\fR
|
||||
Specifies which major collector to use. Options are `marksweep' for
|
||||
the Mark&Sweep collector, `marksweep-conc' for concurrent Mark&Sweep,
|
||||
`marksweep-par' for parallel Mark&Sweep, `marksweep-fixed' for
|
||||
Mark&Sweep with a fixed heap, and `marksweep-fixed-par' for parallel
|
||||
Mark&Sweep with a fixed heap. The Mark&Sweep collector is the default.
|
||||
.TP
|
||||
\fBmajor-heap-size=\fIsize\fR
|
||||
Sets the size of the major heap (not including the large object space)
|
||||
for the fixed-heap Mark&Sweep collector (i.e. `marksweep-fixed' and
|
||||
`marksweep-fixed-par'). The size is in bytes, with optional suffixes
|
||||
`k', `m' and `g' to specify kilo-, mega- and gigabytes, respectively.
|
||||
The default is 512 megabytes.
|
||||
.TP
|
||||
\fBsoft-heap-limit=\fIsize\fR
|
||||
Once the heap size gets larger than this size, ignore what the default
|
||||
@@ -1207,17 +1216,6 @@ is used.
|
||||
Performs a check to make sure that no references are left to an
|
||||
unloaded AppDomain.
|
||||
.TP
|
||||
\fBclear-at-tlab-creation\fR
|
||||
Clears the nursery incrementally when the thread local allocation
|
||||
buffers (TLAB) are created. The default setting clears the whole
|
||||
nursery at GC time.
|
||||
.TP
|
||||
\fBdebug-clear-at-tlab-creation\fR
|
||||
Clears the nursery incrementally when the thread local allocation
|
||||
buffers (TLAB) are created, but at GC time fills it with the byte
|
||||
`0xff`, which should result in a crash more quickly if
|
||||
`clear-at-tlab-creation` doesn't work properly.
|
||||
.TP
|
||||
\fBclear-at-gc\fR
|
||||
This clears the nursery at GC time instead of doing it when the thread
|
||||
local allocation buffer (TLAB) is created. The default is to clear
|
||||
@@ -1257,11 +1255,6 @@ 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
|
||||
.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.
|
||||
.fi
|
||||
.ne
|
||||
.RE
|
||||
@@ -1363,8 +1356,6 @@ loader in subtle ways.
|
||||
Directories are separated by the platform path separator (colons on unix). Example:
|
||||
.B /home/username/lib:/usr/local/mono/lib
|
||||
.Sp
|
||||
Relative paths are resolved based on the launch-time current directory.
|
||||
.Sp
|
||||
Alternative solutions to MONO_PATH include: installing libraries into
|
||||
the Global Assembly Cache (see gacutil(1)) or having the dependent
|
||||
libraries side-by-side with the main executable.
|
||||
@@ -1426,9 +1417,9 @@ small embedded systems.
|
||||
The default is 180 seconds.
|
||||
.TP
|
||||
\fBMONO_THREADS_PER_CPU\fR
|
||||
The minimum number of threads in the general threadpool will be
|
||||
MONO_THREADS_PER_CPU * number of CPUs. The default value for this
|
||||
variable is 1.
|
||||
The maximum number of threads in the general threadpool will be
|
||||
20 + (MONO_THREADS_PER_CPU * number of CPUs). The default value for this
|
||||
variable is 10.
|
||||
.TP
|
||||
\fBMONO_XMLSERIALIZER_THS\fR
|
||||
Controls the threshold for the XmlSerializer to produce a custom
|
||||
@@ -1543,12 +1534,6 @@ after a SIGSEGV or SIGABRT in unmanaged code.
|
||||
This option will suspend the program when a native SIGSEGV is received.
|
||||
This is useful for debugging crashes which do not happen under gdb,
|
||||
since a live process contains more information than a core file.
|
||||
.TP
|
||||
\fBcheck-pinvoke-callconv\fR
|
||||
This option causes the runtime to check for calling convention
|
||||
mismatches when using pinvoke, i.e. mixing cdecl/stdcall. It only
|
||||
works on windows. If a mismatch is detected, an
|
||||
ExecutionEngineException is thrown.
|
||||
.ne
|
||||
.RE
|
||||
.TP
|
||||
@@ -1653,12 +1638,6 @@ method.
|
||||
\fBMONO_VERBOSE_HWCAP\fR
|
||||
If set, makes the JIT output information about detected CPU features
|
||||
(such as SSE, CMOV, FCMOV, etc) to stdout.
|
||||
.TP
|
||||
\fBMONO_CONSERVATIVE_HWCAP\fR
|
||||
If set, the JIT will not perform any hardware capability detection. This
|
||||
may be useful to pinpoint the cause of JIT issues. This is the default
|
||||
when Mono is built as an AOT cross compiler, so that the generated code
|
||||
will run on most hardware.
|
||||
.SH VALGRIND
|
||||
If you want to use Valgrind, you will find the file `mono.supp'
|
||||
useful, it contains the suppressions for the GC which trigger
|
||||
|
||||
@@ -211,15 +211,6 @@ The following commands are available:
|
||||
.IP \[bu] 2
|
||||
\f[I]heapshot\f[]: perform a heapshot as soon as possible
|
||||
.RE
|
||||
.IP \[bu] 2
|
||||
\f[I]counters\f[]: sample counters values every 1 second. This allow
|
||||
a really lightweight way to have insight in some of the runtime key
|
||||
metrics. Counters displayed in non verbose mode are : Methods from AOT,
|
||||
Methods JITted using mono JIT, Methods JITted using LLVM, Total time
|
||||
spent JITting (sec), User Time, System Time, Total Time, Working Set,
|
||||
Private Bytes, Virtual Bytes, Page Faults and CPU Load Average (1min,
|
||||
5min and 15min).
|
||||
.RE
|
||||
.SS Analyzing the profile data
|
||||
.PP
|
||||
Currently there is a command line program (\f[I]mprof-report\f[])
|
||||
@@ -293,16 +284,6 @@ where \f[I]MODE\f[] can be:
|
||||
.IP \[bu] 2
|
||||
\f[I]bytes\f[]: the total number of bytes used by objects of the
|
||||
given type
|
||||
.PP
|
||||
To change the sort order of counters, use the option:
|
||||
.PP
|
||||
\f[B]--counters-sort=MODE\f[]
|
||||
.PP
|
||||
where \f[I]MODE\f[] can be:
|
||||
.IP \[bu] 2
|
||||
\f[I]time\f[]: sort values by time then category
|
||||
.IP \[bu] 2
|
||||
\f[I]category\f[]: sort values by category then time
|
||||
.SS Selecting what data to report
|
||||
.PP
|
||||
The profiler by default collects data about many runtime subsystems
|
||||
@@ -338,8 +319,6 @@ version
|
||||
\f[I]thread\f[]: thread information
|
||||
.IP \[bu] 2
|
||||
\f[I]heapshot\f[]: live heap usage at heap shots
|
||||
.IP \[bu] 2
|
||||
\f[I]counters\f[]: counters samples
|
||||
.PP
|
||||
It is possible to limit some of the data displayed to a timeframe
|
||||
of the program execution with the option:
|
||||
|
||||
+2
-5
@@ -10,9 +10,7 @@ net_2_0_SUBDIRS := build class nunit24 ilasm tools tests errors docs
|
||||
monodroid_SUBDIRS := build class
|
||||
monotouch_SUBDIRS := build class
|
||||
monotouch_runtime_SUBDIRS := build class
|
||||
xammac_SUBDIRS := build class
|
||||
mobile_SUBDIRS := build class
|
||||
mobile_static_SUBDIRS := build class
|
||||
net_3_5_SUBDIRS := build class tools/xbuild
|
||||
net_4_0_SUBDIRS := build class
|
||||
net_4_5_SUBDIRS := build mcs class nunit24 ilasm tools tests errors docs
|
||||
@@ -25,6 +23,7 @@ centum_tests := \
|
||||
class/System.XML \
|
||||
class/Commons.Xml.Relaxng \
|
||||
class/Cscompmgd \
|
||||
class/Microsoft.JScript \
|
||||
class/Mono.Posix \
|
||||
class/Mono.Security \
|
||||
class/System.Design \
|
||||
@@ -83,7 +82,7 @@ all-local $(STD_TARGETS:=-local):
|
||||
@:
|
||||
|
||||
dir-check:
|
||||
@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then $(MAKE) -C ../runtime; fi
|
||||
@if [ "$(NO_DIR_CHECK)" = "" -a "$(PROFILE)" != "basic" ]; then make -C ../runtime; fi
|
||||
|
||||
# fun specialty targets
|
||||
|
||||
@@ -113,9 +112,7 @@ $(_boot_:%=profile-do--net_3_5--%): profile-do--net_3_5--%:
|
||||
$(_boot_:%=profile-do--monodroid--%): profile-do--monodroid--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch--%): profile-do--monotouch--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--monotouch_runtime--%): profile-do--monotouch_runtime--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--xammac--%): profile-do--xammac--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--mobile--%): profile-do--mobile--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--mobile_static--%): profile-do--mobile_static--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--build--%
|
||||
$(_boot_:%=profile-do--build--%): profile-do--build--%: profile-do--basic--%
|
||||
|
||||
|
||||
+7
-19
@@ -61,24 +61,10 @@ lib_dir = lib
|
||||
endif
|
||||
|
||||
ifdef LIBRARY_SUBDIR
|
||||
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_SUBDIR)/
|
||||
the_libdir = $(topdir)/class/$(lib_dir)/$(PROFILE)/$(LIBRARY_SUBDIR)/
|
||||
else
|
||||
the_libdir_base = $(topdir)/class/$(lib_dir)/$(PROFILE)/
|
||||
the_libdir = $(topdir)/class/$(lib_dir)/$(PROFILE)/
|
||||
endif
|
||||
|
||||
#
|
||||
# The bare directory contains the plain versions of System and System.Xml
|
||||
#
|
||||
bare_libdir = $(the_libdir_base)bare
|
||||
|
||||
#
|
||||
# The secxml directory contains the System version that depends on
|
||||
# System.Xml and Mono.Security
|
||||
#
|
||||
secxml_libdir = $(the_libdir_base)secxml
|
||||
|
||||
the_libdir = $(the_libdir_base)$(intermediate)
|
||||
|
||||
ifdef LIBRARY_NEEDS_POSTPROCESSING
|
||||
build_libdir = fixup/$(PROFILE)/
|
||||
else
|
||||
@@ -124,9 +110,11 @@ endif
|
||||
|
||||
csproj-local: csproj-library csproj-test
|
||||
|
||||
intermediate_clean=$(subst /,-,$(intermediate))
|
||||
csproj-library:
|
||||
config_file=`basename $(LIBRARY) .dll`-$(intermediate_clean)$(PROFILE).input; \
|
||||
# to overcome the issues with circular dependencies, we'll create csprojs with a counter increment.
|
||||
# This is more amenable for use in VS solutions to reference projects rather than transient dll files in the build process.
|
||||
csproj-library:
|
||||
config_file=`basename $(LIBRARY) .dll`-$(PROFILE).input; \
|
||||
for counter in 1 2 3 4 5 ; do if test -f $(topdir)/../msvc/scripts/inputs/$$config_file ; then config_file=`basename $(LIBRARY) .dll`-$(PROFILE)-$$counter.input; fi ; done ;\
|
||||
echo $(thisdir):$$config_file >> $(topdir)/../msvc/scripts/order; \
|
||||
(echo $(is_boot); \
|
||||
echo $(USE_MCS_FLAGS) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS); \
|
||||
|
||||
@@ -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 2.10 or better installed to build MCS" 1>&2 ; \
|
||||
echo "*** You need Mono version 2.4 or better installed to build MCS" 1>&2 ; \
|
||||
echo "*** Check mono README for information on how to bootstrap a Mono installation." 1>&2 ; \
|
||||
exit 1; fi; fi
|
||||
|
||||
|
||||
@@ -12,22 +12,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:MOBILE \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-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_2_1 -d:MOBILE -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
NO_INSTALL = yes
|
||||
@@ -12,24 +12,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MOBILE \
|
||||
-d:FULL_AOT_RUNTIME \
|
||||
-d:DISABLE_REMOTING \
|
||||
-d:DISABLE_COM \
|
||||
-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_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:FULL_AOT_RUNTIME -d:DISABLE_REMOTING -d:DISABLE_COM -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
NO_TEST = yes
|
||||
|
||||
|
||||
@@ -12,24 +12,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MOBILE \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:MONODROID \
|
||||
-d:ANDROID \
|
||||
-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_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONODROID -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
NO_TEST = yes
|
||||
|
||||
|
||||
@@ -12,27 +12,9 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MOBILE \
|
||||
-d:MONOTOUCH \
|
||||
-d:DISABLE_REMOTING \
|
||||
-d:DISABLE_COM \
|
||||
-d:FULL_AOT_RUNTIME \
|
||||
-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_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -d:DISABLE_REMOTING -d:DISABLE_COM -d:FULL_AOT_RUNTIME -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
NO_TEST = yes
|
||||
|
||||
# the tuner takes care of the install
|
||||
NO_INSTALL = yes
|
||||
NO_INSTALL = yes
|
||||
@@ -14,7 +14,7 @@ profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:NET_2_0 -d:NET_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -D:DISABLE_REMOTING -d:DISABLE_COM -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_2_1 -d:NET_3_5 -d:NET_4_0 -d:NET_4_5 -d:MOBILE -d:MONOTOUCH -nowarn:1699 -nostdlib -lib:$(topdir)/class/lib/$(PROFILE) $(DEFAULT_REFERENCES) $(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
|
||||
|
||||
@@ -17,6 +17,3 @@ FRAMEWORK_VERSION = 4.0
|
||||
XBUILD_VERSION = 4.0
|
||||
|
||||
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
|
||||
|
||||
# Ignore tests on net_4_0 as the 4.0 IL code is never used for running (just for metadata), so it doesn't make sense to execute tests there
|
||||
NO_TEST = yes
|
||||
@@ -1,32 +0,0 @@
|
||||
BOOTSTRAP_PROFILE = build
|
||||
|
||||
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
|
||||
MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_GMCS)
|
||||
|
||||
# Use system resgen as we don't want local System.Windows.Forms dependency
|
||||
RESGEN = resgen2
|
||||
|
||||
profile-check:
|
||||
@:
|
||||
|
||||
DEFAULT_REFERENCES = -r:mscorlib.dll
|
||||
|
||||
PROFILE_MCS_FLAGS = \
|
||||
-d:NET_1_1 \
|
||||
-d:NET_2_0 \
|
||||
-d:NET_2_1 \
|
||||
-d:NET_3_5 \
|
||||
-d:NET_4_0 \
|
||||
-d:NET_4_5 \
|
||||
-d:MOBILE \
|
||||
-d:MOBILE_DYNAMIC \
|
||||
-d:XAMMAC \
|
||||
-nowarn:1699 \
|
||||
-nostdlib \
|
||||
-lib:$(topdir)/class/lib/$(PROFILE) \
|
||||
$(DEFAULT_REFERENCES) \
|
||||
$(PLATFORM_DEBUG_FLAGS)
|
||||
|
||||
FRAMEWORK_VERSION = 2.1
|
||||
NO_TEST = yes
|
||||
NO_INSTALL = yes
|
||||
@@ -22,7 +22,7 @@ VERSION = 0.93
|
||||
|
||||
Q=$(if $(V),,@)
|
||||
# echo -e "\\t" does not work on some systems, so use 5 spaces
|
||||
Q_MCS=$(if $(V),,@echo "MCS [$(intermediate)$(PROFILE)] $(notdir $(@))";)
|
||||
Q_MCS=$(if $(V),,@echo "MCS [$(PROFILE)] $(notdir $(@))";)
|
||||
|
||||
ifndef BUILD_TOOLS_PROFILE
|
||||
BUILD_TOOLS_PROFILE = build
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
tests_CLEAN_FILES :=
|
||||
|
||||
ifndef TEST_COMPILE
|
||||
TEST_COMPILE = $(subst $(test_remove),,$(CSCOMPILE))
|
||||
TEST_COMPILE = $(CSCOMPILE)
|
||||
endif
|
||||
|
||||
TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{43A23ADA-35D9-4A48-BCE5-C21C081C6676}</ProjectGuid>
|
||||
<ProjectGuid>{6088F0A1-9658-4B71-86DB-8685B9279154}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_2_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Accessibility-net_2_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -59,21 +59,17 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
|
||||
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
|
||||
<Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>
|
||||
<Name>corlib\corlib-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{0978E130-1E7B-4627-A9CC-7489DB17BFF1}</ProjectGuid>
|
||||
<ProjectGuid>{3C0E9135-1458-47F6-9076-17FFB1E3E32F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Accessibility-net_4_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -59,21 +59,17 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
|
||||
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
|
||||
<Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>
|
||||
<Name>corlib\corlib-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{FACE8136-C95A-4788-90B2-DB0ECF7A020A}</ProjectGuid>
|
||||
<ProjectGuid>{121E7DB9-FC04-46DF-8CF1-18B5A3FEE1B5}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_5</OutputPath>
|
||||
<OutputPath>bin\Debug\Accessibility-net_4_5</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
@@ -57,28 +56,20 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
|
||||
</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 Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<Project>{07C1F58B-9E99-47F8-A847-79EDA5157DA8}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -0,0 +1,70 @@
|
||||
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>8.0.50727</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{75D99998-A9C1-4B89-AD47-DA830E461DED}</ProjectGuid>
|
||||
<ProjectTypeGuids>{F6B19D50-1E2E-4e87-ADFB-10393B439DE0};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
|
||||
<OutputType>Library</OutputType>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<AssemblyName>Accessibility</AssemblyName>
|
||||
<JDKName>1.6</JDKName>
|
||||
<GHProjectType>1</GHProjectType>
|
||||
<Version>2.0</Version>
|
||||
<UseVSHostingProcess>false</UseVSHostingProcess>
|
||||
<AdditionalClassPath>
|
||||
</AdditionalClassPath>
|
||||
<RootNamespace>Accessibility</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug_Java20\</OutputPath>
|
||||
<DefineConstants>TRACE;DEBUG;JAVA;NET_1_1;NET_2_0;TARGET_JVM</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<SkipValidation>false</SkipValidation>
|
||||
<KeepIntermediate>false</KeepIntermediate>
|
||||
<TargetPlatform>0</TargetPlatform>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release_Java20\</OutputPath>
|
||||
<DefineConstants>TRACE;JAVA;NET_1_1;NET_2_0;TARGET_JVM</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
<BaseAddress>285212672</BaseAddress>
|
||||
<SkipValidation>false</SkipValidation>
|
||||
<KeepIntermediate>false</KeepIntermediate>
|
||||
<TargetPlatform>0</TargetPlatform>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Accessibility\IAccessible.cs" />
|
||||
<Compile Include="Accessibility\IAccessibleHandler.cs" />
|
||||
<Compile Include="Assembly\AssemblyInfo.cs" />
|
||||
<Compile Include="..\..\build\common\Consts.cs.in">
|
||||
<Link>Consts.cs.in</Link>
|
||||
</Compile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
|
||||
<Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
|
||||
<!-- 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>
|
||||
-->
|
||||
<ProjectExtensions>
|
||||
<VisualStudio>
|
||||
<UserProperties REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-data="" REFS-RefInfo-system-data="repository:vmw:framework:2.0" REFS-JarPath-system-xml="" REFS-RefInfo-system-xml="repository:vmw:framework:2.0" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" />
|
||||
</VisualStudio>
|
||||
</ProjectExtensions>
|
||||
</Project>
|
||||
@@ -55,8 +55,10 @@ using System.Runtime.InteropServices;
|
||||
[assembly: Guid ("1ea4dbf0-3c3b-11cf-810c-00aa00389b71")]
|
||||
[assembly: AllowPartiallyTrustedCallers]
|
||||
|
||||
#if !TARGET_JVM
|
||||
[assembly: AssemblyDelaySign (true)]
|
||||
[assembly: AssemblyKeyFile ("../msfinal.pub")]
|
||||
#endif
|
||||
|
||||
[assembly: ImportedFromTypeLib ("Accessibility")]
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{2B2412A6-4397-4DA7-94A6-D1AFEBCFA563}</ProjectGuid>
|
||||
<ProjectGuid>{543FE97D-6C85-42C7-9C19-A4106C878F73}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_2_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Commons.Xml.Relaxng-net_2_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -95,24 +95,21 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
|
||||
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
|
||||
<Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>
|
||||
<Name>corlib\corlib-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
|
||||
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
|
||||
<Project>{79F25FD7-0D76-4526-AF39-1A648649A827}</Project>
|
||||
<Name>System\System-net_2_0-2</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
|
||||
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
|
||||
<Project>{D9776E38-7673-45F6-BF19-7B77830DF9CA}</Project>
|
||||
<Name>System.XML\System.Xml-net_2_0-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
@@ -124,5 +121,4 @@
|
||||
<LogicalName>relaxng.rng</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{4381A633-26BF-430E-B03B-A83DC8146BF9}</ProjectGuid>
|
||||
<ProjectGuid>{2F70B549-EA84-4C1D-93C0-05CEA551DDFF}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Commons.Xml.Relaxng-net_4_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -95,24 +95,21 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
|
||||
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
|
||||
<Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>
|
||||
<Name>corlib\corlib-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
|
||||
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
|
||||
<Project>{8260E24F-1471-4320-AB5B-7CC7B68521E3}</Project>
|
||||
<Name>System\System-net_4_0-2</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
|
||||
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
|
||||
<Project>{51720A26-B4D9-4B84-8CB5-9CBA57477FBB}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_0-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
@@ -124,5 +121,4 @@
|
||||
<LogicalName>relaxng.rng</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{4399F601-CF0A-4D5B-9FCB-2EFB8A5D982E}</ProjectGuid>
|
||||
<ProjectGuid>{0C6297C3-66BE-4FD1-B9B0-057950B32E94}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_5</OutputPath>
|
||||
<OutputPath>bin\Debug\Commons.Xml.Relaxng-net_4_5</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
@@ -93,32 +92,25 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
|
||||
</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 Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<Project>{07C1F58B-9E99-47F8-A847-79EDA5157DA8}</Project>
|
||||
<Name>corlib\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 Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{38FCD731-0E11-46F7-A31B-DCBE853AD8D7}</Project>
|
||||
<Name>System\System-net_4_5-2</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 Include="..\System.XML\System.Xml-net_4_5-1.csproj">
|
||||
<Project>{4ED6CCE8-8E8A-4D82-8BCA-3EA4D4203AA4}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_5-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
@@ -129,5 +121,4 @@
|
||||
<LogicalName>relaxng.rng</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{0CCD9F77-53C4-4E1A-92C5-0A237C034C00}</ProjectGuid>
|
||||
<ProjectGuid>{09A994B6-D73D-4BB1-B0EE-3AB1DFFF2DA1}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,618,219,169</NoWarn>
|
||||
<OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_2_0</OutputPath>
|
||||
@@ -63,29 +63,26 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
|
||||
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
|
||||
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
|
||||
<Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>
|
||||
<Name>corlib\corlib-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0.csproj">
|
||||
<Project>{2B2412A6-4397-4DA7-94A6-D1AFEBCFA563}</Project>
|
||||
<Project>{543FE97D-6C85-42C7-9C19-A4106C878F73}</Project>
|
||||
<Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
|
||||
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
|
||||
<Project>{79F25FD7-0D76-4526-AF39-1A648649A827}</Project>
|
||||
<Name>System\System-net_2_0-2</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
|
||||
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
|
||||
<Project>{D9776E38-7673-45F6-BF19-7B77830DF9CA}</Project>
|
||||
<Name>System.XML\System.Xml-net_2_0-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
@@ -97,5 +94,4 @@
|
||||
<LogicalName>relaxng.rng</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{75496501-CA6D-4C97-952E-95DC6F77C523}</ProjectGuid>
|
||||
<ProjectGuid>{07D36D76-142D-4C8D-80CD-CA073A31E1DE}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,618,219,169</NoWarn>
|
||||
<OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_0</OutputPath>
|
||||
@@ -63,29 +63,26 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="..\lib\net_4_0\nunit.framework.dll" />
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
|
||||
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
|
||||
<Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>
|
||||
<Name>corlib\corlib-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0.csproj">
|
||||
<Project>{4381A633-26BF-430E-B03B-A83DC8146BF9}</Project>
|
||||
<Project>{2F70B549-EA84-4C1D-93C0-05CEA551DDFF}</Project>
|
||||
<Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
|
||||
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
|
||||
<Project>{8260E24F-1471-4320-AB5B-7CC7B68521E3}</Project>
|
||||
<Name>System\System-net_4_0-2</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_4_0-1.csproj">
|
||||
<Project>{3FFA80F7-ACB9-480C-828F-7C9BA7A17EE3}</Project>
|
||||
<Project>{51720A26-B4D9-4B84-8CB5-9CBA57477FBB}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_0-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
@@ -97,5 +94,4 @@
|
||||
<LogicalName>relaxng.rng</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{8017F2F8-5276-411F-A2C8-581BA6C9ED17}</ProjectGuid>
|
||||
<ProjectGuid>{7694FE57-6BB7-478E-BB4E-C5187167804F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,618,219,169</NoWarn>
|
||||
<OutputPath>bin\Debug\Commons.Xml.Relaxng-tests-net_4_5</OutputPath>
|
||||
@@ -63,29 +63,26 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="..\lib\net_4_5\nunit.framework.dll" />
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<Project>{33BF0182-AC5C-464C-995B-C9CFE74E1A95}</Project>
|
||||
<Project>{07C1F58B-9E99-47F8-A847-79EDA5157DA8}</Project>
|
||||
<Name>corlib\corlib-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_5.csproj">
|
||||
<Project>{4399F601-CF0A-4D5B-9FCB-2EFB8A5D982E}</Project>
|
||||
<Project>{0C6297C3-66BE-4FD1-B9B0-057950B32E94}</Project>
|
||||
<Name>Commons.Xml.Relaxng\Commons.Xml.Relaxng-net_4_5</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{5C605B73-19DA-4FB7-AB39-C7EF9A8B19FE}</Project>
|
||||
<Project>{38FCD731-0E11-46F7-A31B-DCBE853AD8D7}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_4_5-1.csproj">
|
||||
<Project>{2534ADE0-05E4-490F-933D-1E39310A0CB9}</Project>
|
||||
<Project>{4ED6CCE8-8E8A-4D82-8BCA-3EA4D4203AA4}</Project>
|
||||
<Name>System.XML\System.Xml-net_4_5-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
@@ -97,5 +94,4 @@
|
||||
<LogicalName>relaxng.rng</LogicalName>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -107,7 +107,7 @@ namespace Commons.Xml.Relaxng.Rnc
|
||||
|
||||
public RelaxngPattern Parse (TextReader source, string baseUri, string defaultNamespace)
|
||||
{
|
||||
this.defaultNamespace = defaultNamespace ?? string.Empty;
|
||||
this.defaultNamespace = defaultNamespace;
|
||||
if (defaultNamespace != null && defaultNamespace.Length != 0)
|
||||
nsmgr.AddNamespace (String.Empty, defaultNamespace);
|
||||
try {
|
||||
|
||||
@@ -13,7 +13,7 @@ using System.Xml;
|
||||
using Commons.Xml.Nvdl;
|
||||
using NUnit.Framework;
|
||||
|
||||
namespace MonoTests.Commons.Xml.Relaxng
|
||||
namespace MonoTests.Commons.Xml.Nvdl
|
||||
{
|
||||
[TestFixture]
|
||||
public class NvdlValidatingReaderTests
|
||||
|
||||
@@ -95,19 +95,5 @@ start = mine";
|
||||
r.Close ();
|
||||
}
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void SimpleDefaultNamespace ()
|
||||
{
|
||||
var g = RncParser.ParseRnc (new StringReader ("element e { empty }"));
|
||||
var x = XmlReader.Create (new StringReader ("<e/>"));
|
||||
var r = new RelaxngValidatingReader (x, g);
|
||||
try {
|
||||
while (!r.EOF)
|
||||
r.Read ();
|
||||
} finally {
|
||||
r.Close ();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,7 @@ TEST_ARCHIVE = testSuite.zip
|
||||
RNCTESTS = test/RNCTest.xml
|
||||
RNCTEST_ARCHIVE = anglia-test-suite.zip
|
||||
|
||||
all : relaxngtest.exe #anglia-test-runner.exe
|
||||
all : relaxngtest.exe anglia-test-runner.exe
|
||||
|
||||
relaxngtest.exe : relaxngtest.cs $(TESTS)
|
||||
$(MCS_RUNTIME) $(MCS) -debug+ relaxngtest.cs -r:Commons.Xml.Relaxng.dll
|
||||
|
||||
+9
-13
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{8F572B12-CBD2-48F8-8234-41A876C57364}</ProjectGuid>
|
||||
<ProjectGuid>{A98EAB08-7C3E-40CE-898E-3DF9A0939DB5}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/compat/net_2_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Compat.ICSharpCode.SharpZipLib-net_2_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -93,29 +93,25 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
|
||||
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
|
||||
<Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>
|
||||
<Name>corlib\corlib-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
|
||||
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
|
||||
<Project>{79F25FD7-0D76-4526-AF39-1A648649A827}</Project>
|
||||
<Name>System\System-net_2_0-2</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System.XML\System.Xml-net_2_0-1.csproj">
|
||||
<Project>{080698DE-8AF0-496E-9AD7-58B6C605328A}</Project>
|
||||
<Project>{D9776E38-7673-45F6-BF19-7B77830DF9CA}</Project>
|
||||
<Name>System.XML\System.Xml-net_2_0-1</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{C010783F-1EAC-480C-B1D4-A289426D3F8F}</ProjectGuid>
|
||||
<ProjectGuid>{9E7D403F-232E-4126-ADF8-0897129C037F}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_2_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Cscompmgd-net_2_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -62,25 +62,21 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
|
||||
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
|
||||
<Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>
|
||||
<Name>corlib\corlib-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
|
||||
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
|
||||
<Project>{79F25FD7-0D76-4526-AF39-1A648649A827}</Project>
|
||||
<Name>System\System-net_2_0-2</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{B26893EC-D295-40B7-8AE6-60B3D0F5CBA6}</ProjectGuid>
|
||||
<ProjectGuid>{DCF7BFCB-23B0-41F0-94A3-0AEFA87EC799}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_0</OutputPath>
|
||||
<OutputPath>bin\Debug\Cscompmgd-net_4_0</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -62,25 +62,21 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\corlib\corlib-net_4_0.csproj">
|
||||
<Project>{F42F5509-677F-4C93-A026-047AB6153801}</Project>
|
||||
<Project>{3874F10B-9AE4-4A7E-873B-42FFDCE80CB7}</Project>
|
||||
<Name>corlib\corlib-net_4_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_4_0-2.csproj">
|
||||
<Project>{3391D58D-26E9-48D2-9A76-4BC1A2F06BE9}</Project>
|
||||
<Project>{8260E24F-1471-4320-AB5B-7CC7B68521E3}</Project>
|
||||
<Name>System\System-net_4_0-2</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,10 +5,10 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{7CC1624B-EBC8-45E6-A30B-951A31ADC150}</ProjectGuid>
|
||||
<ProjectGuid>{C67F17EE-7E1C-4B87-B58B-11458749DD70}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699</NoWarn>
|
||||
<OutputPath>./../../class/lib/net_4_5</OutputPath>
|
||||
<OutputPath>bin\Debug\Cscompmgd-net_4_5</OutputPath>
|
||||
<NoStdLib>True</NoStdLib>
|
||||
<NoConfig>True</NoConfig>
|
||||
|
||||
@@ -19,7 +19,6 @@
|
||||
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||
<FileAlignment>512</FileAlignment>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
@@ -60,32 +59,24 @@
|
||||
</Target>
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PreBuildEvent>
|
||||
<PreBuildEvent>
|
||||
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_4_5\ /Y /R /D
|
||||
</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 Include="..\corlib\corlib-net_4_5.csproj">
|
||||
<Project>{07C1F58B-9E99-47F8-A847-79EDA5157DA8}</Project>
|
||||
<Name>corlib\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 Include="..\System\System-net_4_5-2.csproj">
|
||||
<Project>{38FCD731-0E11-46F7-A31B-DCBE853AD8D7}</Project>
|
||||
<Name>System\System-net_4_5-2</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||
<ProductVersion>9.0.30729</ProductVersion>
|
||||
<SchemaVersion>2.0</SchemaVersion>
|
||||
<ProjectGuid>{B3E7EE0C-3AB6-4578-844E-FF72C5807953}</ProjectGuid>
|
||||
<ProjectGuid>{09C1F680-F5E0-421A-9040-D98664AF9895}</ProjectGuid>
|
||||
<OutputType>Library</OutputType>
|
||||
<NoWarn>1699,618,219,169</NoWarn>
|
||||
<OutputPath>bin\Debug\Cscompmgd-tests-net_2_0</OutputPath>
|
||||
@@ -56,30 +56,26 @@
|
||||
<PreBuildEvent>
|
||||
|
||||
</PreBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
|
||||
|
||||
</PostBuildEvent>
|
||||
<PostBuildEvent>
|
||||
xcopy $(TargetName).* $(ProjectDir)..\lib\net_2_0\ /Y /R /D
|
||||
</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Reference Include="..\lib\net_2_0\nunit.framework.dll" />
|
||||
<ProjectReference Include="..\corlib\corlib-net_2_0.csproj">
|
||||
<Project>{5A00133C-6D08-48F7-A164-8B796CE6DB83}</Project>
|
||||
<Project>{EB7444A6-C3E6-4224-BDB0-63CA3B4F2B87}</Project>
|
||||
<Name>corlib\corlib-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Cscompmgd\Cscompmgd-net_2_0.csproj">
|
||||
<Project>{C010783F-1EAC-480C-B1D4-A289426D3F8F}</Project>
|
||||
<Project>{9E7D403F-232E-4126-ADF8-0897129C037F}</Project>
|
||||
<Name>Cscompmgd\Cscompmgd-net_2_0</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\System\System-net_2_0-2.csproj">
|
||||
<Project>{1F3B168C-A4D0-44AA-B116-792D8804971F}</Project>
|
||||
<Project>{79F25FD7-0D76-4526-AF39-1A648649A827}</Project>
|
||||
<Name>System\System-net_2_0-2</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Folder Include="Properties\" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
</Project>
|
||||
Loaded 100 of 10764 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user