mirror of
https://github.com/BepInEx/mono.git
synced 2026-11-16 11:21:08 -10:00
Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8386f9b91a | ||
|
|
de6b204d7c | ||
|
|
f1551de7fa | ||
|
|
28b1845940 |
No files matched your search
@@ -1,142 +0,0 @@
|
||||
# Mono Code Owners File
|
||||
#
|
||||
# GitHub uses this file to determine who to assign for reviews
|
||||
# on pull requests. Please keep this file alphabetically sorted.
|
||||
#
|
||||
# References:
|
||||
#
|
||||
# https://github.com/blog/2392-introducing-code-owners
|
||||
# https://help.github.com/articles/about-codeowners
|
||||
|
||||
|
||||
# These owners will be the default owners for everything in the repo.
|
||||
* @luhenry @marek-safar
|
||||
|
||||
# Order is important. The last matching pattern has the most precedence.
|
||||
|
||||
/acceptance-tests @akoeplinger
|
||||
/acceptance-tests/profiler-stress* @alexrp
|
||||
|
||||
/data @marek-safar @akoeplinger @luhenry
|
||||
/data/gdb @vargaz
|
||||
/data/lldb @lewurm @vargaz
|
||||
|
||||
/docs @luhenry @marek-safar
|
||||
/docs/sources/mono-api-profiler.html @alexrp
|
||||
|
||||
/external @marek-safar @luhenry
|
||||
/external/binary-reference-assemblies @marek-safar @akoeplinger
|
||||
/external/bockbuild @akoeplinger @alexischr
|
||||
/external/boringssl @baulig
|
||||
/external/nuget-buildtasks @radical @akoeplinger
|
||||
|
||||
/libgc @BrzVlad @vargaz @luhenry
|
||||
|
||||
/llvm @vargaz @luhenry
|
||||
|
||||
/man @marek-safar @miguel @luhenry
|
||||
/man/*prof* @alexrp
|
||||
|
||||
/mcs @marek-safar @luhenry
|
||||
|
||||
/mcs/build @marek-safar @akoeplinger
|
||||
|
||||
/mcs/class @marek-safar @akoeplinger
|
||||
/mcs/class/corlib/Mono @baulig
|
||||
/mcs/class/corlib/System.Reflection*/ @vargaz @lambdageek
|
||||
/mcs/class/corlib/System.Security.Cryptography.X509Certificates @baulig
|
||||
/mcs/class/Mono.Btls.Interface @baulig
|
||||
/mcs/class/Mono.Data.Tds @egorbo
|
||||
/mcs/class/Mono.Debugger.Soft @vargaz
|
||||
/mcs/class/Mono.Options @jonpryor
|
||||
/mcs/class/Mono.Profiler.Log @alexrp
|
||||
/mcs/class/Mono.Security/Mono.Security/Interface @baulig
|
||||
/mcs/class/System/Mono @baulig
|
||||
/mcs/class/System/Mono.AppleTls @baulig
|
||||
/mcs/class/System/Mono.Btls @baulig
|
||||
/mcs/class/System/Mono.Net.Security @baulig
|
||||
/mcs/class/System/Mono.Security.Interface @baulig
|
||||
/mcs/class/System/System.Security.Cryptography.X509Certificates @baulig
|
||||
/mcs/class/System.Data* @egorbo
|
||||
|
||||
/mcs/errors @marek-safar
|
||||
/mcs/ilasm @marek-safar
|
||||
/mcs/jay @marek-safar
|
||||
/mcs/mcs @marek-safar @lewurm
|
||||
/mcs/tests @marek-safar
|
||||
/mcs/tools @marek-safar @akoeplinger
|
||||
|
||||
/mono @luhenry
|
||||
|
||||
/mono/btls @baulig
|
||||
/mono/dis @lambdageek @vargaz
|
||||
/mono/eglib @kumpera @vargaz @luhenry
|
||||
|
||||
/mono/metadata @vargaz @kumpera
|
||||
/mono/metadata/*verify* @kumpera
|
||||
/mono/metadata/*profiler* @alexrp
|
||||
/mono/metadata/monitor* @brzvlad
|
||||
/mono/metadata/sgen* @brzvlad
|
||||
/mono/metadata/threads* @luhenry @kumpera
|
||||
/mono/metadata/threadpool* @luhenry
|
||||
/mono/metadata/w32* @luhenry
|
||||
/mono/metadata/*-win* @lateralusX @luhenry
|
||||
|
||||
/mono/mini @vargaz @kumpera
|
||||
/mono/mini/*cfgdump* @lewurm
|
||||
/mono/mini/*exceptions* @lewurm
|
||||
/mono/mini/*ppc* @lewurm
|
||||
/mono/mini/*type-check* @lewurm
|
||||
/mono/mini/interp/* @lewurm @BrzVlad
|
||||
/mono/mini/*profiler* @alexrp
|
||||
/mono/mini/debugger-agent.c @DavidKarlas
|
||||
|
||||
/mono/native @baulig
|
||||
|
||||
/mono/profiler @alexrp @kumpera
|
||||
|
||||
/mono/sgen @BrzVlad @kumpera
|
||||
|
||||
/mono/utils @kumpera @vargaz
|
||||
/mono/utils/atomic* @alexrp
|
||||
/mono/utils/mono-hwcap* @alexrp
|
||||
/mono/utils/mono-mem* @alexrp
|
||||
/mono/utils/mono-threads* @luhenry @kumpera
|
||||
/mono/utils/*-win* @lateralusX @kumpera
|
||||
|
||||
/msvc @lateralusX @luhenry
|
||||
/msvc/*profiler* @alexrp
|
||||
/msvc/scripts @akoeplinger @kg
|
||||
|
||||
/packaging/ @alexischr @akoeplinger @luhenry @directhex
|
||||
/packaging/MacSDK/msbuild.py @radical @akoeplinger
|
||||
|
||||
/runtime @akoeplinger @marek-safar @luhenry
|
||||
|
||||
/samples @luhenry
|
||||
/samples/profiler @alexrp
|
||||
/samples/size @alexrp
|
||||
|
||||
/scripts @akoeplinger @luhenry
|
||||
/scripts/ci @akoeplinger @alexischr
|
||||
/scripts/ci/run-test-profiler-stress-tests.sh @alexrp
|
||||
|
||||
/sdks @marek-safar @luhenry
|
||||
/sdks/builds/android* @luhenry @jonpryor
|
||||
/sdks/builds/mxe* @luhenry @jonpryor
|
||||
/sdks/builds/ios* @vargaz @rolfbjarne
|
||||
/sdks/wasm @kumpera @lrz
|
||||
/sdks/ios @vargaz @rolfbjarne
|
||||
/sdks/android @luhenry @jonpryor
|
||||
|
||||
/support @luhenry @vargaz
|
||||
|
||||
/tools @kumpera @luhenry
|
||||
/tools/checker @tritao
|
||||
/tools/crash-bisector @kumpera
|
||||
/tools/locale-builder @marek-safar
|
||||
/tools/monograph @vargaz
|
||||
/tools/nuget-hash-extractor @marek-safar
|
||||
/tools/offsets-tool @lewurm @rolfbjarne
|
||||
/tools/pedump @kumpera @lambdageek
|
||||
/tools/sgen @brzvlad
|
||||
@@ -1,47 +0,0 @@
|
||||
<!--
|
||||
If you are new to the project get yourself familiar with https://www.mono-project.com/community/bugs/make-a-good-bug-report/ before filling the issue
|
||||
-->
|
||||
|
||||
## Steps to Reproduce
|
||||
|
||||
1.
|
||||
2.
|
||||
3.
|
||||
|
||||
<!--
|
||||
You may drag & drop the attachment (repro code/solution, screenshot, etc.) onto the issue.
|
||||
-->
|
||||
|
||||
### Current Behavior
|
||||
|
||||
<!--
|
||||
What is the current behavior?
|
||||
-->
|
||||
|
||||
### Expected Behavior
|
||||
|
||||
<!--
|
||||
Please describe the behavior you are expecting
|
||||
-->
|
||||
|
||||
## On which platforms did you notice this
|
||||
|
||||
[ ] macOS
|
||||
[ ] Linux
|
||||
[ ] Windows
|
||||
|
||||
**Version Used**:
|
||||
|
||||
<!--
|
||||
You can use `mono --version` or About dialog to obtain this information.
|
||||
-->
|
||||
|
||||
## Stacktrace
|
||||
|
||||
```
|
||||
Please paste the stack trace here if available.
|
||||
```
|
||||
|
||||
<!--
|
||||
You can join us at https://gitter.im/mono/mono to discuss your reported issue
|
||||
-->
|
||||
@@ -1,9 +0,0 @@
|
||||
|
||||
|
||||
<!--
|
||||
Thank you for your Pull Request!
|
||||
|
||||
If you are new to contributing to Mono, please try to do your best at conforming to our coding guidelines http://www.mono-project.com/community/contributing/coding-guidelines/ but don't worry if you get something wrong. One of the project members will help you to get things landed.
|
||||
|
||||
Does your pull request fix any of the existing issues? Please use the following format: Fixes #issue-number
|
||||
-->
|
||||
+1
-4
@@ -40,12 +40,10 @@ Ankh.NoLoad
|
||||
*.gpState
|
||||
.vscode/
|
||||
*.exp
|
||||
.vs/
|
||||
|
||||
# Tooling
|
||||
_ReSharper*/
|
||||
*.resharper
|
||||
.idea/*
|
||||
[Tt]est[Rr]esult*
|
||||
*.orig
|
||||
*.rej
|
||||
@@ -90,7 +88,6 @@ stamp-h.in
|
||||
*.swp
|
||||
*.o
|
||||
.deps
|
||||
.libs
|
||||
|
||||
# Libtool
|
||||
libtool.m4
|
||||
@@ -131,4 +128,4 @@ mono-*.tar.*
|
||||
tmpinst-dir.stamp
|
||||
msvc/scripts/inputs/
|
||||
extensions-config.h
|
||||
*.mlpd
|
||||
|
||||
+3
-4
@@ -26,6 +26,9 @@
|
||||
[submodule "external/nuget-buildtasks"]
|
||||
path = external/nuget-buildtasks
|
||||
url = git://github.com/mono/NuGet.BuildTasks
|
||||
[submodule "external/buildtools"]
|
||||
path = external/buildtools
|
||||
url = git://github.com/mono/buildtools.git
|
||||
[submodule "external/cecil-legacy"]
|
||||
path = external/cecil-legacy
|
||||
url = git://github.com/mono/cecil.git
|
||||
@@ -58,7 +61,3 @@
|
||||
[submodule "external/api-snapshot"]
|
||||
path = external/api-snapshot
|
||||
url = git://github.com/mono/api-snapshot.git
|
||||
[submodule "external/llvm"]
|
||||
path = external/llvm
|
||||
url = git://github.com/mono/llvm.git
|
||||
branch = release_60
|
||||
Vendored
-91
@@ -1,91 +0,0 @@
|
||||
{
|
||||
"configurations": [
|
||||
{
|
||||
"name": "Mac",
|
||||
"includePath": [
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
|
||||
"/usr/local/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
|
||||
"/usr/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include/c++/v1",
|
||||
"/usr/local/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/9.0.0/include",
|
||||
"/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include",
|
||||
"/usr/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
},
|
||||
"macFrameworkPath": [
|
||||
"/System/Library/Frameworks",
|
||||
"/Library/Frameworks"
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "Linux",
|
||||
"includePath": [
|
||||
"/usr/include",
|
||||
"/usr/local/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [],
|
||||
"intelliSenseMode": "clang-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"/usr/include",
|
||||
"/usr/local/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "Win32",
|
||||
"includePath": [
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"defines": [
|
||||
"_DEBUG",
|
||||
"UNICODE"
|
||||
],
|
||||
"intelliSenseMode": "msvc-x64",
|
||||
"browse": {
|
||||
"path": [
|
||||
"C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/include/*",
|
||||
"${workspaceRoot}",
|
||||
"${workspaceRoot}/mono",
|
||||
"${workspaceRoot}/mono/eglib",
|
||||
"${workspaceRoot}/support"
|
||||
],
|
||||
"limitSymbolsToIncludedHeaders": true,
|
||||
"databaseFilename": ""
|
||||
}
|
||||
}
|
||||
],
|
||||
"version": 4
|
||||
}
|
||||
@@ -23,7 +23,7 @@ License
|
||||
|
||||
The Mono runtime, compilers, and tools and most of the class libraries
|
||||
are licensed under the MIT license. But include some bits of code
|
||||
licensed under different licenses. The exact list is [available here](https://github.com/mono/mono/blob/master/LICENSE).
|
||||
licensed under different licenses. The exact list is [available here] (https://github.com/mono/mono/blob/master/LICENSE).
|
||||
|
||||
Different parts of Mono use different licenses. The actual details of
|
||||
which licenses are used for which parts are detailed on the LICENSE
|
||||
@@ -32,12 +32,7 @@ file in this directory.
|
||||
CLA
|
||||
=======
|
||||
|
||||
Contributions are now taken under the [.NET Foundation CLA](https://cla.dotnetfoundation.org/).
|
||||
|
||||
Code Review
|
||||
=======
|
||||
We are requiring code reviews before merging a pull request.
|
||||
GitHub won't let you merge a PR until someone from the Mono team approves it.
|
||||
Contributions are now taken under the [.NET Foundation CLA] (https://cla2.dotnetfoundation.org/).
|
||||
|
||||
Testing
|
||||
=======
|
||||
@@ -46,7 +46,7 @@ embeddable runtime:
|
||||
|
||||
* mono/utils/bsearch.c: BSD license.
|
||||
|
||||
* mono/metadata/w32file-unix-glob.c, w32file-unix-glob.h: BSD license
|
||||
* mono/io-layer/wapi_glob.h, wapi_glob.c: BSD license
|
||||
|
||||
Class Library code
|
||||
==================
|
||||
|
||||
+30
-14
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) mono
|
||||
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
|
||||
|
||||
# Some tools might not build when cross-compiling
|
||||
if CROSS_COMPILING
|
||||
@@ -11,9 +11,9 @@ else
|
||||
tools_dir = tools
|
||||
endif
|
||||
|
||||
SUBDIRS = mk po $(libgc_dir) llvm mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests
|
||||
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples $(tools_dir) msvc $(docs_dir) acceptance-tests llvm
|
||||
# Keep in sync with SUBDIRS
|
||||
DIST_SUBDIRS = m4 mk po $(libgc_dir) llvm mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests
|
||||
DIST_SUBDIRS = m4 po $(libgc_dir) eglib mono ikvm-native support data runtime scripts man samples tools msvc docs acceptance-tests llvm
|
||||
|
||||
all: update_submodules
|
||||
|
||||
@@ -44,16 +44,20 @@ dist-hook:
|
||||
rm -rf `find $(top_distdir)/external -path '*\.git'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.exe' -not -path '*/roslyn-binaries/*'`
|
||||
rm -f `find $(top_distdir)/external -path '*\.dll' -not -path '*/binary-reference-assemblies/*' -not -path '*/roslyn-binaries/*'`
|
||||
rm -rf "$(top_distdir)/external/linker/linker/Tests"
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
noinst_DATA = mono-uninstalled.pc
|
||||
DISTCLEANFILES= mono-uninstalled.pc
|
||||
|
||||
# building with monolite
|
||||
mcslib = $(mcs_topdir)/class/lib
|
||||
monolite_url = https://download.mono-project.com/monolite/monolite-$(MONO_CORLIB_VERSION)-latest.tar.gz
|
||||
.PHONY: get-monolite-latest
|
||||
get-monolite-latest:
|
||||
$(MAKE) -C $(mcs_topdir)/class get-monolite-latest
|
||||
-rm -fr $(mcslib)/monolite/$(MONO_CORLIB_VERSION)
|
||||
-mkdir -p $(mcslib)/monolite
|
||||
cd $(mcslib) && { (wget -O- $(monolite_url) || curl -L $(monolite_url)) | gzip -d | tar xf - ; }
|
||||
cd $(mcslib) && mv -f monolite-* monolite/$(MONO_CORLIB_VERSION)
|
||||
|
||||
if BITCODE
|
||||
BITCODE_CHECK=yes
|
||||
@@ -110,12 +114,29 @@ monotouch-do-clean:
|
||||
|
||||
endif
|
||||
|
||||
win32getdeps:
|
||||
wget http://www.go-mono.com/archive/pkgconfig-0.11-20020310.zip
|
||||
wget http://www.go-mono.com/archive/glib-2.0.4-20020703.zip
|
||||
wget http://www.go-mono.com/archive/glib-dev-2.0.4-20020703.zip
|
||||
wget http://www.go-mono.com/archive/libiconv-1.7.zip
|
||||
wget http://www.go-mono.com/archive/libiconv-dev-1.7.zip
|
||||
wget http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip
|
||||
unzip -n -d / pkgconfig-0.11-20020310.zip
|
||||
unzip -n -d / glib-2.0.4-20020703.zip
|
||||
unzip -n -d / glib-dev-2.0.4-20020703.zip
|
||||
unzip -n -d / libiconv-1.7.zip
|
||||
unzip -n -d / libiconv-dev-1.7.zip
|
||||
unzip -n -d / libintl-0.10.40-20020101.zip
|
||||
|
||||
win32setup:
|
||||
makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
|
||||
|
||||
update-csproj:
|
||||
-rm msvc/scripts/order
|
||||
-rm msvc/scripts/order.xml
|
||||
-rm -rf msvc/scripts/inputs
|
||||
-mkdir msvc/scripts/inputs
|
||||
(cd runtime; $(MAKE) V=1 extra_targets=csproj-local)
|
||||
(cd runtime; make V=1 extra_targets=csproj-local)
|
||||
|
||||
package-inputs:
|
||||
echo '<?xml version="1.0" encoding="utf-8"?>' > msvc/scripts/order.xml
|
||||
@@ -126,7 +147,6 @@ package-inputs:
|
||||
(echo " <project dir=\"$$1\" library=\"$$2\">"; \
|
||||
read boot; echo " <boot>$$boot</boot>"; \
|
||||
read flags; echo " <flags>$$flags</flags>"; \
|
||||
read sources;echo " <sources>$$sources</sources>"; \
|
||||
read output; echo " <output>$$output</output>"; \
|
||||
read built; echo " <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
|
||||
read libou; echo " <library_output>$$libou</library_output>"; \
|
||||
@@ -145,10 +165,6 @@ update-llvm-version:
|
||||
|
||||
|
||||
update-solution-files:
|
||||
cd msvc/scripts && $(MAKE) genproj.exe || exit $$?;
|
||||
$(MAKE) update-csproj
|
||||
$(MAKE) package-inputs
|
||||
(cd msvc/scripts; mono --debug genproj.exe $(GENPROJ_ARGS))
|
||||
|
||||
update-solution-files-with-tests:
|
||||
$(MAKE) "GENPROJ_ARGS=2012 true true" update-solution-files
|
||||
make update-csproj
|
||||
make package-inputs
|
||||
(cd msvc/scripts; make genproj.exe; mono genproj.exe)
|
||||
@@ -3,7 +3,7 @@ create cross platform applications. It is an open source
|
||||
implementation of Microsoft's .NET Framework based on the ECMA
|
||||
standards for C# and the Common Language Runtime.
|
||||
|
||||
The Mono project is part of the [.NET Foundation](https://www.dotnetfoundation.org/)
|
||||
The Mono project is part of the [.NET Foundation](http://www.dotnetfoundation.org/)
|
||||
|
||||
[](https://gitter.im/mono/mono?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
|
||||
|
||||
@@ -19,31 +19,30 @@ The Mono project is part of the [.NET Foundation](https://www.dotnetfoundation.o
|
||||
|
||||
| OS | Architecture | Status |
|
||||
|--------------|--------------------|------------------------------|
|
||||
| Debian 9 | amd64 | [![debian-9-amd64][1]][2] |
|
||||
| Debian 9 | i386 | [![debian-9-i386][3]][4] |
|
||||
| Debian 9 | armel | [![debian-9-armel][5]][6] |
|
||||
| Debian 9 | armhf | [![debian-9-armhf][7]][8] |
|
||||
| Debian 9 | arm64 | [![debian-9-arm64][9]][10] |
|
||||
| Ubuntu 14.04 | amd64 | [![ubuntu-1404-amd64][1]][2] |
|
||||
| Ubuntu 14.04 | i386 | [![ubuntu-1404-i386][3]][4] |
|
||||
| Debian 8 | armel | [![debian-8-armel][5]][6] |
|
||||
| Debian 8 | armhf | [![debian-8-armhf][7]][8] |
|
||||
| Debian 8 | arm64 | [![debian-8-arm64][9]][10] |
|
||||
| OS X | amd64 | [![osx-amd64][11]][12] |
|
||||
| OS X | i386 | [![osx-i386][13]][14] |
|
||||
| Windows | amd64 | [![windows-amd64][15]][16] |
|
||||
| Windows | i386 | [![windows-i386][17]][18] |
|
||||
| Windows | i386 | [![windows-amd64][17]][18] |
|
||||
| CentOS | s390x (cs) | [![centos-s390x][19]][20] |
|
||||
| Debian 9 | ppc64el (cs) | [![debian-9-ppc64el][21]][22]|
|
||||
| AIX | ppc64 (cs) | [![aix-ppc64][23]][24] |
|
||||
| Debian 8 | ppc64el (cs) | [![debian-8-ppc64el][21]][22]|
|
||||
|
||||
_(cs) = community supported architecture_
|
||||
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-amd64
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armhf/badge/icon
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-9-arm64/
|
||||
[1]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64/badge/icon
|
||||
[2]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-amd64
|
||||
[3]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/badge/icon
|
||||
[4]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=ubuntu-1404-i386/
|
||||
[5]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/badge/icon
|
||||
[6]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armel/
|
||||
[7]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/badge/icon
|
||||
[8]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-armhf/
|
||||
[9]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/badge/icon
|
||||
[10]: https://jenkins.mono-project.com/job/test-mono-mainline-linux/label=debian-8-arm64/
|
||||
[11]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/badge/icon
|
||||
[12]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-amd64/
|
||||
[13]: https://jenkins.mono-project.com/job/test-mono-mainline/label=osx-i386/badge/icon
|
||||
@@ -54,10 +53,8 @@ _(cs) = community supported architecture_
|
||||
[18]: https://jenkins.mono-project.com/job/z/label=w32/
|
||||
[19]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x/badge/icon
|
||||
[20]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=centos-s390x
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-9-ppc64el
|
||||
[23]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=aix-ppc64/badge/icon
|
||||
[24]: https://jenkins.mono-project.com/job/test-mono-mainline-community/label=aix-ppc64
|
||||
[21]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el/badge/icon
|
||||
[22]: https://jenkins.mono-project.com/job/test-mono-mainline-community-chroot/label=debian-8-ppc64el
|
||||
|
||||
Compilation and Installation
|
||||
============================
|
||||
@@ -66,15 +63,15 @@ Building the Software
|
||||
---------------------
|
||||
|
||||
Please see our guides for building Mono on
|
||||
[Mac OS X](https://www.mono-project.com/docs/compiling-mono/mac/),
|
||||
[Linux](https://www.mono-project.com/docs/compiling-mono/linux/) and
|
||||
[Windows](https://www.mono-project.com/docs/compiling-mono/windows/).
|
||||
[Mac OS X](http://www.mono-project.com/docs/compiling-mono/mac/),
|
||||
[Linux](http://www.mono-project.com/docs/compiling-mono/linux/) and
|
||||
[Windows](http://www.mono-project.com/docs/compiling-mono/windows/).
|
||||
|
||||
Note that building from Git assumes that you already have Mono installed,
|
||||
so please download and [install the latest Mono release](https://www.mono-project.com/download/)
|
||||
so please download and [install the latest Mono release](http://www.mono-project.com/download/)
|
||||
before trying to build from Git. This is required because the Mono build
|
||||
relies on a working Mono C# compiler to compile itself
|
||||
(also known as [bootstrapping](https://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
|
||||
(also known as [bootstrapping](http://en.wikipedia.org/wiki/Bootstrapping_(compilers))).
|
||||
|
||||
If you don't have a working Mono installation
|
||||
---------------------------------------------
|
||||
@@ -114,7 +111,7 @@ Once you have installed the software, you can run a few programs:
|
||||
|
||||
* `mono program.exe` runtime engine
|
||||
|
||||
* `mcs program.cs` C# compiler
|
||||
* `mcs program.cs` C# compiler
|
||||
|
||||
* `monodis program.exe` CIL Disassembler
|
||||
|
||||
@@ -131,14 +128,6 @@ Directory Roadmap
|
||||
|
||||
* `external/` - Git submodules for external libraries (Newtonsoft.Json, ikvm, etc).
|
||||
|
||||
* `ikvm-native/` - Glue code for ikvm.
|
||||
|
||||
* `libgc/` - The (deprecated) Boehm GC implementation.
|
||||
|
||||
* `llvm/` - Utility Makefiles for integrating the Mono LLVM fork.
|
||||
|
||||
* `m4/` - General utility Makefiles.
|
||||
|
||||
* `man/` - Manual pages for the various Mono commands and programs.
|
||||
|
||||
* `mcs/` - The class libraries, compiler and tools
|
||||
@@ -153,69 +142,44 @@ Directory Roadmap
|
||||
|
||||
* `arch/` - Architecture specific portions.
|
||||
|
||||
* `benchmark/` - A collection of benchmarks.
|
||||
|
||||
* `btls/` - Build files for the BTLS library which incorporates BoringSSL.
|
||||
|
||||
* `cil/` - Common Intermediate Representation, XML
|
||||
definition of the CIL bytecodes.
|
||||
|
||||
* `dis/` - CIL executable Disassembler.
|
||||
* `dis/` - CIL executable Disassembler
|
||||
|
||||
* `eglib/` - Independent implementation of the glib API.
|
||||
* `io-layer/` - The I/O layer and system abstraction for
|
||||
emulating the .NET IO model.
|
||||
|
||||
* `metadata/` - The object system and metadata reader.
|
||||
|
||||
* `mini/` - The Just in Time Compiler.
|
||||
|
||||
* `profiler/` - The profiler implementation.
|
||||
|
||||
* `sgen/` - The SGen Garbage Collector implementation.
|
||||
|
||||
* `tests/` - The main runtime tests.
|
||||
|
||||
* `unit-tests/` - Additional runtime unit tests.
|
||||
|
||||
* `utils/` - Utility functions used across the runtime codebase.
|
||||
|
||||
* `msvc/` - Logic for the MSVC / Visual Studio based runtime and BCL build system.
|
||||
The latter is experimental at the moment.
|
||||
|
||||
* `packaging/` - Packaging logic for the OS X and Windows Mono packages.
|
||||
|
||||
* `po/` - Translation files.
|
||||
|
||||
* `runtime/` - A directory that contains the Makefiles that link the
|
||||
mono/ and mcs/ build systems.
|
||||
|
||||
* `samples/` - Some simple sample programs on uses of the Mono
|
||||
runtime as an embedded library.
|
||||
* `samples/` -Some simple sample programs on uses of the Mono
|
||||
runtime as an embedded library.
|
||||
|
||||
* `scripts/` - Scripts used to invoke Mono and the corresponding program.
|
||||
|
||||
* `sdks/` - A new way of embedding Mono into Xamarin.iOS, Xamarin.Android and other products.
|
||||
|
||||
* `support/` - Various support libraries.
|
||||
|
||||
* `tools/` - A collection of tools, mostly used during Mono development.
|
||||
|
||||
Contributing to Mono
|
||||
====================
|
||||
|
||||
Before submitting changes to Mono, please review the [contribution
|
||||
guidelines](https://www.mono-project.com/community/contributing/).
|
||||
guidelines](http://www.mono-project.com/community/contributing/).
|
||||
Please pay particular attention to the [Important
|
||||
Rules](https://www.mono-project.com/community/contributing/#important-rules)
|
||||
Rules](http://www.mono-project.com/community/contributing/#important-rules)
|
||||
section.
|
||||
|
||||
Reporting bugs
|
||||
==============
|
||||
|
||||
To submit bug reports, please [open an issue on the mono GitHub repo](https://github.com/mono/mono/issues/new).
|
||||
To submit bug reports, please use [Xamarin's
|
||||
Bugzilla](https://bugzilla.xamarin.com/)
|
||||
|
||||
Please use the search facility to ensure the same bug hasn't already
|
||||
been submitted and follow our
|
||||
[guidelines](https://www.mono-project.com/community/bugs/make-a-good-bug-report/)
|
||||
[guidelines](http://www.mono-project.com/community/bugs/make-a-good-bug-report/)
|
||||
on how to make a good bug report.
|
||||
|
||||
Configuration Options
|
||||
@@ -244,12 +208,12 @@ Disables the inclusion of a Boehm garbage collector.
|
||||
|
||||
* This defaults to `included`.
|
||||
|
||||
* `--enable-cooperative-suspend`
|
||||
* `--with-cooperative-gc`
|
||||
|
||||
* If you pass this flag the Mono runtime is configured to only use
|
||||
the cooperative mode of the garbage collector. If you do not pass
|
||||
this flag, then you can control at runtime the use of the
|
||||
cooperative GC mode by setting the `MONO_ENABLE_COOP_SUSPEND` flag.
|
||||
cooperative GC mode by setting the `MONO_ENABLE_COOP` flag.
|
||||
|
||||
* `--with-tls=__thread,pthread`
|
||||
|
||||
@@ -344,6 +308,16 @@ should be used.
|
||||
|
||||
* Or you can specify a path to a libgdiplus.
|
||||
|
||||
* `--disable-shared-memory`
|
||||
|
||||
* Use this option to disable the use of shared memory in
|
||||
Mono (this is equivalent to setting the MONO_DISABLE_SHM
|
||||
environment variable, although this removes the feature
|
||||
completely).
|
||||
|
||||
* Disabling the shared memory support will disable certain
|
||||
features like cross-process named mutexes.
|
||||
|
||||
* `--enable-minimal=LIST`
|
||||
|
||||
* Use this feature to specify optional runtime
|
||||
@@ -435,7 +409,7 @@ for Mono. The LLVM code generator and optimizer will be
|
||||
used instead of Mono's built-in code generator for both
|
||||
Just in Time and Ahead of Time compilations.
|
||||
|
||||
* See https://www.mono-project.com/docs/advanced/mono-llvm/ for the
|
||||
* See http://www.mono-project.com/docs/advanced/mono-llvm/ for the
|
||||
full details and up-to-date information on this feature.
|
||||
|
||||
* You will need to have an LLVM built that Mono can link
|
||||
@@ -504,21 +478,11 @@ also, see the man page.
|
||||
|
||||
* This configures the Mono compiler to generate code
|
||||
suitable to be used by Google's Native Client:
|
||||
https://code.google.com/p/nativeclient/
|
||||
http://code.google.com/p/nativeclient/
|
||||
|
||||
* Currently this is used with Mono's AOT engine as
|
||||
Native Client does not support JIT engines yet.
|
||||
|
||||
* `--enable-wasm`
|
||||
|
||||
* Use this option to configure mono to run on WebAssembly. It will
|
||||
set both host and target to the WebAssembly triplet. This overrides
|
||||
the values passed to `--host` or `--target` and ignored what config.sub guesses.
|
||||
|
||||
This is a workaround to enable usage of old automake versions that don't
|
||||
recognize the wasm triplet.
|
||||
|
||||
|
||||
Working With Submodules
|
||||
=======================
|
||||
|
||||
@@ -578,7 +542,7 @@ file for information about Microsoft's patent grant.
|
||||
Mono Trademark Use Policy
|
||||
=========================
|
||||
|
||||
The use of trademarks and logos for Mono can be found [here](https://www.dotnetfoundation.org/legal/mono-tm).
|
||||
The use of trademarks and logos for Mono can be found [here] (http://www.dotnetfoundation.org/legal/mono-tm).
|
||||
|
||||
Maintaining the Class Library Solution Files
|
||||
============================================
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Reflection;
|
||||
|
||||
namespace System.Runtime.Loader
|
||||
{
|
||||
public static class AssemblyExtensions
|
||||
{
|
||||
public static Type[] GetTypes(this Assembly assembly)
|
||||
{
|
||||
return assembly.GetTypes ();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -5,7 +5,7 @@ CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
|
||||
MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
|
||||
|
||||
CLEANFILES = *.dll *.exe *.mdb
|
||||
EXTRA_DIST=README.md SUBMODULES.json versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
EXTRA_DIST=README.md SUBMODULES.json versions.mk roslyn.mk coreclr.mk ms-test-suite.mk
|
||||
|
||||
CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
|
||||
TOOLS_CLASS=$(mcs_topdir)/class/lib/build
|
||||
@@ -14,7 +14,6 @@ RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug
|
||||
MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll
|
||||
ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
|
||||
XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe
|
||||
|
||||
include versions.mk
|
||||
include profiler-stress.mk
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
[
|
||||
{
|
||||
"name": "roslyn",
|
||||
"url": "git://github.com/mono/roslyn.git",
|
||||
"rev": "7a840bd5697ef6ea41f554a09d837636fba9d88d",
|
||||
"remote-branch": "origin/mono-testing",
|
||||
"branch": "mono-testing",
|
||||
"url": "git://github.com/dotnet/roslyn.git",
|
||||
"rev": "322bd5b2bbf07df6a67de35cbcb2365484412f70",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "roslyn"
|
||||
},
|
||||
{
|
||||
"name": "coreclr",
|
||||
"url": "git://github.com/mono/coreclr.git",
|
||||
"rev": "f3d9c9f742f9dcb5faf40080db5e7f464dab7e7c",
|
||||
"rev": "c7da48acf72c40c0c0ed1a80ebfacea21bb3a271",
|
||||
"remote-branch": "origin/mono",
|
||||
"branch": "mono",
|
||||
"directory": "coreclr"
|
||||
@@ -18,7 +18,7 @@
|
||||
{
|
||||
"name": "ms-test-suite",
|
||||
"url": "[email protected]:xamarin/ms-test-suite.git",
|
||||
"rev": "67f29dfc0741b5311dd746c75760963a2915e648",
|
||||
"rev": "73c155f76b55839f26ba707d6d40091060e4f5d8",
|
||||
"remote-branch": "origin/master",
|
||||
"branch": "master",
|
||||
"directory": "ms-test-suite"
|
||||
@@ -31,4 +31,4 @@
|
||||
"branch": "master",
|
||||
"directory": "benchmarker"
|
||||
}
|
||||
]
|
||||
]
|
||||
+11
-13
@@ -32,7 +32,7 @@ coreclr-runtest-coremanglib: coreclr-validate test-runner.exe $(CORECLR_COREMANG
|
||||
check-coreclr: coreclr-compile-tests coreclr-runtest-basic coreclr-runtest-coremanglib
|
||||
|
||||
coreclr-gcstress: coreclr-validate GCStressTests.exe $(CORECLR_STRESSTESTSI_CS)
|
||||
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/$(if $(CI_PR),testmix_gc_pr.config,testmix_gc.config); if [ $$? -ne 100 ]; then exit 1; fi
|
||||
BVT_ROOT=$(realpath $(CORECLR_PATH)/tests/src/GC/Stress/Tests) $(RUNTIME) GCStressTests.exe $(CORECLR_PATH)/tests/src/GC/Stress/testmix_gc.config; if [ $$? -ne 100 ]; then exit 1; fi
|
||||
|
||||
# Output a variable in $(2) to the file $(1), separated by newline characters
|
||||
# we need to do it in groups of 100 entries to make sure we don't exceed shell char limits
|
||||
@@ -2162,6 +2162,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleepsilon.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleequals1.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleequals2.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doublegethashcode.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleiconvertibletoboolean.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleiconvertibletobyte.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/double/doubleiconvertibletodatetime.cs \
|
||||
@@ -2216,6 +2217,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcgettotalmemory.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gckeepalive.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcmaxgeneration.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcsuppressfinalize.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcwaitforpendingfinalizers.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/globalization/calendarweekrule/calendarweekrulefirstday.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/globalization/calendarweekrule/calendarweekrulefirstfourdayweek.cs \
|
||||
@@ -3241,6 +3243,7 @@ CORECLR_COREMANGLIB_TEST_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/security/securityexception/securityexceptionctor3.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/security/securityexception/securityexceptiontostring.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleepsilon.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singlegethashcode.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleisinfinity.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleisnan.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/single/singleisnegativeinfinity.cs \
|
||||
@@ -3689,8 +3692,9 @@ CORECLR_STRESSTEST_RUNNER_CS_SRC= \
|
||||
$(CORECLR_PATH)/tests/src/GC/Stress/Framework/RFLogging.cs \
|
||||
$(CORECLR_PATH)/tests/src/GC/Stress/Framework/DetourHelpers.cs \
|
||||
$(CORECLR_PATH)/tests/src/GC/Stress/Framework/LoaderClass.cs \
|
||||
GCStressTests/AssemblyLoadContext.cs
|
||||
|
||||
GCStressTests/AssemblyLoadContext.cs \
|
||||
GCStressTests/AssemblyExtensions.cs
|
||||
|
||||
CORECLR_TESTLIBRARY_CS_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/TestFramework.cs \
|
||||
$(CORECLR_PATH)/tests/src/Common/CoreCLRTestLibrary/Utilities.cs \
|
||||
@@ -3712,7 +3716,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/readytorun/main.cs \
|
||||
$(CORECLR_PATH)/tests/src/readytorun/test.cs
|
||||
|
||||
|
||||
# relies on a referenced managed or native assembly, to complicated here:
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/Regressions/assemblyref/assem.cs \
|
||||
@@ -3852,7 +3856,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/datetime/cfdatetimetools.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/datetime/datetimeisdaylightsavingtime.cs
|
||||
|
||||
|
||||
# relies on delegatedefinitions.cs helper
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/multicastdelegate/multicastdelegatector.cs \
|
||||
@@ -3960,7 +3964,7 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/public/testclass.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/tests/bindingtarget.cs \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/system/delegate/threatmodel/tests/testclass.cs
|
||||
|
||||
|
||||
# samples (should probably be removed upstream)
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/hosting/samples/hosting/usercode/usercode.cs \
|
||||
@@ -3978,10 +3982,6 @@ CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/newarr/newarr.cs \
|
||||
$(CORECLR_PATH)/tests/src/baseservices/exceptions/sharedexceptions/emptystacktrace/oomexception01.cs
|
||||
|
||||
# https://github.com/mono/mono/issues/7432
|
||||
CORECLR_DISABLED_TEST_CS_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/gc/gcsuppressfinalize.cs
|
||||
|
||||
CORECLR_TEST_IL_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/JIT/BBT/Scenario4/Not-Int32.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/Convert/implicitConv.il \
|
||||
@@ -4966,6 +4966,7 @@ CORECLR_TEST_IL_SRC = \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/rem.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/conv.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/ddb/118414/118414.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/ddb/127931/127931.il \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/regress/vsw/102974/test.il \
|
||||
@@ -5057,9 +5058,6 @@ CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/Directed/coverage/oldtests/lcliimpl.il
|
||||
|
||||
# We use an r4 for r4-r8 stack merge so it loses precision
|
||||
CORECLR_DISABLED_TEST_IL_SRC += \
|
||||
$(CORECLR_PATH)/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/foo2.il
|
||||
|
||||
# FIXME: these tests are baselined, i.e. we don't have time to investigate
|
||||
# them right now but want to make sure we don't introduce new regressions
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
check-ms-test-suite: $(CLASS)/nunitlite.dll
|
||||
@if $(MAKE) validate-ms-test-suite RESET_VERSIONS=1; then \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/System.Linq.Expressions build MCS="$(MCS) -debug:portable -t:library -warn:1 -r:$(CLASS)/nunitlite.dll" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/conformance run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-conformance.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-systemruntimebringup.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/System.Linq.Expressions run NUNIT-CONSOLE="$(RUNTIME) $(CLASS)/nunit-lite-console.exe -exclude=MonoBug,BadTest -format:nunit2" NUNIT_XML_RESULT="-result:$(abs_top_builddir)/acceptance-tests/TestResult-ms-test-suite-systemlinqexpressions.xml" || EXIT_CODE=1; \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup build MCS="$(MCS) -debug:portable -warn:1" && \
|
||||
$(MAKE) -C $(MSTESTSUITE_PATH)/systemruntimebringup run MONO="$(RUNTIME)" || EXIT_CODE=1; \
|
||||
exit $$EXIT_CODE; \
|
||||
else \
|
||||
echo "*** [ms-test-suite] Getting the repository failed, you probably don't have access to this Xamarin-internal resource. Skipping."; \
|
||||
|
||||
@@ -9,5 +9,5 @@ SYS_REFS = \
|
||||
|
||||
check-profiler-stress:
|
||||
@$(MAKE) validate-benchmarker RESET_VERSIONS=1
|
||||
cd profiler-stress && $(MCS) -debug -define:ARCH_$(arch_target) -target:exe $(addprefix -r:, $(SYS_REFS)) -out:runner.exe @runner.exe.sources
|
||||
cd profiler-stress && $(MCS) -target:exe $(addprefix -r:, $(SYS_REFS)) -out:runner.exe @runner.exe.sources
|
||||
cd profiler-stress && $(RUNTIME) runner.exe
|
||||
@@ -38,134 +38,51 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
public ProcessStartInfo StartInfo { get; set; }
|
||||
public Stopwatch Stopwatch { get; set; } = new Stopwatch ();
|
||||
public int? ExitCode { get; set; }
|
||||
public string StandardOutput { get; set; }
|
||||
public string StandardError { get; set; }
|
||||
public StringBuilder StandardOutput { get; set; } = new StringBuilder ();
|
||||
public StringBuilder StandardError { get; set; } = new StringBuilder ();
|
||||
}
|
||||
|
||||
static class Program {
|
||||
|
||||
static readonly string[] _options = new [] {
|
||||
"exception",
|
||||
"monitor",
|
||||
"gc",
|
||||
"gcalloc",
|
||||
"gcmove",
|
||||
"gcroot",
|
||||
"gchandle",
|
||||
"finalization",
|
||||
"counter",
|
||||
"jit",
|
||||
};
|
||||
|
||||
static readonly TimeSpan _timeout = TimeSpan.FromHours (6);
|
||||
|
||||
const RegexOptions _regexOptions = RegexOptions.Compiled | RegexOptions.Singleline;
|
||||
|
||||
static readonly Dictionary<string, Predicate<Benchmark>> _filters = new Dictionary<string, Predicate<Benchmark>> {
|
||||
{ "ironjs-v8", FilterNotOnArm },
|
||||
{ "msbiology", FilterNever },
|
||||
};
|
||||
|
||||
static bool FilterNever (Benchmark benchmark)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
static bool FilterNotOnArm (Benchmark benchmark)
|
||||
{
|
||||
#if ARCH_arm || ARCH_arm64
|
||||
return false;
|
||||
#else
|
||||
return true;
|
||||
#endif
|
||||
}
|
||||
|
||||
static bool IsSupported (Benchmark benchmark)
|
||||
{
|
||||
return _filters.TryGetValue (benchmark.Name, out var filter) ? filter (benchmark) : true;
|
||||
}
|
||||
|
||||
static string ReplaceInvalidXmlChars (string text) {
|
||||
static string FilterInvalidXmlChars (string text) {
|
||||
return Regex.Replace (text, @"[^\x09\x0A\x0D\x20-\uD7FF\uE000-\uFFFD\u10000-\u10FFFF]", string.Empty);
|
||||
}
|
||||
|
||||
static int Main ()
|
||||
{
|
||||
var regex = new Regex (".*", _regexOptions);
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_REGEX") is string envRegex)
|
||||
regex = new Regex (envRegex, _regexOptions);
|
||||
|
||||
var depDir = Path.Combine ("..", "external", "benchmarker");
|
||||
var benchDir = Path.Combine (depDir, "benchmarks");
|
||||
var testDir = Path.Combine (depDir, "tests");
|
||||
|
||||
var benchmarks = Directory.EnumerateFiles (benchDir, "*.benchmark")
|
||||
.Select (Benchmark.Load)
|
||||
.Where (b => !b.OnlyExplicit && b.ClientCommandLine == null && IsSupported (b) && regex.IsMatch (b.Name))
|
||||
.Where (b => !b.OnlyExplicit && b.ClientCommandLine == null)
|
||||
.OrderBy (b => b.Name)
|
||||
.ToArray ();
|
||||
|
||||
var monoPath = Path.GetFullPath (Path.Combine ("..", "..", "runtime", "mono-wrapper"));
|
||||
var classDir = Path.GetFullPath (Path.Combine ("..", "..", "mcs", "class", "lib", "net_4_x"));
|
||||
|
||||
var seed = Environment.TickCount;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_SEED") is string envSeed)
|
||||
seed = int.Parse (envSeed);
|
||||
|
||||
var timeout = (int) _timeout.TotalMilliseconds;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_TIMEOUT") is string envTimeout)
|
||||
timeout = (int) TimeSpan.Parse (envTimeout).TotalMilliseconds;
|
||||
|
||||
string options = null;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_OPTIONS") is string envOptions)
|
||||
options = envOptions;
|
||||
|
||||
var suspend = false;
|
||||
|
||||
if (Environment.GetEnvironmentVariable ("MONO_PROFILER_STRESS_SUSPEND") is string envSuspend)
|
||||
suspend = bool.Parse (envSuspend);
|
||||
|
||||
var rand = new Random (seed);
|
||||
var rand = new Random ();
|
||||
var cpus = Environment.ProcessorCount;
|
||||
|
||||
var sw = Stopwatch.StartNew ();
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Magenta;
|
||||
Console.WriteLine ($"[{sw.Elapsed.ToString ("G")}] Starting test session with seed: {seed}");
|
||||
Console.ResetColor ();
|
||||
|
||||
var results = new List<TestResult> (benchmarks.Length);
|
||||
|
||||
var sw = Stopwatch.StartNew ();
|
||||
|
||||
for (var i = 0; i < benchmarks.Length; i++) {
|
||||
var bench = benchmarks [i];
|
||||
|
||||
var sampleFreq = rand.Next (-1000, 1001);
|
||||
var sampleMode = rand.Next (0, 2) == 1 ? "-real" : string.Empty;
|
||||
var sampleFreq = rand.Next (0, 1001);
|
||||
var sampleMode = rand.Next (0, 2) == 1 ? "real" : "process";
|
||||
var maxSamples = rand.Next (0, cpus * 2000 + 1);
|
||||
var heapShotFreq = rand.Next (-10, 11);
|
||||
var heapShotFreq = rand.Next (0, 11);
|
||||
var maxFrames = rand.Next (0, 33);
|
||||
var flags = _options.ToDictionary (x => x, _ => rand.Next (0, 2) == 1)
|
||||
.Select (x => (x.Value ? string.Empty : "no") + x.Key)
|
||||
.ToArray ();
|
||||
var allocMode = rand.Next (0, 2) == 1 ? "alloc" : "noalloc";
|
||||
|
||||
var profOptions = "nodefaults,output=/dev/null,";
|
||||
|
||||
if (options == null) {
|
||||
profOptions += $"maxframes={maxFrames},";
|
||||
|
||||
if (sampleFreq > 0)
|
||||
profOptions += $"sample{sampleMode}={sampleFreq},maxsamples={maxSamples},";
|
||||
|
||||
if (heapShotFreq > 0)
|
||||
profOptions += $"heapshot={heapShotFreq}gc,";
|
||||
|
||||
profOptions += string.Join (",", flags);
|
||||
} else
|
||||
profOptions += options;
|
||||
var profOptions = $"sample=cycles/{sampleFreq},sampling-{sampleMode},maxsamples={maxSamples},heapshot={heapShotFreq}gc,maxframes={maxFrames},{allocMode},output=/dev/null";
|
||||
|
||||
var info = new ProcessStartInfo {
|
||||
UseShellExecute = false,
|
||||
@@ -179,9 +96,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
info.EnvironmentVariables.Clear ();
|
||||
info.EnvironmentVariables.Add ("MONO_PATH", classDir);
|
||||
|
||||
if (suspend)
|
||||
info.EnvironmentVariables.Add ("MONO_DEBUG", "suspend-on-native-crash,suspend-on-unhandled");
|
||||
|
||||
var progress = $"({i + 1}/{benchmarks.Length})";
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Blue;
|
||||
@@ -196,19 +110,14 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
using (var proc = new Process ()) {
|
||||
proc.StartInfo = info;
|
||||
|
||||
var stdout = new StringBuilder ();
|
||||
var stderr = new StringBuilder ();
|
||||
|
||||
proc.OutputDataReceived += (sender, args) => {
|
||||
if (args.Data != null)
|
||||
lock (result)
|
||||
stdout.AppendLine (args.Data);
|
||||
result.StandardOutput.AppendLine (args.Data);
|
||||
};
|
||||
|
||||
proc.ErrorDataReceived += (sender, args) => {
|
||||
if (args.Data != null)
|
||||
lock (result)
|
||||
stderr.AppendLine (args.Data);
|
||||
result.StandardError.AppendLine (args.Data);
|
||||
};
|
||||
|
||||
result.Stopwatch.Start ();
|
||||
@@ -218,7 +127,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
proc.BeginOutputReadLine ();
|
||||
proc.BeginErrorReadLine ();
|
||||
|
||||
if (!proc.WaitForExit (timeout)) {
|
||||
if (!proc.WaitForExit ((int) _timeout.TotalMilliseconds)) {
|
||||
// Force a thread dump.
|
||||
Syscall.kill (proc.Id, Signum.SIGQUIT);
|
||||
Thread.Sleep (1000);
|
||||
@@ -231,11 +140,6 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
result.ExitCode = proc.ExitCode;
|
||||
|
||||
result.Stopwatch.Stop ();
|
||||
|
||||
lock (result) {
|
||||
result.StandardOutput = stdout.ToString ();
|
||||
result.StandardError = stderr.ToString ();
|
||||
}
|
||||
}
|
||||
|
||||
var resultStr = result.ExitCode == null ? "timed out" : $"exited with code: {result.ExitCode}";
|
||||
@@ -249,13 +153,13 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
Console.WriteLine ("===== stdout =====");
|
||||
Console.ResetColor ();
|
||||
|
||||
Console.WriteLine (result.StandardOutput);
|
||||
Console.WriteLine (result.StandardOutput.ToString ());
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Red;
|
||||
Console.WriteLine ("===== stderr =====");
|
||||
Console.ResetColor ();
|
||||
|
||||
Console.WriteLine (result.StandardError);
|
||||
Console.WriteLine (result.StandardError.ToString ());
|
||||
}
|
||||
|
||||
results.Add (result);
|
||||
@@ -274,7 +178,7 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
|
||||
using (var writer = XmlWriter.Create ("TestResult-profiler-stress.xml", settings)) {
|
||||
writer.WriteStartDocument ();
|
||||
writer.WriteComment ($"This file represents the results of running a test suite (seed: {seed})");
|
||||
writer.WriteComment ("This file represents the results of running a test suite");
|
||||
|
||||
writer.WriteStartElement ("test-results");
|
||||
writer.WriteAttributeString ("name", "profiler-stress-tests.dummy");
|
||||
@@ -335,11 +239,11 @@ namespace Mono.Profiling.Tests.Stress {
|
||||
writer.WriteStartElement ("failure");
|
||||
|
||||
writer.WriteStartElement ("message");
|
||||
writer.WriteCData (ReplaceInvalidXmlChars (result.StandardOutput));
|
||||
writer.WriteCData (FilterInvalidXmlChars (result.StandardOutput.ToString ()));
|
||||
writer.WriteEndElement ();
|
||||
|
||||
writer.WriteStartElement ("stack-trace");
|
||||
writer.WriteCData (ReplaceInvalidXmlChars (result.StandardError));
|
||||
writer.WriteCData (FilterInvalidXmlChars (result.StandardError.ToString ()));
|
||||
writer.WriteEndElement ();
|
||||
|
||||
writer.WriteEndElement ();
|
||||
|
||||
@@ -1,5 +1,18 @@
|
||||
check-roslyn:
|
||||
@$(MAKE) validate-roslyn RESET_VERSIONS=1
|
||||
@if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
|
||||
sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
|
||||
export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
|
||||
MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
|
||||
if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v4.6" ]; then \
|
||||
mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \
|
||||
curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \
|
||||
unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \
|
||||
cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \
|
||||
fi; \
|
||||
cd $(ROSLYN_PATH); \
|
||||
./build.sh --restore --build --test --mono || exit; \
|
||||
echo "done"
|
||||
sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
|
||||
sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
|
||||
./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \
|
||||
sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
|
||||
exit $$EXIT_CODE
|
||||
+9
-5
@@ -89,11 +89,9 @@ if test x$NOCONFIGURE = x && test -z "$*"; then
|
||||
echo
|
||||
fi
|
||||
|
||||
am_opt="--add-missing --copy --gnu -Wno-portability -Wno-obsolete"
|
||||
|
||||
case $CC in
|
||||
xlc )
|
||||
am_opt="$am_opt --include-deps";;
|
||||
am_opt=--include-deps;;
|
||||
esac
|
||||
|
||||
|
||||
@@ -144,8 +142,8 @@ if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
echo "Running automake $am_opt ..."
|
||||
automake $am_opt ||
|
||||
echo "Running automake --gnu $am_opt ..."
|
||||
automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
|
||||
{ echo "**Error**: automake failed."; exit 1; }
|
||||
echo "Running autoconf ..."
|
||||
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
|
||||
@@ -156,6 +154,12 @@ if test -d $srcdir/libgc; then
|
||||
echo Done running libgc/autogen.sh ...
|
||||
fi
|
||||
|
||||
if test -d $srcdir/eglib; then
|
||||
echo Running eglib/autogen.sh ...
|
||||
(cd $srcdir/eglib ; NOCONFIGURE=1 ./autogen.sh "$@")
|
||||
echo Done running eglib/autogen.sh ...
|
||||
fi
|
||||
|
||||
if test x$MONO_EXTRA_CONFIGURE_FLAGS != x; then
|
||||
echo "MONO_EXTRA_CONFIGURE_FLAGS is $MONO_EXTRA_CONFIGURE_FLAGS"
|
||||
fi
|
||||
|
||||
+617
-1893
File diff suppressed because it is too large.
Load diff
+1
-3
@@ -11,10 +11,8 @@
|
||||
<dllmap dll="oci" target="libclntsh@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="db2cli" target="libdb2_36@libsuffix@" os="!windows"/>
|
||||
<dllmap dll="MonoPosixHelper" target="$mono_libdir/libMonoPosixHelper@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Net.Security.Native" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Security.Cryptography.Native.Apple" target="$mono_libdir/@MONO_NATIVE_LIBRARY_NAME@@libsuffix@" os="osx" />
|
||||
<dllmap dll="libmono-btls-shared" target="$mono_libdir/libmono-btls-shared@libsuffix@" os="!windows" />
|
||||
<dllmap dll="System.Native" target="$mono_libdir/System.Native@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"/>
|
||||
|
||||
+12
-12
@@ -53,7 +53,7 @@ def stringify_class_name(ns, name):
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "{0}.{1}".format (ns, name)
|
||||
return "{}.{}".format (ns, name)
|
||||
|
||||
class ArrayPrinter:
|
||||
"Print a C# array"
|
||||
@@ -66,7 +66,7 @@ class ArrayPrinter:
|
||||
def to_string(self):
|
||||
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
|
||||
length = obj ['max_length']
|
||||
return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
|
||||
return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
|
||||
|
||||
class ObjectPrinter:
|
||||
"Print a C# object"
|
||||
@@ -96,7 +96,7 @@ class ObjectPrinter:
|
||||
return (field.name, self.obj [field.name])
|
||||
except:
|
||||
# Superclass
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
|
||||
|
||||
def children(self):
|
||||
# FIXME: It would be easier if gdb.Value would support iteration itself
|
||||
@@ -109,7 +109,7 @@ class ObjectPrinter:
|
||||
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
|
||||
if class_name [-2:len(class_name)] == "[]":
|
||||
return {}.__iter__ ()
|
||||
gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
|
||||
return self._iterator(obj.cast (gdb_type))
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
@@ -129,12 +129,12 @@ class ObjectPrinter:
|
||||
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
|
||||
if class_ns != "":
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
|
||||
except:
|
||||
# Maybe there is no debug info for that type
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
#return obj.cast (gdb_type)
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
return class_name
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
@@ -154,9 +154,9 @@ class MonoMethodPrinter:
|
||||
val = self.val.dereference ()
|
||||
klass = val ["klass"].dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
|
||||
return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
|
||||
class MonoClassPrinter:
|
||||
"Print a MonoClass structure"
|
||||
@@ -169,9 +169,9 @@ class MonoClassPrinter:
|
||||
return "0x0"
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"{0}\"".format (class_name)
|
||||
return "\"{}\"".format (class_name)
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
|
||||
def lookup_pretty_printer(val):
|
||||
t = str (val.type)
|
||||
@@ -245,4 +245,4 @@ exec_file = gdb.current_objfile ().filename
|
||||
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
|
||||
exec_file = os.readlink (exec_file)
|
||||
exec_dir = os.path.dirname (exec_file)
|
||||
gdb.execute ("source {0}/{1}-gdbinit".format (exec_dir, os.path.basename (exec_file)))
|
||||
gdb.execute ("source {}/{}-gdbinit".format (exec_dir, os.path.basename (exec_file)))
|
||||
+16
-16
@@ -48,7 +48,7 @@ def stringify_class_name(ns, name):
|
||||
if ns == "":
|
||||
return name
|
||||
else:
|
||||
return "{0}.{1}".format (ns, name)
|
||||
return "{}.{}".format (ns, name)
|
||||
|
||||
class ArrayPrinter:
|
||||
"Print a C# array"
|
||||
@@ -61,7 +61,7 @@ class ArrayPrinter:
|
||||
def to_string(self):
|
||||
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
|
||||
length = obj ['max_length']
|
||||
return "{0} [{1}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
return "{} [{}]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
|
||||
|
||||
class ObjectPrinter:
|
||||
"Print a C# object"
|
||||
@@ -91,7 +91,7 @@ class ObjectPrinter:
|
||||
return (field.name, self.obj [field.name])
|
||||
except:
|
||||
# Superclass
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{0}".format (field.name))))
|
||||
return (field.name, self.obj.cast (gdb.lookup_type ("{}".format (field.name))))
|
||||
|
||||
def children(self):
|
||||
# FIXME: It would be easier if gdb.Value would support iteration itself
|
||||
@@ -105,7 +105,7 @@ class ObjectPrinter:
|
||||
if class_name [-2:len(class_name)] == "[]":
|
||||
return {}.__iter__ ()
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct {0}_{1}".format (class_ns.replace (".", "_"), class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}_{}".format (class_ns.replace (".", "_"), class_name))
|
||||
return self._iterator(obj.cast (gdb_type))
|
||||
except:
|
||||
return {}.__iter__ ()
|
||||
@@ -127,12 +127,12 @@ class ObjectPrinter:
|
||||
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
|
||||
if class_ns != "":
|
||||
try:
|
||||
gdb_type = gdb.lookup_type ("struct {0}.{1}".format (class_ns, class_name))
|
||||
gdb_type = gdb.lookup_type ("struct {}.{}".format (class_ns, class_name))
|
||||
except:
|
||||
# Maybe there is no debug info for that type
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
#return obj.cast (gdb_type)
|
||||
return "{0}.{1}".format (class_ns, class_name)
|
||||
return "{}.{}".format (class_ns, class_name)
|
||||
return class_name
|
||||
except:
|
||||
print (sys.exc_info ()[0])
|
||||
@@ -152,9 +152,9 @@ class MonoMethodPrinter:
|
||||
val = self.val.dereference ()
|
||||
klass = val ["klass"].dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
return "\"{0}:{1} ()\"".format (class_name, val ["name"].string ())
|
||||
return "\"{}:{} ()\"".format (class_name, val ["name"].string ())
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_method_full_name ({0}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_method_full_name ({}, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
|
||||
|
||||
class MonoClassPrinter:
|
||||
"Print a MonoClass structure"
|
||||
@@ -168,11 +168,11 @@ class MonoClassPrinter:
|
||||
klass = self.val.dereference ()
|
||||
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
|
||||
if add_quotes:
|
||||
return "\"{0}\"".format (class_name)
|
||||
return "\"{}\"".format (class_name)
|
||||
else:
|
||||
return class_name
|
||||
# This returns more info but requires calling into the inferior
|
||||
#return "\"{0}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){0})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
#return "\"{}\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*){})->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
|
||||
|
||||
def to_string(self):
|
||||
try:
|
||||
@@ -220,7 +220,7 @@ class MonoGenericClassPrinter:
|
||||
method_inst_str = ""
|
||||
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
|
||||
method_inst_str = str(method_inst)
|
||||
return "{0}, [{1}], [{2}]>".format (container_str, class_inst_str, method_inst_str)
|
||||
return "{}, [{}], [{}]>".format (container_str, class_inst_str, method_inst_str)
|
||||
|
||||
def to_string(self):
|
||||
try:
|
||||
@@ -250,9 +250,9 @@ class MonoTypePrinter:
|
||||
info = str(t ["data"]["generic_class"])
|
||||
|
||||
if info != "":
|
||||
return "{{{0}, {1}}}".format (kind, info)
|
||||
return "{{{}, {}}}".format (kind, info)
|
||||
else:
|
||||
return "{{{0}}}".format (kind)
|
||||
return "{{{}}}".format (kind)
|
||||
except:
|
||||
#print (sys.exc_info ()[0])
|
||||
#print (sys.exc_info ()[1])
|
||||
@@ -281,7 +281,7 @@ class MonoMethodRgctxPrinter:
|
||||
if i > 0:
|
||||
inst_str = inst_str + ", "
|
||||
inst_str = inst_str + type_printer.to_string ()
|
||||
return "MRGCTX[{0}, [{1}]]".format (klass_printer.to_string(), inst_str)
|
||||
return "MRGCTX[{}, [{}]]".format (klass_printer.to_string(), inst_str)
|
||||
|
||||
class MonoVTablePrinter:
|
||||
"Print a MonoVTable structure"
|
||||
@@ -296,7 +296,7 @@ class MonoVTablePrinter:
|
||||
klass = vtable ["klass"]
|
||||
klass_printer = MonoClassPrinter (klass)
|
||||
|
||||
return "vtable({0})".format (klass_printer.to_string ())
|
||||
return "vtable({})".format (klass_printer.to_string ())
|
||||
|
||||
def lookup_pretty_printer(val):
|
||||
t = str (val.type)
|
||||
|
||||
+2
-2
@@ -11,9 +11,9 @@ def print_frames(thread, num_frames, current_thread):
|
||||
pc = str(frame.addr)
|
||||
var = frame
|
||||
function_name = frame.GetFunctionName()
|
||||
if function_name == "interp_exec_method_full":
|
||||
if function_name == "ves_exec_method_with_context":
|
||||
try:
|
||||
s = 'frame->imethod->method'
|
||||
s = 'frame->runtime_method->method'
|
||||
klassname = frame.EvaluateExpression('(char*) ' + s + '->klass->name').summary[1:-1]
|
||||
methodname = frame.EvaluateExpression('(char*) ' + s + '->name').summary[1:-1]
|
||||
|
||||
|
||||
@@ -116,7 +116,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
</system.net>
|
||||
|
||||
|
||||
@@ -132,7 +132,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
<settings>
|
||||
<ipv6 enabled="false"/>
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
</system.net>
|
||||
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
<section name="assemblyBinding" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="satelliteassemblies" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="startup" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
|
||||
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.data" type="System.Data.Common.DbProviderFactoriesConfigurationHandler, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.diagnostics" type="System.Diagnostics.SystemDiagnosticsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="system.codedom" type="System.CodeDom.Compiler.CodeDomConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
|
||||
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
|
||||
<sectionGroup name="system.runtime.serialization" type="System.Runtime.Serialization.Configuration.SerializationSectionGroup, System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
@@ -136,7 +136,7 @@
|
||||
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpWebRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<add prefix="ftp" type="System.Net.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
</webRequestModules>
|
||||
</system.net>
|
||||
|
||||
|
||||
@@ -43,16 +43,6 @@
|
||||
line-height: 0px;
|
||||
}
|
||||
|
||||
.mapi-codeblock {
|
||||
display: block;
|
||||
padding: 5pt 5pt;
|
||||
margin: 10pt;
|
||||
white-space: pre;
|
||||
font-family: monospace;
|
||||
border: 1px solid rgba(233,233,233,1);
|
||||
background-color: rgba(249,249,249,1);
|
||||
}
|
||||
|
||||
.mapi-entry code {
|
||||
border: none;
|
||||
background-color: transparent;
|
||||
|
||||
+2
-2
@@ -13,10 +13,10 @@ ASSEMBLED_DOCS = \
|
||||
monoapi.tree monoapi.zip
|
||||
|
||||
convert.exe: $(srcdir)/convert.cs AgilityPack.dll
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -out:$@ $< -r:AgilityPack.dll
|
||||
|
||||
AgilityPack.dll:
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/mscorlib.dll -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
$(CSCOMPILE) -r:$(topdir)/class/lib/$(PROFILE)/System.dll -r:$(topdir)/class/lib/$(PROFILE)/System.Xml.dll -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
|
||||
|
||||
monoapi.zip: monoapi.tree
|
||||
@test -f $@ || { rm -f $< && $(MAKE) $<; }
|
||||
|
||||
+1
-1
@@ -69,5 +69,5 @@ object for filters is passed in a local variable (cfg->exvar).
|
||||
throw: we first save all regs into a sigcontext struct and then call the stack
|
||||
unwinding code.
|
||||
|
||||
catch handler: catch handlers are always called from the stack unwinding
|
||||
catch handler: catch hanlders are always called from the stack unwinding
|
||||
code. The exception object is passed in a local variable (cfg->exvar).
|
||||
+4
-20
@@ -124,7 +124,6 @@ sub process_function {
|
||||
my $body = '';
|
||||
my $returns = '';
|
||||
my $prototype = '';
|
||||
my $codeblock = 'false';
|
||||
|
||||
while (<$file>) {
|
||||
|
||||
@@ -157,6 +156,7 @@ sub process_function {
|
||||
if (defined($deprecated)) {
|
||||
process_formatting(\$deprecated, $file_path, $.);
|
||||
}
|
||||
$body =~ s/\n/ /g;
|
||||
|
||||
if (exists($docs->{body}->{$name})) {
|
||||
my $origin = $docs->{origin}->{$name};
|
||||
@@ -180,16 +180,8 @@ sub process_function {
|
||||
chomp;
|
||||
s/^ +\*//;
|
||||
|
||||
if (/\s*\\code$/) {
|
||||
$codeblock = 'true';
|
||||
} elsif (/\s*\\endcode$/) {
|
||||
$codeblock = 'false';
|
||||
}
|
||||
|
||||
# Replace blank lines with paragraph breaks if we're not in a code block.
|
||||
if (/^\s*$/) {
|
||||
$_ = '<p>' if $codeblock eq 'false';
|
||||
}
|
||||
# Replace blank lines with paragraph breaks.
|
||||
$_ = '<p>' if /^\s*$/;
|
||||
|
||||
if ($section == $PARAMETER_SECTION) {
|
||||
if (/\s*\\param +(\w+)(.*)/) {
|
||||
@@ -218,7 +210,7 @@ sub process_function {
|
||||
$returns = "\t$_\n";
|
||||
$section = $RETURN_SECTION;
|
||||
} else {
|
||||
$body .= "\n$_";
|
||||
$body .= "\n\t$_";
|
||||
}
|
||||
} elsif ($section == $RETURN_SECTION) {
|
||||
$returns .= "\n\t$_";
|
||||
@@ -235,12 +227,6 @@ sub process_formatting {
|
||||
my ($content, $file_path, $current_line) = @_;
|
||||
$_ = $$content;
|
||||
|
||||
# General formatting
|
||||
s{\\b +(\w+)}{<strong>$1</strong>}g;
|
||||
s{\\a +(\w+)}{<i>$1</i>}g;
|
||||
s{\\e +(\w+)}{<i>$1</i>}g;
|
||||
s{\\em +(\w+)}{<i>$1</i>}g;
|
||||
|
||||
# Constants
|
||||
s{NULL}{<code>NULL</code>}g;
|
||||
s{TRUE}{<code>TRUE</code>}g;
|
||||
@@ -257,8 +243,6 @@ sub process_formatting {
|
||||
warn "$file_path:$current_line: Old-style monodoc notation '`code`' used\n"
|
||||
if s{\`((?!api:)[:.\w\*]+)\`}{<code>$1</code>}g && $WARNINGS;
|
||||
s{\\c +(\S+(?<![.,:;]))}{<code>$1</code>}g;
|
||||
s{\\code}{<pre><code class="mapi-codeblock">}g;
|
||||
s{\\endcode}{</code></pre>}g;
|
||||
|
||||
$$content = $_;
|
||||
}
|
||||
|
||||
@@ -37,6 +37,7 @@
|
||||
<manpage name="mono-xmltool(1)" page="../man/mono-xmltool.1" />
|
||||
<manpage name="mozroots(1)" page="../man/mozroots.1" />
|
||||
<manpage name="permview(1)" page="../man/permview.1" />
|
||||
<manpage name="prj2make(1)" page="../man/prj2make.1" />
|
||||
<manpage name="resgen(1)" page="../man/resgen.1" />
|
||||
<manpage name="secutil(1)" page="../man/secutil.1" />
|
||||
<manpage name="setreg(1)" page="../man/setreg.1" />
|
||||
|
||||
@@ -1,193 +1,73 @@
|
||||
<h1>Runtime Profiler API</h1>
|
||||
<h1>Profiling Interface</h1>
|
||||
|
||||
<p>The profiler API can be used by dynamically loaded profiler
|
||||
modules to monitor different aspects of a running program. The
|
||||
API is also usable by embedders without having to compile a
|
||||
profiler module.
|
||||
<h3>Profiler Operation</h3>
|
||||
|
||||
<h2>Profiler Modules</h2>
|
||||
<p>The following methods can be used by dynamic profiler
|
||||
methods to monitor different aspects of the program.
|
||||
|
||||
<p>A profiler module is simply a shared library with a single
|
||||
exported function which is the entry point that Mono calls at
|
||||
startup. It must have the following signature:
|
||||
<p>A custom profiler will have one public method defined in
|
||||
the shared library which is the entry point that Mono calls at
|
||||
startup, it has the following signature:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
void mono_profiler_startup_example (const char *desc)
|
||||
</code></pre>
|
||||
<pre>
|
||||
void mono_profiler_startup (const char *desc)
|
||||
</pre>
|
||||
|
||||
<p>Here, the <code>example</code> portion of the function name is
|
||||
the name of the profiler module. It must match the shared library
|
||||
name (i.e. <code>libmono-profiler-example.so</code>). <i>desc</i>
|
||||
is the set of arguments that were passed from the command line.
|
||||
<p>Where "desc" is the set of arguments that were passed from
|
||||
the command line. This routine will call
|
||||
<tt>mono_profiler_install</tt> to activate the profiler and
|
||||
will install one or more filters (one of the various
|
||||
<tt>mono_profiler_install_</tt> functions).
|
||||
|
||||
<p>For example, a bare bones profiler module might look like this
|
||||
(<code>example.c</code>):
|
||||
<p>In addition, a profiler developer will typically call
|
||||
<tt>mono_profiler_set_events</tt> to register which kinds of
|
||||
traces should be enabled, these can be an OR-ed combination of
|
||||
the following:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
#include <mono/metadata/profiler.h>
|
||||
#include <stdio.h>
|
||||
<pre>
|
||||
MONO_PROFILE_NONE
|
||||
MONO_PROFILE_APPDOMAIN_EVENTS
|
||||
MONO_PROFILE_ASSEMBLY_EVENTS
|
||||
MONO_PROFILE_MODULE_EVENTS
|
||||
MONO_PROFILE_CLASS_EVENTS
|
||||
MONO_PROFILE_JIT_COMPILATION
|
||||
MONO_PROFILE_INLINING
|
||||
MONO_PROFILE_EXCEPTIONS
|
||||
MONO_PROFILE_ALLOCATIONS
|
||||
MONO_PROFILE_GC
|
||||
MONO_PROFILE_THREADS
|
||||
MONO_PROFILE_REMOTING
|
||||
MONO_PROFILE_TRANSITIONS
|
||||
MONO_PROFILE_ENTER_LEAVE
|
||||
MONO_PROFILE_COVERAGE
|
||||
MONO_PROFILE_INS_COVERAGE
|
||||
MONO_PROFILE_STATISTICAL
|
||||
</pre>
|
||||
|
||||
struct _MonoProfiler {
|
||||
int dummy;
|
||||
}
|
||||
<p>Developers can change the set of monitored events at
|
||||
runtime by calling <tt>mono_profiler_set_events</tt>.
|
||||
|
||||
<h4><a name="api:mono_profiler_install">mono_profiler_install</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_allocation">mono_profiler_install_allocation</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_appdomain">mono_profiler_install_appdomain</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_assembly">mono_profiler_install_assembly</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_class">mono_profiler_install_class</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_coverage_filter">mono_profiler_install_coverage_filter</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_enter_leave">mono_profiler_install_enter_leave</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_jit_compile">mono_profiler_install_jit_compile</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_module">mono_profiler_install_module</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_thread">mono_profiler_install_thread</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_transition">mono_profiler_install_transition</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_gc">mono_profiler_install_gc</a></h4>
|
||||
<h4><a name="api:mono_profiler_install_statistical">mono_profiler_install_statistical</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_events">mono_profiler_set_events</a></h4>
|
||||
<h4><a name="api:mono_profiler_get_events">mono_profiler_get_events</a></h4>
|
||||
|
||||
static MonoProfiler profiler;
|
||||
<h3>Coverage</h3>
|
||||
|
||||
static void
|
||||
runtime_inited (MonoProfiler *prof)
|
||||
{
|
||||
printf ("Hello World");
|
||||
}
|
||||
<p>To support profiling modules that need to do code coverage
|
||||
analysis, the following routines is provided:
|
||||
|
||||
<h4><a name="api:mono_profiler_coverage_get">mono_profiler_coverage_get</a></h4>
|
||||
|
||||
void
|
||||
mono_profiler_init_example (const char *desc)
|
||||
{
|
||||
MonoProfilerHandle handle = mono_profiler_create (&profiler);
|
||||
mono_profiler_set_runtime_initialized_callback (handle, runtime_inited);
|
||||
}
|
||||
</code></pre>
|
||||
|
||||
<p>To compile this module, a C compiler must be invoked in a
|
||||
similar fashion to this, on Linux:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
gcc -fPIC -shared -o libmono-profiler-example.so example.c `pkg-config --cflags mono-2`
|
||||
</code></pre>
|
||||
|
||||
<p>Or on OS X:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
gcc -undefined suppress -flat_namespace -o libmono-profiler-example.so example.c `pkg-config --cflags mono-2`
|
||||
</code></pre>
|
||||
|
||||
<p>You can then load the module using:
|
||||
|
||||
<pre><code class="mapi-codeblock">
|
||||
mono --profile=example hello.exe
|
||||
</code></pre>
|
||||
|
||||
<p>(Note that adjusting <code>LD_LIBRARY_PATH</code> may be
|
||||
necessary in order for the dynamic linker to find the module.)
|
||||
|
||||
<h2>Profiler Functions</h2>
|
||||
|
||||
<p>These are the functions usable for profiling programs.
|
||||
|
||||
<p>Each function has a note indicating whether they're async
|
||||
safe. An async safe function can be invoked in a signal handler
|
||||
or when the world is stopped by the GC. Conversely, a function
|
||||
that is not async safe must not be invoked in such a context or
|
||||
undefined behavior can occur (crashes, deadlocks, etc).
|
||||
|
||||
<p>Some functions may only be invoked from a profiler module's
|
||||
init function (or prior to running managed code in the case of
|
||||
embedding). This is noted explicitly only if applicable to a
|
||||
function.
|
||||
|
||||
<h3>Basic Functions</h3>
|
||||
|
||||
<p>These functions are used to load and install profilers.
|
||||
|
||||
<h4><a name="api:mono_profiler_load">mono_profiler_load</a></h4>
|
||||
<h4><a name="api:mono_profiler_create">mono_profiler_create</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_cleanup_callback">mono_profiler_set_cleanup_callback</a></h4>
|
||||
|
||||
<h3>Code Coverage</h3>
|
||||
|
||||
<p>These functions provide access to the JIT compiler's code
|
||||
coverage support. This functionality can be used to collect
|
||||
information about how many times certain code paths have been
|
||||
executed.
|
||||
|
||||
<h4><a name="api:mono_profiler_enable_coverage">mono_profiler_enable_coverage</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_coverage_filter_callback">mono_profiler_set_coverage_filter_callback</a></h4>
|
||||
<h4><a name="api:mono_profiler_get_coverage_data">mono_profiler_get_coverage_data</a></h4>
|
||||
|
||||
<h3>Statistical Sampling</h3>
|
||||
|
||||
<p>Statistical sampling can be used to interrupt managed threads
|
||||
based on a certain mode and frequency for the purpose of
|
||||
collecting data about their current work.
|
||||
|
||||
<p>One common use case for this functionality, usually referred
|
||||
to as call sampling, is to collect a backtrace from every thread
|
||||
when a sampling hit event arrives. This data can then be compiled
|
||||
into a report indicating where a program spends most of its time.
|
||||
|
||||
<h4><a name="api:mono_profiler_enable_sampling">mono_profiler_enable_sampling</a></h4>
|
||||
<h4><a name="api:mono_profiler_set_sample_mode">mono_profiler_set_sample_mode</a></h4>
|
||||
<h4><a name="api:mono_profiler_get_sample_mode">mono_profiler_get_sample_mode</a></h4>
|
||||
|
||||
<p>A callback must be registered to receive sample hit events.
|
||||
Please see the <i>Callback Registration</i> section below.
|
||||
|
||||
<h3>GC Allocations</h3>
|
||||
|
||||
<p>Profilers can be notified about all GC allocations performed
|
||||
by a program or the Mono runtime.
|
||||
|
||||
<h4><a name="api:mono_profiler_enable_allocations">mono_profiler_enable_allocations</a></h4>
|
||||
|
||||
<p>A callback must be registered to receive allocation events.
|
||||
Please see the <i>Callback Registration</i> section below.
|
||||
|
||||
<h3>Call Instrumentation</h3>
|
||||
|
||||
<p>The JIT compiler supports instrumenting managed method entry
|
||||
and exit points so that a profiler callback will be invoked.
|
||||
|
||||
<p>While such callbacks by themselves have traditionally only
|
||||
been useful for call count profiling and the like, Mono gives
|
||||
these callbacks access to the arguments, locals, and return
|
||||
value of instrumented methods (together referred to as the 'call
|
||||
context'). This enables many profiling scenarios that would
|
||||
otherwise have required explicit hooks in the base class
|
||||
libraries.
|
||||
|
||||
<h4><a name="api:mono_profiler_set_call_instrumentation_filter_callback">mono_profiler_set_call_instrumentation_filter_callback</a></h4>
|
||||
<h4><a name="api:mono_profiler_enable_call_context_introspection">mono_profiler_enable_call_context_introspection</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_this">mono_profiler_call_context_get_this</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_argument">mono_profiler_call_context_get_argument</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_local">mono_profiler_call_context_get_local</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_get_result">mono_profiler_call_context_get_result</a></h4>
|
||||
<h4><a name="api:mono_profiler_call_context_free_buffer">mono_profiler_call_context_free_buffer</a></h4>
|
||||
|
||||
<p>Callbacks must be registered to receive method entry and exit
|
||||
events. Please see the <i>Callback Registration</i> section
|
||||
below.
|
||||
|
||||
<h3>Callback Registration</h3>
|
||||
|
||||
<p>In addition to the above functions, there's a large set of
|
||||
functions for installing generic profiler event callbacks. These
|
||||
are generated from C macros and so are not documented here.
|
||||
Please refer to the <code>mono/metadata/profiler.h</code> and
|
||||
<code>mono/metadata/profiler-events.h</code> headers for a full
|
||||
listing of these.
|
||||
|
||||
<p>Callback registration functions are all async safe and can be
|
||||
safely invoked from multiple threads at the same time, with the
|
||||
caveat that altering a registered callback from one thread will
|
||||
not immediately affect another thread that is already invoking
|
||||
the current callback.
|
||||
|
||||
<h2>API Stability</h2>
|
||||
|
||||
<p>The profiler API does not have the same API stability
|
||||
garantees that the rest of the Mono embedding API does. While
|
||||
a breaking change to the profiler API is extremely rare, it has
|
||||
happened in the past when changing the API in a backwards
|
||||
compatible way was deemed to be too much work for too little
|
||||
gain.
|
||||
|
||||
<p>Therefore, developers of profiler modules may rarely need to
|
||||
update their code to work with new versions of the profiler API.
|
||||
|
||||
<p>Developers who wish to support older versions of the API can
|
||||
perform a compile time check of the
|
||||
<code>MONO_PROFILER_API_VERSION</code> macro and maintain code
|
||||
for both old and new versions.
|
||||
|
||||
<p>To aid with transitioning to a new version of the profiler
|
||||
API, the Mono runtime will detect and reject loading profiler
|
||||
modules which were compiled against older profiler API versions.
|
||||
@@ -0,0 +1,22 @@
|
||||
/
|
||||
/depcomp
|
||||
/config.guess
|
||||
/config.sub
|
||||
/ltmain.sh
|
||||
/eglib-*.tar.gz
|
||||
/missing
|
||||
/install-sh
|
||||
/compile
|
||||
/Makefile
|
||||
/Makefile.in
|
||||
/stamp-h1
|
||||
/config.h.in
|
||||
/libtool
|
||||
/autom4te.cache
|
||||
/aclocal.m4
|
||||
/config.log
|
||||
/configure
|
||||
/config.h
|
||||
/config.status
|
||||
/INSTALL
|
||||
dolt*
|
||||
File renamed without changes.
@@ -0,0 +1,17 @@
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to
|
||||
deal in the Software without restriction, including without limitation the
|
||||
rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
|
||||
sell copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
IN THE SOFTWARE.
|
||||
@@ -0,0 +1,19 @@
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
if HOST_WIN32
|
||||
SUBDIRS = m4 src
|
||||
else
|
||||
if PLATFORM_DARWIN
|
||||
SUBDIRS = m4 src
|
||||
else
|
||||
if CROSS_COMPILING
|
||||
SUBDIRS = m4 src
|
||||
else
|
||||
SUBDIRS = m4 src test
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
EXTRA_DIST = autogen.sh README NEWS AUTHORS winconfig.h
|
||||
File renamed without changes.
@@ -0,0 +1,54 @@
|
||||
|
||||
The purpose of eglib is to be an X11-licensed subset of glib that can
|
||||
be used with Mono when the Mono runtime is explicitly relicensed under
|
||||
a different license by Novell.
|
||||
|
||||
The implementation is done from the public documentation available here:
|
||||
|
||||
http://developer.gnome.org/doc/API/2.0/glib/
|
||||
|
||||
Currently this is only being built standalone, use:
|
||||
|
||||
./autogen.sh --prefix=/tmp/test
|
||||
|
||||
Currently all the definitions go into a single file: glib.h, there are
|
||||
no separate files, please try to follow the convetions in the source code
|
||||
|
||||
* Tests
|
||||
|
||||
Please read the README in tests/
|
||||
|
||||
* Features
|
||||
|
||||
The source code is designed to allow for different operating
|
||||
system builds of the eglib code.
|
||||
|
||||
Files in src that:
|
||||
|
||||
* Have a plain name: are cross platform, and should work on
|
||||
every operating system.
|
||||
|
||||
* That end in -unix.c: These files contain Unix specific code.
|
||||
|
||||
* That end in -win32.c: These files contain Win32 specific code.
|
||||
|
||||
* That end in -posix.c: Will work on both Windows and Unix,
|
||||
but should not be included for other operating systems.
|
||||
|
||||
* Plans: short and long term.
|
||||
|
||||
The short term plans for eglib is to allow Mono to optionally
|
||||
build with it instead of using glib, gmodule and gthread, but
|
||||
the default build will continue to be done against glib 2.0.
|
||||
|
||||
In the long-term we are considering dropping glib as a
|
||||
dependency, considering that Mono requires a modern Unix
|
||||
system to run anyways (for its thread support) it would allow
|
||||
us to fix some of the glib API limitations we have to live
|
||||
with (explicit thread support for example), rework the API to
|
||||
use types from stdint.h and we would be able to drop three
|
||||
external shared libraries.
|
||||
|
||||
This would reduce memory usage for the handful of routines
|
||||
that we use from glib, dynamic linker overhead for those and
|
||||
would allow us to tune the implementation to Mono's needs.
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
* Missing code
|
||||
|
||||
* Process launching
|
||||
3 g_shell_quote
|
||||
1 g_shell_unquote
|
||||
|
||||
----------------------------------------------------------------------
|
||||
|
||||
* Should implement, for better performance:
|
||||
|
||||
Macros:
|
||||
6 G_UNLIKELY
|
||||
4 G_LIKELY
|
||||
|
||||
* Unimplemented, not supported currently:
|
||||
|
||||
(none as yet.)
|
||||
|
||||
* Dead Code
|
||||
|
||||
The GMainLoop code was no longer in use in Mono.
|
||||
|
||||
* Windows implementations needed
|
||||
|
||||
Directory, File manipulation:
|
||||
|
||||
g_dir_open, g_dir_close, g_dir_read_name
|
||||
|
||||
We're missing a native windows implementation. The unix one is in place.
|
||||
|
||||
* Information retrieval
|
||||
1 g_win32_getlocale
|
||||
|
||||
@@ -0,0 +1,182 @@
|
||||
dnl dolt, a replacement for libtool
|
||||
dnl Copyright © 2007-2008 Josh Triplett <[email protected]>
|
||||
dnl Copying and distribution of this file, with or without modification,
|
||||
dnl are permitted in any medium without royalty provided the copyright
|
||||
dnl notice and this notice are preserved.
|
||||
dnl
|
||||
dnl To use dolt, invoke the DOLT macro immediately after the libtool macros.
|
||||
dnl Optionally, copy this file into acinclude.m4, to avoid the need to have it
|
||||
dnl installed when running autoconf on your project.
|
||||
|
||||
AC_DEFUN([DOLT], [
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
# dolt, a replacement for libtool
|
||||
# Josh Triplett <[email protected]>
|
||||
AC_PATH_PROG(DOLT_BASH, bash)
|
||||
AC_MSG_CHECKING([if dolt supports this host])
|
||||
dolt_supported=yes
|
||||
if test x$DOLT_BASH = x; then
|
||||
dolt_supported=no
|
||||
fi
|
||||
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*)
|
||||
pic_options='-fPIC'
|
||||
;;
|
||||
?86-pc-cygwin*|i?86-pc-cygwin*|i?86-pc-mingw32*)
|
||||
pic_options='-DDLL_EXPORT'
|
||||
;;
|
||||
i?86-apple-darwin*|arm-apple-darwin*)
|
||||
pic_options='-fno-common'
|
||||
;;
|
||||
*)
|
||||
dolt_supported=no
|
||||
;;
|
||||
esac
|
||||
if test x$dolt_supported = xno ; then
|
||||
AC_MSG_RESULT([no, falling back to libtool])
|
||||
LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
|
||||
LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
|
||||
else
|
||||
AC_MSG_RESULT([yes, replacing libtool])
|
||||
|
||||
dnl Start writing out doltcompile.
|
||||
cat <<__DOLTCOMPILE__EOF__ >doltcompile
|
||||
#!$DOLT_BASH
|
||||
__DOLTCOMPILE__EOF__
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
args=("$[]@")
|
||||
for ((arg=0; arg<${#args@<:@@@:>@}; arg++)) ; do
|
||||
if test x"${args@<:@$arg@:>@}" = x-o ; then
|
||||
objarg=$((arg+1))
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test x$objarg = x ; then
|
||||
echo 'Error: no -o on compiler command line' 1>&2
|
||||
exit 1
|
||||
fi
|
||||
lo="${args@<:@$objarg@:>@}"
|
||||
obj="${lo%.lo}"
|
||||
if test x"$lo" = x"$obj" ; then
|
||||
echo "Error: libtool object file name \"$lo\" does not end in .lo" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
objbase="${obj##*/}"
|
||||
__DOLTCOMPILE__EOF__
|
||||
|
||||
dnl Write out shared compilation code.
|
||||
if test x$enable_shared = xyes; then
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
libobjdir="${obj%$objbase}.libs"
|
||||
if test ! -d "$libobjdir" ; then
|
||||
mkdir_out="$(mkdir "$libobjdir" 2>&1)"
|
||||
mkdir_ret=$?
|
||||
if test "$mkdir_ret" -ne 0 && test ! -d "$libobjdir" ; then
|
||||
echo "$mkdir_out" 1>&2
|
||||
exit $mkdir_ret
|
||||
fi
|
||||
fi
|
||||
pic_object="$libobjdir/$objbase.o"
|
||||
args@<:@$objarg@:>@="$pic_object"
|
||||
__DOLTCOMPILE__EOF__
|
||||
cat <<__DOLTCOMPILE__EOF__ >>doltcompile
|
||||
"\${args@<:@@@:>@}" $pic_options -DPIC || exit \$?
|
||||
__DOLTCOMPILE__EOF__
|
||||
fi
|
||||
|
||||
dnl Write out static compilation code.
|
||||
dnl Avoid duplicate compiler output if also building shared objects.
|
||||
if test x$enable_static = xyes; then
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
non_pic_object="$obj.o"
|
||||
args@<:@$objarg@:>@="$non_pic_object"
|
||||
__DOLTCOMPILE__EOF__
|
||||
if test x$enable_shared = xyes; then
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
"${args@<:@@@:>@}" >/dev/null 2>&1 || exit $?
|
||||
__DOLTCOMPILE__EOF__
|
||||
else
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
"${args@<:@@@:>@}" || exit $?
|
||||
__DOLTCOMPILE__EOF__
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl Write out the code to write the .lo file.
|
||||
dnl The second line of the .lo file must match "^# Generated by .*libtool"
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
{
|
||||
echo "# $lo - a libtool object file"
|
||||
echo "# Generated by doltcompile, not libtool"
|
||||
__DOLTCOMPILE__EOF__
|
||||
|
||||
if test x$enable_shared = xyes; then
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
echo "pic_object='.libs/${objbase}.o'"
|
||||
__DOLTCOMPILE__EOF__
|
||||
else
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
echo pic_object=none
|
||||
__DOLTCOMPILE__EOF__
|
||||
fi
|
||||
|
||||
if test x$enable_static = xyes; then
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
echo "non_pic_object='${objbase}.o'"
|
||||
__DOLTCOMPILE__EOF__
|
||||
else
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
echo non_pic_object=none
|
||||
__DOLTCOMPILE__EOF__
|
||||
fi
|
||||
|
||||
cat <<'__DOLTCOMPILE__EOF__' >>doltcompile
|
||||
} > "$lo"
|
||||
__DOLTCOMPILE__EOF__
|
||||
|
||||
dnl Done writing out doltcompile; substitute it for libtool compilation.
|
||||
chmod +x doltcompile
|
||||
LTCOMPILE='$(top_builddir)/doltcompile $(COMPILE)'
|
||||
LTCXXCOMPILE='$(top_builddir)/doltcompile $(CXXCOMPILE)'
|
||||
|
||||
dnl automake ignores LTCOMPILE and LTCXXCOMPILE when it has separate CFLAGS for
|
||||
dnl a target, so write out a libtool wrapper to handle that case.
|
||||
dnl Note that doltlibtool does not handle inferred tags or option arguments
|
||||
dnl without '=', because automake does not use them.
|
||||
cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
|
||||
#!$DOLT_BASH
|
||||
__DOLTLIBTOOL__EOF__
|
||||
cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
|
||||
top_builddir_slash="${0%%doltlibtool}"
|
||||
: ${top_builddir_slash:=./}
|
||||
args=()
|
||||
modeok=false
|
||||
tagok=false
|
||||
for arg in "$[]@"; do
|
||||
case "$arg" in
|
||||
--silent) ;;
|
||||
--mode=compile) modeok=true ;;
|
||||
--tag=CC|--tag=CXX) tagok=true ;;
|
||||
--quiet) ;;
|
||||
*) args@<:@${#args[@]}@:>@="$arg" ;;
|
||||
esac
|
||||
done
|
||||
if $modeok && $tagok ; then
|
||||
. ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
|
||||
else
|
||||
exec ${top_builddir_slash}libtool "$[]@"
|
||||
fi
|
||||
__DOLTLIBTOOL__EOF__
|
||||
|
||||
dnl Done writing out doltlibtool; substitute it for libtool.
|
||||
chmod +x doltlibtool
|
||||
LIBTOOL='$(top_builddir)/doltlibtool'
|
||||
fi
|
||||
AC_SUBST(LTCOMPILE)
|
||||
AC_SUBST(LTCXXCOMPILE)
|
||||
# end dolt
|
||||
])
|
||||
Executable
+136
@@ -0,0 +1,136 @@
|
||||
#!/bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
# Ripped off from GNOME macros version
|
||||
|
||||
DIE=0
|
||||
|
||||
srcdir=`dirname $0`
|
||||
test -z "$srcdir" && srcdir=.
|
||||
|
||||
if [ -n "$MONO_PATH" ]; then
|
||||
# from -> /mono/lib:/another/mono/lib
|
||||
# to -> /mono /another/mono
|
||||
for i in `echo ${MONO_PATH} | tr ":" " "`; do
|
||||
i=`dirname ${i}`
|
||||
if [ -n "{i}" -a -d "${i}/share/aclocal" ]; then
|
||||
ACLOCAL_FLAGS="-I ${i}/share/aclocal $ACLOCAL_FLAGS"
|
||||
fi
|
||||
if [ -n "{i}" -a -d "${i}/bin" ]; then
|
||||
PATH="${i}/bin:$PATH"
|
||||
fi
|
||||
done
|
||||
export PATH
|
||||
fi
|
||||
|
||||
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`autoconf' installed to compile Mono."
|
||||
echo "Download the appropriate package for your distribution,"
|
||||
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
if [ -z "$LIBTOOLIZE" ]; then
|
||||
LIBTOOLIZE=`which glibtoolize 2>/dev/null`
|
||||
if [ ! -x "$LIBTOOLIZE" ]; then
|
||||
LIBTOOLIZE=`which libtoolize`
|
||||
fi
|
||||
fi
|
||||
|
||||
(grep "^AM_PROG_LIBTOOL" $srcdir/configure.ac >/dev/null) && {
|
||||
($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`libtoolize' installed to compile Mono."
|
||||
echo "Get ftp://ftp.gnu.org/gnu/libtool/libtool-1.2.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
}
|
||||
|
||||
grep "^AM_GNU_GETTEXT" $srcdir/configure.ac >/dev/null && {
|
||||
grep "sed.*POTFILES" $srcdir/configure.ac >/dev/null || \
|
||||
(gettext --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`gettext' installed to compile Mono."
|
||||
echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
}
|
||||
|
||||
(automake --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`automake' installed to compile Mono."
|
||||
echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
NO_AUTOMAKE=yes
|
||||
}
|
||||
|
||||
|
||||
# if no automake, don't bother testing for aclocal
|
||||
test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: Missing \`aclocal'. The version of \`automake'"
|
||||
echo "installed doesn't appear recent enough."
|
||||
echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
|
||||
if test "$DIE" -eq 1; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if test x$NOCONFIGURE = x && test -z "$*"; then
|
||||
echo "**Warning**: I am going to run \`configure' with no arguments."
|
||||
echo "If you wish to pass any to it, please specify them on the"
|
||||
echo \`$0\'" command line."
|
||||
echo
|
||||
fi
|
||||
|
||||
case $CC in
|
||||
xlc )
|
||||
am_opt=--include-deps;;
|
||||
esac
|
||||
|
||||
|
||||
if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
|
||||
if test -z "$NO_LIBTOOLIZE" ; then
|
||||
echo "Running libtoolize..."
|
||||
$LIBTOOLIZE --force --copy
|
||||
fi
|
||||
fi
|
||||
|
||||
echo "Running aclocal -I m4 $ACLOCAL_FLAGS ..."
|
||||
aclocal -I m4 $ACLOCAL_FLAGS || {
|
||||
echo
|
||||
echo "**Error**: aclocal failed. This may mean that you have not"
|
||||
echo "installed all of the packages you need, or you may need to"
|
||||
echo "set ACLOCAL_FLAGS to include \"-I \$prefix/share/aclocal\""
|
||||
echo "for the prefix where you installed the packages whose"
|
||||
echo "macros were not found"
|
||||
exit 1
|
||||
}
|
||||
|
||||
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
|
||||
echo "Running autoheader..."
|
||||
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
|
||||
fi
|
||||
|
||||
echo "Running automake --gnu $am_opt ..."
|
||||
automake --add-missing --gnu $am_opt ||
|
||||
{ echo "**Error**: automake failed."; exit 1; }
|
||||
echo "Running autoconf ..."
|
||||
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
|
||||
|
||||
|
||||
conf_flags="--enable-maintainer-mode" #--enable-compile-warnings --enable-iso-c
|
||||
|
||||
if test x$NOCONFIGURE = x; then
|
||||
echo Running $srcdir/configure $conf_flags "$@" ...
|
||||
$srcdir/configure $conf_flags "$@" \
|
||||
&& echo Now type \`make\' to compile $PKG_NAME || exit 1
|
||||
else
|
||||
echo Skipping configure process.
|
||||
fi
|
||||
Executable
+672
@@ -0,0 +1,672 @@
|
||||
#! /bin/sh
|
||||
# Output a system dependent set of variables, describing how to set the
|
||||
# run time search path of shared libraries in an executable.
|
||||
#
|
||||
# Copyright 1996-2010 Free Software Foundation, Inc.
|
||||
# Taken from GNU libtool, 2001
|
||||
# Originally by Gordon Matzigkeit <[email protected]>, 1996
|
||||
#
|
||||
# This file is free software; the Free Software Foundation gives
|
||||
# unlimited permission to copy and/or distribute it, with or without
|
||||
# modifications, as long as this notice is preserved.
|
||||
#
|
||||
# The first argument passed to this file is the canonical host specification,
|
||||
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
|
||||
# or
|
||||
# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
|
||||
# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
|
||||
# should be set by the caller.
|
||||
#
|
||||
# The set of defined variables is at the end of this script.
|
||||
|
||||
# Known limitations:
|
||||
# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
|
||||
# than 256 bytes, otherwise the compiler driver will dump core. The only
|
||||
# known workaround is to choose shorter directory names for the build
|
||||
# directory and/or the installation directory.
|
||||
|
||||
# All known linkers require a `.a' archive for static linking (except MSVC,
|
||||
# which needs '.lib').
|
||||
libext=a
|
||||
shrext=.so
|
||||
|
||||
host="$1"
|
||||
host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
|
||||
host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
|
||||
host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||
|
||||
# Code taken from libtool.m4's _LT_CC_BASENAME.
|
||||
|
||||
for cc_temp in $CC""; do
|
||||
case $cc_temp in
|
||||
compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
|
||||
distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
|
||||
\-*) ;;
|
||||
*) break;;
|
||||
esac
|
||||
done
|
||||
cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
|
||||
|
||||
# Code taken from libtool.m4's _LT_COMPILER_PIC.
|
||||
|
||||
wl=
|
||||
if test "$GCC" = yes; then
|
||||
wl='-Wl,'
|
||||
else
|
||||
case "$host_os" in
|
||||
aix*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
darwin*)
|
||||
case $cc_basename in
|
||||
xlc*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
mingw* | cygwin* | pw32* | os2* | cegcc*)
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
irix5* | irix6* | nonstopux*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
newsos6)
|
||||
;;
|
||||
linux* | k*bsd*-gnu)
|
||||
case $cc_basename in
|
||||
ecc*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
icc* | ifort*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
lf95*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
pgcc | pgf77 | pgf90)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
ccc*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
como)
|
||||
wl='-lopt='
|
||||
;;
|
||||
*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
osf3* | osf4* | osf5*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
rdos*)
|
||||
;;
|
||||
solaris*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
sunos4*)
|
||||
wl='-Qoption ld '
|
||||
;;
|
||||
sysv4 | sysv4.2uw2* | sysv4.3*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
sysv4*MP*)
|
||||
;;
|
||||
sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
unicos*)
|
||||
wl='-Wl,'
|
||||
;;
|
||||
uts4*)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
|
||||
|
||||
hardcode_libdir_flag_spec=
|
||||
hardcode_libdir_separator=
|
||||
hardcode_direct=no
|
||||
hardcode_minus_L=no
|
||||
|
||||
case "$host_os" in
|
||||
cygwin* | mingw* | pw32* | cegcc*)
|
||||
# FIXME: the MSVC++ port hasn't been tested in a loooong time
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
if test "$GCC" != yes; then
|
||||
with_gnu_ld=no
|
||||
fi
|
||||
;;
|
||||
interix*)
|
||||
# we just hope/assume this is gcc and not c89 (= MSVC++)
|
||||
with_gnu_ld=yes
|
||||
;;
|
||||
openbsd*)
|
||||
with_gnu_ld=no
|
||||
;;
|
||||
esac
|
||||
|
||||
ld_shlibs=yes
|
||||
if test "$with_gnu_ld" = yes; then
|
||||
# Set some defaults for GNU ld with shared library support. These
|
||||
# are reset later if shared libraries are not supported. Putting them
|
||||
# here allows them to be overridden if necessary.
|
||||
# Unlike libtool, we use -rpath here, not --rpath, since the documented
|
||||
# option of GNU ld is called -rpath, not --rpath.
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
case "$host_os" in
|
||||
aix[3-9]*)
|
||||
# On AIX/PPC, the GNU linker is very broken
|
||||
if test "$host_cpu" != ia64; then
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
amigaos*)
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_minus_L=yes
|
||||
# Samuel A. Falvo II <[email protected]> reports
|
||||
# that the semantics of dynamic libraries on AmigaOS, at least up
|
||||
# to version 4, is to share data among multiple programs linked
|
||||
# with the same dynamic library. Since this doesn't match the
|
||||
# behavior of shared libraries on other platforms, we cannot use
|
||||
# them.
|
||||
ld_shlibs=no
|
||||
;;
|
||||
beos*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
:
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
cygwin* | mingw* | pw32* | cegcc*)
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
|
||||
:
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
interix[3-9]*)
|
||||
hardcode_direct=no
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
;;
|
||||
gnu* | linux* | k*bsd*-gnu)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
:
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
netbsd*)
|
||||
;;
|
||||
solaris*)
|
||||
if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
|
||||
ld_shlibs=no
|
||||
elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
:
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
|
||||
case `$LD -v 2>&1` in
|
||||
*\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
|
||||
ld_shlibs=no
|
||||
;;
|
||||
*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
sunos4*)
|
||||
hardcode_direct=yes
|
||||
;;
|
||||
*)
|
||||
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
|
||||
:
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if test "$ld_shlibs" = no; then
|
||||
hardcode_libdir_flag_spec=
|
||||
fi
|
||||
else
|
||||
case "$host_os" in
|
||||
aix3*)
|
||||
# Note: this linker hardcodes the directories in LIBPATH if there
|
||||
# are no directories specified by -L.
|
||||
hardcode_minus_L=yes
|
||||
if test "$GCC" = yes; then
|
||||
# Neither direct hardcoding nor static linking is supported with a
|
||||
# broken collect2.
|
||||
hardcode_direct=unsupported
|
||||
fi
|
||||
;;
|
||||
aix[4-9]*)
|
||||
if test "$host_cpu" = ia64; then
|
||||
# On IA64, the linker does run time linking by default, so we don't
|
||||
# have to do anything special.
|
||||
aix_use_runtimelinking=no
|
||||
else
|
||||
aix_use_runtimelinking=no
|
||||
# Test if we are trying to use run time linking or normal
|
||||
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
|
||||
# need to do runtime linking.
|
||||
case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
|
||||
for ld_flag in $LDFLAGS; do
|
||||
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
|
||||
aix_use_runtimelinking=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
hardcode_direct=yes
|
||||
hardcode_libdir_separator=':'
|
||||
if test "$GCC" = yes; then
|
||||
case $host_os in aix4.[012]|aix4.[012].*)
|
||||
collect2name=`${CC} -print-prog-name=collect2`
|
||||
if test -f "$collect2name" && \
|
||||
strings "$collect2name" | grep resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
:
|
||||
else
|
||||
# We have old collect2
|
||||
hardcode_direct=unsupported
|
||||
hardcode_minus_L=yes
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_libdir_separator=
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
# Begin _LT_AC_SYS_LIBPATH_AIX.
|
||||
echo 'int main () { return 0; }' > conftest.c
|
||||
${CC} ${LDFLAGS} conftest.c -o conftest
|
||||
aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
|
||||
}'`
|
||||
if test -z "$aix_libpath"; then
|
||||
aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
|
||||
}'`
|
||||
fi
|
||||
if test -z "$aix_libpath"; then
|
||||
aix_libpath="/usr/lib:/lib"
|
||||
fi
|
||||
rm -f conftest.c conftest
|
||||
# End _LT_AC_SYS_LIBPATH_AIX.
|
||||
if test "$aix_use_runtimelinking" = yes; then
|
||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
||||
else
|
||||
if test "$host_cpu" = ia64; then
|
||||
hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
|
||||
else
|
||||
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
amigaos*)
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_minus_L=yes
|
||||
# see comment about different semantics on the GNU ld section
|
||||
ld_shlibs=no
|
||||
;;
|
||||
bsdi[45]*)
|
||||
;;
|
||||
cygwin* | mingw* | pw32* | cegcc*)
|
||||
# When not using gcc, we currently assume that we are using
|
||||
# Microsoft Visual C++.
|
||||
# hardcode_libdir_flag_spec is actually meaningless, as there is
|
||||
# no search path for DLLs.
|
||||
hardcode_libdir_flag_spec=' '
|
||||
libext=lib
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
hardcode_direct=no
|
||||
if test "$GCC" = yes ; then
|
||||
:
|
||||
else
|
||||
case $cc_basename in
|
||||
xlc*)
|
||||
;;
|
||||
*)
|
||||
ld_shlibs=no
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
dgux*)
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
;;
|
||||
freebsd1*)
|
||||
ld_shlibs=no
|
||||
;;
|
||||
freebsd2.2*)
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
;;
|
||||
freebsd2*)
|
||||
hardcode_direct=yes
|
||||
hardcode_minus_L=yes
|
||||
;;
|
||||
freebsd* | dragonfly*)
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
;;
|
||||
hpux9*)
|
||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
hardcode_direct=yes
|
||||
# hardcode_minus_L: Not really in the search PATH,
|
||||
# but as the default location of the library.
|
||||
hardcode_minus_L=yes
|
||||
;;
|
||||
hpux10*)
|
||||
if test "$with_gnu_ld" = no; then
|
||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
hardcode_direct=yes
|
||||
# hardcode_minus_L: Not really in the search PATH,
|
||||
# but as the default location of the library.
|
||||
hardcode_minus_L=yes
|
||||
fi
|
||||
;;
|
||||
hpux11*)
|
||||
if test "$with_gnu_ld" = no; then
|
||||
hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
case $host_cpu in
|
||||
hppa*64*|ia64*)
|
||||
hardcode_direct=no
|
||||
;;
|
||||
*)
|
||||
hardcode_direct=yes
|
||||
# hardcode_minus_L: Not really in the search PATH,
|
||||
# but as the default location of the library.
|
||||
hardcode_minus_L=yes
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
irix5* | irix6* | nonstopux*)
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
netbsd*)
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
hardcode_direct=yes
|
||||
;;
|
||||
newsos6)
|
||||
hardcode_direct=yes
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
openbsd*)
|
||||
if test -f /usr/libexec/ld.so; then
|
||||
hardcode_direct=yes
|
||||
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
else
|
||||
case "$host_os" in
|
||||
openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
*)
|
||||
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
else
|
||||
ld_shlibs=no
|
||||
fi
|
||||
;;
|
||||
os2*)
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_minus_L=yes
|
||||
;;
|
||||
osf3*)
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
osf4* | osf5*)
|
||||
if test "$GCC" = yes; then
|
||||
hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
|
||||
else
|
||||
# Both cc and cxx compiler support -rpath directly
|
||||
hardcode_libdir_flag_spec='-rpath $libdir'
|
||||
fi
|
||||
hardcode_libdir_separator=:
|
||||
;;
|
||||
solaris*)
|
||||
hardcode_libdir_flag_spec='-R$libdir'
|
||||
;;
|
||||
sunos4*)
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
hardcode_direct=yes
|
||||
hardcode_minus_L=yes
|
||||
;;
|
||||
sysv4)
|
||||
case $host_vendor in
|
||||
sni)
|
||||
hardcode_direct=yes # is this really true???
|
||||
;;
|
||||
siemens)
|
||||
hardcode_direct=no
|
||||
;;
|
||||
motorola)
|
||||
hardcode_direct=no #Motorola manual says yes, but my tests say they lie
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
sysv4.3*)
|
||||
;;
|
||||
sysv4*MP*)
|
||||
if test -d /usr/nec; then
|
||||
ld_shlibs=yes
|
||||
fi
|
||||
;;
|
||||
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
|
||||
;;
|
||||
sysv5* | sco3.2v5* | sco5v6*)
|
||||
hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
|
||||
hardcode_libdir_separator=':'
|
||||
;;
|
||||
uts4*)
|
||||
hardcode_libdir_flag_spec='-L$libdir'
|
||||
;;
|
||||
*)
|
||||
ld_shlibs=no
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Check dynamic linker characteristics
|
||||
# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
|
||||
# Unlike libtool.m4, here we don't care about _all_ names of the library, but
|
||||
# only about the one the linker finds when passed -lNAME. This is the last
|
||||
# element of library_names_spec in libtool.m4, or possibly two of them if the
|
||||
# linker has special search rules.
|
||||
library_names_spec= # the last element of library_names_spec in libtool.m4
|
||||
libname_spec='lib$name'
|
||||
case "$host_os" in
|
||||
aix3*)
|
||||
library_names_spec='$libname.a'
|
||||
;;
|
||||
aix[4-9]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
amigaos*)
|
||||
library_names_spec='$libname.a'
|
||||
;;
|
||||
beos*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
bsdi[45]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
cygwin* | mingw* | pw32* | cegcc*)
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.dll.a $libname.lib'
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
shrext=.dylib
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
dgux*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
freebsd1*)
|
||||
;;
|
||||
freebsd* | dragonfly*)
|
||||
case "$host_os" in
|
||||
freebsd[123]*)
|
||||
library_names_spec='$libname$shrext$versuffix' ;;
|
||||
*)
|
||||
library_names_spec='$libname$shrext' ;;
|
||||
esac
|
||||
;;
|
||||
gnu*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
hpux9* | hpux10* | hpux11*)
|
||||
case $host_cpu in
|
||||
ia64*)
|
||||
shrext=.so
|
||||
;;
|
||||
hppa*64*)
|
||||
shrext=.sl
|
||||
;;
|
||||
*)
|
||||
shrext=.sl
|
||||
;;
|
||||
esac
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
interix[3-9]*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
irix5* | irix6* | nonstopux*)
|
||||
library_names_spec='$libname$shrext'
|
||||
case "$host_os" in
|
||||
irix5* | nonstopux*)
|
||||
libsuff= shlibsuff=
|
||||
;;
|
||||
*)
|
||||
case $LD in
|
||||
*-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
|
||||
*-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
|
||||
*-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
|
||||
*) libsuff= shlibsuff= ;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
linux*oldld* | linux*aout* | linux*coff*)
|
||||
;;
|
||||
linux* | k*bsd*-gnu)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
knetbsd*-gnu)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
netbsd*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
newsos6)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
nto-qnx*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
openbsd*)
|
||||
library_names_spec='$libname$shrext$versuffix'
|
||||
;;
|
||||
os2*)
|
||||
libname_spec='$name'
|
||||
shrext=.dll
|
||||
library_names_spec='$libname.a'
|
||||
;;
|
||||
osf3* | osf4* | osf5*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
rdos*)
|
||||
;;
|
||||
solaris*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
sunos4*)
|
||||
library_names_spec='$libname$shrext$versuffix'
|
||||
;;
|
||||
sysv4 | sysv4.3*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
sysv4*MP*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
uts4*)
|
||||
library_names_spec='$libname$shrext'
|
||||
;;
|
||||
esac
|
||||
|
||||
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
|
||||
escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
||||
shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
|
||||
escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
||||
escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
||||
escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
|
||||
|
||||
LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
|
||||
|
||||
# How to pass a linker flag through the compiler.
|
||||
wl="$escaped_wl"
|
||||
|
||||
# Static library suffix (normally "a").
|
||||
libext="$libext"
|
||||
|
||||
# Shared library suffix (normally "so").
|
||||
shlibext="$shlibext"
|
||||
|
||||
# Format of library name prefix.
|
||||
libname_spec="$escaped_libname_spec"
|
||||
|
||||
# Library names that the linker finds when passed -lNAME.
|
||||
library_names_spec="$escaped_library_names_spec"
|
||||
|
||||
# Flag to hardcode \$libdir into a binary during linking.
|
||||
# This must work even if \$libdir does not exist.
|
||||
hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
|
||||
|
||||
# Whether we need a single -rpath flag with a separated argument.
|
||||
hardcode_libdir_separator="$hardcode_libdir_separator"
|
||||
|
||||
# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
|
||||
# resulting binary.
|
||||
hardcode_direct="$hardcode_direct"
|
||||
|
||||
# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
|
||||
# resulting binary.
|
||||
hardcode_minus_L="$hardcode_minus_L"
|
||||
|
||||
EOF
|
||||
@@ -0,0 +1,268 @@
|
||||
#
|
||||
# Copyright 2012 Xamarin Inc
|
||||
#
|
||||
AC_INIT(eglib, [0.3],
|
||||
[http://bugzilla.xamarin.com/enter_bug.cgi?classification=Mono])
|
||||
|
||||
AC_CONFIG_SRCDIR([README])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CANONICAL_SYSTEM
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar no-dist-gzip foreign])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AM_MAINTAINER_MODE
|
||||
|
||||
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_LIBTOOL
|
||||
# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
|
||||
DOLT
|
||||
GNUC_PRETTY=
|
||||
GNUC_UNUSED=
|
||||
BREAKPOINT="G_STMT_START { raise (SIGTRAP); } G_STMT_END"
|
||||
if test x$GCC = xyes; then
|
||||
GNUC_UNUSED='__attribute__((__unused__))'
|
||||
GNUC_NORETURN='__attribute__((__noreturn__))'
|
||||
case $host_cpu in
|
||||
i*86|x86_64) BREAKPOINT="G_STMT_START { __asm__ (\"int \$03\"); } G_STMT_END" ;;
|
||||
esac
|
||||
fi
|
||||
AC_SUBST(GNUC_PRETTY)
|
||||
AC_SUBST(GNUC_UNUSED)
|
||||
AC_SUBST(GNUC_NORETURN)
|
||||
AC_SUBST(BREAKPOINT)
|
||||
|
||||
# We use a separate variable to pass down CPPFLAGS and CFLAGS from the main mono
|
||||
# configure, because of autoconf brokeness
|
||||
if test "x$CPPFLAGS_FOR_EGLIB" != "x"; then
|
||||
CPPFLAGS=$CPPFLAGS_FOR_EGLIB
|
||||
fi
|
||||
if test "x$CFLAGS_FOR_EGLIB" != "x"; then
|
||||
CFLAGS=$CFLAGS_FOR_EGLIB
|
||||
fi
|
||||
|
||||
CFLAGS="$CFLAGS -g -D_GNU_SOURCE"
|
||||
|
||||
AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
|
||||
AC_C_BIGENDIAN([ORDER=G_BIG_ENDIAN],[ORDER=G_LITTLE_ENDIAN])
|
||||
|
||||
platform_darwin=no
|
||||
platform_android=no
|
||||
|
||||
case $host in
|
||||
*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
|
||||
PATHSEP='\\'
|
||||
SEARCHSEP=';'
|
||||
OS="WIN32"
|
||||
PIDTYPE='void *'
|
||||
;;
|
||||
*-*darwin*)
|
||||
platform_darwin=yes
|
||||
PATHSEP='/'
|
||||
SEARCHSEP=':'
|
||||
OS="UNIX"
|
||||
PIDTYPE='int'
|
||||
;;
|
||||
*-*-linux-android*)
|
||||
platform_android=yes
|
||||
AC_DEFINE(PLATFORM_ANDROID,1,[Targeting the Android platform])
|
||||
PATHSEP='/'
|
||||
SEARCHSEP=':'
|
||||
OS="UNIX"
|
||||
PIDTYPE='int'
|
||||
;;
|
||||
*)
|
||||
PATHSEP='/'
|
||||
SEARCHSEP=':'
|
||||
OS="UNIX"
|
||||
PIDTYPE='int'
|
||||
;;
|
||||
esac
|
||||
|
||||
case $host in
|
||||
*-*-solaris*)
|
||||
CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS"
|
||||
;;
|
||||
esac
|
||||
|
||||
case $target in
|
||||
arm*-darwin*|aarch64*-*)
|
||||
CFLAGS="$CFLAGS -U_FORTIFY_SOURCE"
|
||||
;;
|
||||
i*86-*-darwin*)
|
||||
ORDER=G_LITTLE_ENDIAN
|
||||
;;
|
||||
*-*-haiku*)
|
||||
LDFLAGS="$LDFLAGS -ltextencoding"
|
||||
;;
|
||||
*-*-openbsd*)
|
||||
CFLAGS="$CFLAGS -pthread"
|
||||
LDFLAGS="$LDFLAGS -pthread"
|
||||
;;
|
||||
esac
|
||||
|
||||
target_osx=no
|
||||
target_ios=no
|
||||
|
||||
if test "x$platform_darwin" = "xyes"; then
|
||||
AC_TRY_COMPILE([#include "TargetConditionals.h"],[
|
||||
#if TARGET_IPHONE_SIMULATOR == 1 || TARGET_OS_IPHONE == 1
|
||||
#error fail this for ios
|
||||
#endif
|
||||
return 0;
|
||||
], [
|
||||
AC_DEFINE(TARGET_OSX,1,[The JIT/AOT targets OSX])
|
||||
target_osx=yes
|
||||
], [
|
||||
AC_DEFINE(TARGET_IOS,1,[The JIT/AOT targets iOS])
|
||||
target_ios=yes
|
||||
])
|
||||
AC_DEFINE(TARGET_MACH,1,[The JIT/AOT targets Apple platforms])
|
||||
fi
|
||||
|
||||
AC_SUBST(ORDER)
|
||||
AC_SUBST(CFLAGS)
|
||||
AC_SUBST(PATHSEP)
|
||||
AC_SUBST(SEARCHSEP)
|
||||
AC_SUBST(OS)
|
||||
AC_SUBST(PIDTYPE)
|
||||
AM_CONDITIONAL(HOST_WIN32, test x$OS = xWIN32)
|
||||
AM_CONDITIONAL(TARGET_WIN32, test x$OS = xWIN32)
|
||||
AM_CONDITIONAL(PLATFORM_DARWIN, test x$platform_darwin = xyes)
|
||||
AM_CONDITIONAL(PLATFORM_ANDROID, test x$platform_android = xyes)
|
||||
|
||||
# Defined for all targets/platforms using classic Windows API support.
|
||||
AC_DEFINE(HAVE_CLASSIC_WINAPI_SUPPORT, 1, [Use classic Windows API support])
|
||||
AC_DEFINE(HAVE_UWP_WINAPI_SUPPORT, 0, [Don't use UWP Windows API support])
|
||||
|
||||
AC_CHECK_SIZEOF(int)
|
||||
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)
|
||||
AC_CHECK_FUNCS(fork execv execve)
|
||||
|
||||
AC_ARG_WITH([overridable-allocators], [ --with-overridable-allocators allow g_*alloc/g_free to call custom allocators set via g_mem_set_vtable])
|
||||
|
||||
if test x$with_overridable_allocators = xyes; then
|
||||
AC_DEFINE(ENABLE_OVERRIDABLE_ALLOCATORS,1,[Overridable allocator support enabled])
|
||||
AC_MSG_NOTICE([Overridable allocator support enabled])
|
||||
else
|
||||
AC_MSG_NOTICE([Overridable allocator support disabled])
|
||||
fi
|
||||
|
||||
#
|
||||
# Mono currently supports 10.6, but strndup is not available prior to 10.7; avoiding
|
||||
# the detection of strndup on OS X so Mono built on 10.7+ still runs on 10.6. This can be
|
||||
# removed once support for 10.6 is dropped.
|
||||
#
|
||||
# iOS detection of strndup and getpwuid_r is faulty for some reason so let's simply avoid it
|
||||
#
|
||||
if test x$target_osx = xyes; then
|
||||
AC_CHECK_FUNCS(getpwuid_r)
|
||||
elif test x$target_ios = xno; then
|
||||
AC_CHECK_FUNCS(strndup getpwuid_r)
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(NEED_VASPRINTF, test x$ac_cv_func_vasprintf = xno || test x$with_overridable_allocators = xyes)
|
||||
AM_ICONV()
|
||||
AC_SEARCH_LIBS(sqrtf, m)
|
||||
|
||||
# nanosleep may not be part of libc, also search it in other libraries
|
||||
AC_SEARCH_LIBS(nanosleep, rt)
|
||||
|
||||
AC_SEARCH_LIBS(dlopen, dl)
|
||||
old_ldflags="${LDFLAGS}"
|
||||
LDFLAGS="${LDFLAGS} -Wl,-export-dynamic"
|
||||
AC_TRY_LINK(, [int i;], found_export_dynamic=yes, found_export_dynamic=no)
|
||||
if test $found_export_dynamic = no; then
|
||||
LDFLAGS="${old_ldflags}"
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for varargs macros)
|
||||
AC_TRY_COMPILE([],[
|
||||
int foo (int i, int j);
|
||||
#define bar(...) foo (1, __VA_ARGS__)
|
||||
void main () {
|
||||
bar (2);
|
||||
}
|
||||
],have_iso_varargs=yes,have_iso_varargs=no)
|
||||
AC_MSG_RESULT($have_iso_varargs)
|
||||
G_HAVE_ISO_VARARGS=0
|
||||
if test "x$have_iso_varargs" = "xyes"; then
|
||||
G_HAVE_ISO_VARARGS=1
|
||||
fi
|
||||
AC_SUBST(G_HAVE_ISO_VARARGS)
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h sys/wait.h pwd.h iconv.h localcharset.h sys/types.h sys/resource.h)
|
||||
AC_CHECK_LIB([iconv], [locale_charset],[],[AC_CHECK_LIB([charset], [locale_charset],[LIBS+="-liconv -lcharset"])])
|
||||
AC_CHECK_HEADER(alloca.h, [HAVE_ALLOCA_H=1], [HAVE_ALLOCA_H=0])
|
||||
AC_SUBST(HAVE_ALLOCA_H)
|
||||
|
||||
if test $ac_cv_sizeof_void_p = $ac_cv_sizeof_int; then
|
||||
GPOINTER_TO_INT="((gint) (ptr))"
|
||||
GPOINTER_TO_UINT="((guint) (ptr))"
|
||||
GINT_TO_POINTER="((gpointer) (v))"
|
||||
GUINT_TO_POINTER="((gpointer) (v))"
|
||||
GSIZE="int"
|
||||
GSIZE_FORMAT='"u"'
|
||||
elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long; then
|
||||
GPOINTER_TO_INT="((gint)(long) (ptr))"
|
||||
GPOINTER_TO_UINT="((guint)(long) (ptr))"
|
||||
GINT_TO_POINTER="((gpointer)(glong) (v))"
|
||||
GUINT_TO_POINTER="((gpointer)(gulong) (v))"
|
||||
GSIZE="long"
|
||||
GSIZE_FORMAT='"lu"'
|
||||
elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long_long; then
|
||||
GPOINTER_TO_INT="((gint)(long long) (ptr))"
|
||||
GPOINTER_TO_UINT="((guint)(unsigned long long) (ptr))"
|
||||
GINT_TO_POINTER="((gpointer)(long long) (v))"
|
||||
GUINT_TO_POINTER="((gpointer)(unsigned long long) (v))"
|
||||
GSIZE="long long"
|
||||
GSIZE_FORMAT='"I64u"'
|
||||
else
|
||||
AC_MSG_ERROR([unsupported pointer size])
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
|
||||
|
||||
pkg_config_path=
|
||||
AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir Change pkg-config dir to custom dir],
|
||||
if test x$with_crosspkgdir = "x"; then
|
||||
if test -s $PKG_CONFIG_PATH; then
|
||||
pkg_config_path=$PKG_CONFIG_PATH
|
||||
fi
|
||||
else
|
||||
pkg_config_path=$with_crosspkgdir
|
||||
PKG_CONFIG_PATH=$pkg_config_path
|
||||
export PKG_CONFIG_PATH
|
||||
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_SUBST(GPOINTER_TO_INT)
|
||||
AC_SUBST(GPOINTER_TO_UINT)
|
||||
AC_SUBST(GINT_TO_POINTER)
|
||||
AC_SUBST(GUINT_TO_POINTER)
|
||||
AC_SUBST(GSIZE)
|
||||
AC_SUBST(GSIZE_FORMAT)
|
||||
AC_SUBST(G_GUINT64_FORMAT)
|
||||
AC_SUBST(G_GINT64_FORMAT)
|
||||
AC_SUBST(G_GUINT32_FORMAT)
|
||||
AC_SUBST(G_GINT32_FORMAT)
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
m4/Makefile
|
||||
src/Makefile
|
||||
src/eglib-config.h
|
||||
test/Makefile
|
||||
])
|
||||
@@ -0,0 +1,7 @@
|
||||
Makefile
|
||||
Makefile.in
|
||||
libtool.m4
|
||||
ltoptions.m4
|
||||
ltsugar.m4
|
||||
ltversion.m4
|
||||
lt~obsolete.m4
|
||||
@@ -0,0 +1 @@
|
||||
EXTRA_DIST = $(wildcard *.m4)
|
||||
@@ -0,0 +1,214 @@
|
||||
# iconv.m4 serial 11 (gettext-0.18.1)
|
||||
dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
|
||||
[
|
||||
dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
|
||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||
AC_REQUIRE([AC_LIB_RPATH])
|
||||
|
||||
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
||||
dnl accordingly.
|
||||
AC_LIB_LINKFLAGS_BODY([iconv])
|
||||
])
|
||||
|
||||
AC_DEFUN([AM_ICONV_LINK],
|
||||
[
|
||||
dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
|
||||
dnl those with the standalone portable GNU libiconv installed).
|
||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
|
||||
|
||||
dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
|
||||
dnl accordingly.
|
||||
AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
|
||||
|
||||
dnl Add $INCICONV to CPPFLAGS before performing the following checks,
|
||||
dnl because if the user has installed libiconv and not disabled its use
|
||||
dnl via --without-libiconv-prefix, he wants to use it. The first
|
||||
dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed.
|
||||
am_save_CPPFLAGS="$CPPFLAGS"
|
||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
|
||||
|
||||
AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
|
||||
am_cv_func_iconv="no, consider installing GNU libiconv"
|
||||
am_cv_lib_iconv=no
|
||||
AC_TRY_LINK([#include <stdlib.h>
|
||||
#include <iconv.h>],
|
||||
[iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
iconv_close(cd);],
|
||||
[am_cv_func_iconv=yes])
|
||||
if test "$am_cv_func_iconv" != yes; then
|
||||
am_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS $LIBICONV"
|
||||
AC_TRY_LINK([#include <stdlib.h>
|
||||
#include <iconv.h>],
|
||||
[iconv_t cd = iconv_open("","");
|
||||
iconv(cd,NULL,NULL,NULL,NULL);
|
||||
iconv_close(cd);],
|
||||
[am_cv_lib_iconv=yes]
|
||||
[am_cv_func_iconv=yes])
|
||||
LIBS="$am_save_LIBS"
|
||||
fi
|
||||
])
|
||||
if test "$am_cv_func_iconv" = yes; then
|
||||
AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
|
||||
dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
|
||||
am_save_LIBS="$LIBS"
|
||||
if test $am_cv_lib_iconv = yes; then
|
||||
LIBS="$LIBS $LIBICONV"
|
||||
fi
|
||||
AC_TRY_RUN([
|
||||
#include <iconv.h>
|
||||
#include <string.h>
|
||||
int main ()
|
||||
{
|
||||
/* Test against AIX 5.1 bug: Failures are not distinguishable from successful
|
||||
returns. */
|
||||
{
|
||||
iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
|
||||
if (cd_utf8_to_88591 != (iconv_t)(-1))
|
||||
{
|
||||
static const char input[] = "\342\202\254"; /* EURO SIGN */
|
||||
char buf[10];
|
||||
const char *inptr = input;
|
||||
size_t inbytesleft = strlen (input);
|
||||
char *outptr = buf;
|
||||
size_t outbytesleft = sizeof (buf);
|
||||
size_t res = iconv (cd_utf8_to_88591,
|
||||
(char **) &inptr, &inbytesleft,
|
||||
&outptr, &outbytesleft);
|
||||
if (res == 0)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
/* Test against Solaris 10 bug: Failures are not distinguishable from
|
||||
successful returns. */
|
||||
{
|
||||
iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
|
||||
if (cd_ascii_to_88591 != (iconv_t)(-1))
|
||||
{
|
||||
static const char input[] = "\263";
|
||||
char buf[10];
|
||||
const char *inptr = input;
|
||||
size_t inbytesleft = strlen (input);
|
||||
char *outptr = buf;
|
||||
size_t outbytesleft = sizeof (buf);
|
||||
size_t res = iconv (cd_ascii_to_88591,
|
||||
(char **) &inptr, &inbytesleft,
|
||||
&outptr, &outbytesleft);
|
||||
if (res == 0)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
#if 0 /* This bug could be worked around by the caller. */
|
||||
/* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
|
||||
{
|
||||
iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
|
||||
if (cd_88591_to_utf8 != (iconv_t)(-1))
|
||||
{
|
||||
static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
|
||||
char buf[50];
|
||||
const char *inptr = input;
|
||||
size_t inbytesleft = strlen (input);
|
||||
char *outptr = buf;
|
||||
size_t outbytesleft = sizeof (buf);
|
||||
size_t res = iconv (cd_88591_to_utf8,
|
||||
(char **) &inptr, &inbytesleft,
|
||||
&outptr, &outbytesleft);
|
||||
if ((int)res > 0)
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
/* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
|
||||
provided. */
|
||||
if (/* Try standardized names. */
|
||||
iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1)
|
||||
/* Try IRIX, OSF/1 names. */
|
||||
&& iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1)
|
||||
/* Try AIX names. */
|
||||
&& iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1)
|
||||
/* Try HP-UX names. */
|
||||
&& iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
|
||||
return 1;
|
||||
return 0;
|
||||
}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no],
|
||||
[case "$host_os" in
|
||||
aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
|
||||
*) am_cv_func_iconv_works="guessing yes" ;;
|
||||
esac])
|
||||
LIBS="$am_save_LIBS"
|
||||
])
|
||||
case "$am_cv_func_iconv_works" in
|
||||
*no) am_func_iconv=no am_cv_lib_iconv=no ;;
|
||||
*) am_func_iconv=yes ;;
|
||||
esac
|
||||
else
|
||||
am_func_iconv=no am_cv_lib_iconv=no
|
||||
fi
|
||||
if test "$am_func_iconv" = yes; then
|
||||
AC_DEFINE([HAVE_ICONV], [1],
|
||||
[Define if you have the iconv() function and it works.])
|
||||
fi
|
||||
if test "$am_cv_lib_iconv" = yes; then
|
||||
AC_MSG_CHECKING([how to link with libiconv])
|
||||
AC_MSG_RESULT([$LIBICONV])
|
||||
else
|
||||
dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
|
||||
dnl either.
|
||||
CPPFLAGS="$am_save_CPPFLAGS"
|
||||
LIBICONV=
|
||||
LTLIBICONV=
|
||||
fi
|
||||
AC_SUBST([LIBICONV])
|
||||
AC_SUBST([LTLIBICONV])
|
||||
])
|
||||
|
||||
dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
|
||||
dnl avoid warnings like
|
||||
dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
|
||||
dnl This is tricky because of the way 'aclocal' is implemented:
|
||||
dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
|
||||
dnl Otherwise aclocal's initial scan pass would miss the macro definition.
|
||||
dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
|
||||
dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
|
||||
dnl warnings.
|
||||
m4_define([gl_iconv_AC_DEFUN],
|
||||
m4_version_prereq([2.64],
|
||||
[[AC_DEFUN_ONCE(
|
||||
[$1], [$2])]],
|
||||
[[AC_DEFUN(
|
||||
[$1], [$2])]]))
|
||||
gl_iconv_AC_DEFUN([AM_ICONV],
|
||||
[
|
||||
AM_ICONV_LINK
|
||||
if test "$am_cv_func_iconv" = yes; then
|
||||
AC_MSG_CHECKING([for iconv declaration])
|
||||
AC_CACHE_VAL([am_cv_proto_iconv], [
|
||||
AC_TRY_COMPILE([
|
||||
#include <stdlib.h>
|
||||
#include <iconv.h>
|
||||
extern
|
||||
#ifdef __cplusplus
|
||||
"C"
|
||||
#endif
|
||||
#if defined(__STDC__) || defined(__cplusplus)
|
||||
size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
|
||||
#else
|
||||
size_t iconv();
|
||||
#endif
|
||||
], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
|
||||
am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
|
||||
am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
|
||||
AC_MSG_RESULT([
|
||||
$am_cv_proto_iconv])
|
||||
AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
|
||||
[Define as const if the declaration of iconv() needs const.])
|
||||
fi
|
||||
])
|
||||
@@ -0,0 +1,110 @@
|
||||
# lib-ld.m4 serial 4 (gettext-0.18)
|
||||
dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl Subroutines of libtool.m4,
|
||||
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
|
||||
dnl with libtool.m4.
|
||||
|
||||
dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no.
|
||||
AC_DEFUN([AC_LIB_PROG_LD_GNU],
|
||||
[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
|
||||
[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
|
||||
case `$LD -v 2>&1 </dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
acl_cv_prog_gnu_ld=yes ;;
|
||||
*)
|
||||
acl_cv_prog_gnu_ld=no ;;
|
||||
esac])
|
||||
with_gnu_ld=$acl_cv_prog_gnu_ld
|
||||
])
|
||||
|
||||
dnl From libtool-1.4. Sets the variable LD.
|
||||
AC_DEFUN([AC_LIB_PROG_LD],
|
||||
[AC_ARG_WITH([gnu-ld],
|
||||
[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]],
|
||||
test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
|
||||
AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])dnl
|
||||
# Prepare PATH_SEPARATOR.
|
||||
# The user is always right.
|
||||
if test "${PATH_SEPARATOR+set}" != set; then
|
||||
echo "#! /bin/sh" >conf$$.sh
|
||||
echo "exit 0" >>conf$$.sh
|
||||
chmod +x conf$$.sh
|
||||
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||||
PATH_SEPARATOR=';'
|
||||
else
|
||||
PATH_SEPARATOR=:
|
||||
fi
|
||||
rm -f conf$$.sh
|
||||
fi
|
||||
ac_prog=ld
|
||||
if test "$GCC" = yes; then
|
||||
# Check if gcc -print-prog-name=ld gives a path.
|
||||
AC_MSG_CHECKING([for ld used by GCC])
|
||||
case $host in
|
||||
*-*-mingw*)
|
||||
# gcc leaves a trailing carriage return which upsets mingw
|
||||
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
|
||||
*)
|
||||
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
|
||||
esac
|
||||
case $ac_prog in
|
||||
# Accept absolute paths.
|
||||
[[\\/]* | [A-Za-z]:[\\/]*)]
|
||||
[re_direlt='/[^/][^/]*/\.\./']
|
||||
# Canonicalize the path of ld
|
||||
ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
|
||||
while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
|
||||
ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
|
||||
done
|
||||
test -z "$LD" && LD="$ac_prog"
|
||||
;;
|
||||
"")
|
||||
# If it fails, then pretend we aren't using GCC.
|
||||
ac_prog=ld
|
||||
;;
|
||||
*)
|
||||
# If it is relative, then search for the first ld in PATH.
|
||||
with_gnu_ld=unknown
|
||||
;;
|
||||
esac
|
||||
elif test "$with_gnu_ld" = yes; then
|
||||
AC_MSG_CHECKING([for GNU ld])
|
||||
else
|
||||
AC_MSG_CHECKING([for non-GNU ld])
|
||||
fi
|
||||
AC_CACHE_VAL([acl_cv_path_LD],
|
||||
[if test -z "$LD"; then
|
||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
|
||||
for ac_dir in $PATH; do
|
||||
test -z "$ac_dir" && ac_dir=.
|
||||
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
|
||||
acl_cv_path_LD="$ac_dir/$ac_prog"
|
||||
# Check to see if the program is GNU ld. I'd rather use --version,
|
||||
# but apparently some GNU ld's only accept -v.
|
||||
# Break only if it was the GNU/non-GNU ld that we prefer.
|
||||
case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in
|
||||
*GNU* | *'with BFD'*)
|
||||
test "$with_gnu_ld" != no && break ;;
|
||||
*)
|
||||
test "$with_gnu_ld" != yes && break ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
IFS="$ac_save_ifs"
|
||||
else
|
||||
acl_cv_path_LD="$LD" # Let the user override the test with a path.
|
||||
fi])
|
||||
LD="$acl_cv_path_LD"
|
||||
if test -n "$LD"; then
|
||||
AC_MSG_RESULT([$LD])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
|
||||
AC_LIB_PROG_LD_GNU
|
||||
])
|
||||
@@ -0,0 +1,774 @@
|
||||
# lib-link.m4 serial 21 (gettext-0.18)
|
||||
dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
AC_PREREQ([2.54])
|
||||
|
||||
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
|
||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
||||
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
|
||||
dnl augments the CPPFLAGS variable.
|
||||
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
||||
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
||||
AC_DEFUN([AC_LIB_LINKFLAGS],
|
||||
[
|
||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||
AC_REQUIRE([AC_LIB_RPATH])
|
||||
pushdef([Name],[translit([$1],[./-], [___])])
|
||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||
AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
|
||||
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
||||
ac_cv_lib[]Name[]_libs="$LIB[]NAME"
|
||||
ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
|
||||
ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
|
||||
ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
|
||||
])
|
||||
LIB[]NAME="$ac_cv_lib[]Name[]_libs"
|
||||
LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
|
||||
INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
|
||||
LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
|
||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
||||
AC_SUBST([LIB]NAME)
|
||||
AC_SUBST([LTLIB]NAME)
|
||||
AC_SUBST([LIB]NAME[_PREFIX])
|
||||
dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
|
||||
dnl results of this search when this library appears as a dependency.
|
||||
HAVE_LIB[]NAME=yes
|
||||
popdef([NAME])
|
||||
popdef([Name])
|
||||
])
|
||||
|
||||
dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
|
||||
dnl searches for libname and the libraries corresponding to explicit and
|
||||
dnl implicit dependencies, together with the specified include files and
|
||||
dnl the ability to compile and link the specified testcode. The missing-message
|
||||
dnl defaults to 'no' and may contain additional hints for the user.
|
||||
dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
|
||||
dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
|
||||
dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
|
||||
dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
|
||||
dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
|
||||
dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
||||
AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
|
||||
[
|
||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||
AC_REQUIRE([AC_LIB_RPATH])
|
||||
pushdef([Name],[translit([$1],[./-], [___])])
|
||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||
|
||||
dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
|
||||
dnl accordingly.
|
||||
AC_LIB_LINKFLAGS_BODY([$1], [$2])
|
||||
|
||||
dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
|
||||
dnl because if the user has installed lib[]Name and not disabled its use
|
||||
dnl via --without-lib[]Name-prefix, he wants to use it.
|
||||
ac_save_CPPFLAGS="$CPPFLAGS"
|
||||
AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
|
||||
|
||||
AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
|
||||
ac_save_LIBS="$LIBS"
|
||||
dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
|
||||
dnl because these -l options might require -L options that are present in
|
||||
dnl LIBS. -l options benefit only from the -L options listed before it.
|
||||
dnl Otherwise, add it to the front of LIBS, because it may be a static
|
||||
dnl library that depends on another static library that is present in LIBS.
|
||||
dnl Static libraries benefit only from the static libraries listed after
|
||||
dnl it.
|
||||
case " $LIB[]NAME" in
|
||||
*" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
|
||||
*) LIBS="$LIB[]NAME $LIBS" ;;
|
||||
esac
|
||||
AC_TRY_LINK([$3], [$4],
|
||||
[ac_cv_lib[]Name=yes],
|
||||
[ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
|
||||
LIBS="$ac_save_LIBS"
|
||||
])
|
||||
if test "$ac_cv_lib[]Name" = yes; then
|
||||
HAVE_LIB[]NAME=yes
|
||||
AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
|
||||
AC_MSG_CHECKING([how to link with lib[]$1])
|
||||
AC_MSG_RESULT([$LIB[]NAME])
|
||||
else
|
||||
HAVE_LIB[]NAME=no
|
||||
dnl If $LIB[]NAME didn't lead to a usable library, we don't need
|
||||
dnl $INC[]NAME either.
|
||||
CPPFLAGS="$ac_save_CPPFLAGS"
|
||||
LIB[]NAME=
|
||||
LTLIB[]NAME=
|
||||
LIB[]NAME[]_PREFIX=
|
||||
fi
|
||||
AC_SUBST([HAVE_LIB]NAME)
|
||||
AC_SUBST([LIB]NAME)
|
||||
AC_SUBST([LTLIB]NAME)
|
||||
AC_SUBST([LIB]NAME[_PREFIX])
|
||||
popdef([NAME])
|
||||
popdef([Name])
|
||||
])
|
||||
|
||||
dnl Determine the platform dependent parameters needed to use rpath:
|
||||
dnl acl_libext,
|
||||
dnl acl_shlibext,
|
||||
dnl acl_hardcode_libdir_flag_spec,
|
||||
dnl acl_hardcode_libdir_separator,
|
||||
dnl acl_hardcode_direct,
|
||||
dnl acl_hardcode_minus_L.
|
||||
AC_DEFUN([AC_LIB_RPATH],
|
||||
[
|
||||
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
|
||||
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
|
||||
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
|
||||
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
|
||||
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
|
||||
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
|
||||
AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
|
||||
CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
|
||||
${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
|
||||
. ./conftest.sh
|
||||
rm -f ./conftest.sh
|
||||
acl_cv_rpath=done
|
||||
])
|
||||
wl="$acl_cv_wl"
|
||||
acl_libext="$acl_cv_libext"
|
||||
acl_shlibext="$acl_cv_shlibext"
|
||||
acl_libname_spec="$acl_cv_libname_spec"
|
||||
acl_library_names_spec="$acl_cv_library_names_spec"
|
||||
acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
|
||||
acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
|
||||
acl_hardcode_direct="$acl_cv_hardcode_direct"
|
||||
acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
|
||||
dnl Determine whether the user wants rpath handling at all.
|
||||
AC_ARG_ENABLE([rpath],
|
||||
[ --disable-rpath do not hardcode runtime library paths],
|
||||
:, enable_rpath=yes)
|
||||
])
|
||||
|
||||
dnl AC_LIB_FROMPACKAGE(name, package)
|
||||
dnl declares that libname comes from the given package. The configure file
|
||||
dnl will then not have a --with-libname-prefix option but a
|
||||
dnl --with-package-prefix option. Several libraries can come from the same
|
||||
dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
|
||||
dnl macro call that searches for libname.
|
||||
AC_DEFUN([AC_LIB_FROMPACKAGE],
|
||||
[
|
||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||
define([acl_frompackage_]NAME, [$2])
|
||||
popdef([NAME])
|
||||
pushdef([PACK],[$2])
|
||||
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
|
||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||
define([acl_libsinpackage_]PACKUP,
|
||||
m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
|
||||
popdef([PACKUP])
|
||||
popdef([PACK])
|
||||
])
|
||||
|
||||
dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
|
||||
dnl the libraries corresponding to explicit and implicit dependencies.
|
||||
dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
|
||||
dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
|
||||
dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
|
||||
AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
|
||||
[
|
||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
||||
pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
|
||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||
pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
|
||||
pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
|
||||
[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
|
||||
pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
|
||||
dnl Autoconf >= 2.61 supports dots in --with options.
|
||||
pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
|
||||
dnl By default, look in $includedir and $libdir.
|
||||
use_additional=yes
|
||||
AC_LIB_WITH_FINAL_PREFIX([
|
||||
eval additional_includedir=\"$includedir\"
|
||||
eval additional_libdir=\"$libdir\"
|
||||
])
|
||||
AC_ARG_WITH(P_A_C_K[-prefix],
|
||||
[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
|
||||
--without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
|
||||
[
|
||||
if test "X$withval" = "Xno"; then
|
||||
use_additional=no
|
||||
else
|
||||
if test "X$withval" = "X"; then
|
||||
AC_LIB_WITH_FINAL_PREFIX([
|
||||
eval additional_includedir=\"$includedir\"
|
||||
eval additional_libdir=\"$libdir\"
|
||||
])
|
||||
else
|
||||
additional_includedir="$withval/include"
|
||||
additional_libdir="$withval/$acl_libdirstem"
|
||||
if test "$acl_libdirstem2" != "$acl_libdirstem" \
|
||||
&& ! test -d "$withval/$acl_libdirstem"; then
|
||||
additional_libdir="$withval/$acl_libdirstem2"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
])
|
||||
dnl Search the library and its dependencies in $additional_libdir and
|
||||
dnl $LDFLAGS. Using breadth-first-seach.
|
||||
LIB[]NAME=
|
||||
LTLIB[]NAME=
|
||||
INC[]NAME=
|
||||
LIB[]NAME[]_PREFIX=
|
||||
dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
|
||||
dnl computed. So it has to be reset here.
|
||||
HAVE_LIB[]NAME=
|
||||
rpathdirs=
|
||||
ltrpathdirs=
|
||||
names_already_handled=
|
||||
names_next_round='$1 $2'
|
||||
while test -n "$names_next_round"; do
|
||||
names_this_round="$names_next_round"
|
||||
names_next_round=
|
||||
for name in $names_this_round; do
|
||||
already_handled=
|
||||
for n in $names_already_handled; do
|
||||
if test "$n" = "$name"; then
|
||||
already_handled=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$already_handled"; then
|
||||
names_already_handled="$names_already_handled $name"
|
||||
dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
|
||||
dnl or AC_LIB_HAVE_LINKFLAGS call.
|
||||
uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'`
|
||||
eval value=\"\$HAVE_LIB$uppername\"
|
||||
if test -n "$value"; then
|
||||
if test "$value" = yes; then
|
||||
eval value=\"\$LIB$uppername\"
|
||||
test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
|
||||
eval value=\"\$LTLIB$uppername\"
|
||||
test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
|
||||
else
|
||||
dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
|
||||
dnl that this library doesn't exist. So just drop it.
|
||||
:
|
||||
fi
|
||||
else
|
||||
dnl Search the library lib$name in $additional_libdir and $LDFLAGS
|
||||
dnl and the already constructed $LIBNAME/$LTLIBNAME.
|
||||
found_dir=
|
||||
found_la=
|
||||
found_so=
|
||||
found_a=
|
||||
eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
|
||||
if test -n "$acl_shlibext"; then
|
||||
shrext=".$acl_shlibext" # typically: shrext=.so
|
||||
else
|
||||
shrext=
|
||||
fi
|
||||
if test $use_additional = yes; then
|
||||
dir="$additional_libdir"
|
||||
dnl The same code as in the loop below:
|
||||
dnl First look for a shared library.
|
||||
if test -n "$acl_shlibext"; then
|
||||
if test -f "$dir/$libname$shrext"; then
|
||||
found_dir="$dir"
|
||||
found_so="$dir/$libname$shrext"
|
||||
else
|
||||
if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
||||
ver=`(cd "$dir" && \
|
||||
for f in "$libname$shrext".*; do echo "$f"; done \
|
||||
| sed -e "s,^$libname$shrext\\\\.,," \
|
||||
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
||||
| sed 1q ) 2>/dev/null`
|
||||
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
||||
found_dir="$dir"
|
||||
found_so="$dir/$libname$shrext.$ver"
|
||||
fi
|
||||
else
|
||||
eval library_names=\"$acl_library_names_spec\"
|
||||
for f in $library_names; do
|
||||
if test -f "$dir/$f"; then
|
||||
found_dir="$dir"
|
||||
found_so="$dir/$f"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
dnl Then look for a static library.
|
||||
if test "X$found_dir" = "X"; then
|
||||
if test -f "$dir/$libname.$acl_libext"; then
|
||||
found_dir="$dir"
|
||||
found_a="$dir/$libname.$acl_libext"
|
||||
fi
|
||||
fi
|
||||
if test "X$found_dir" != "X"; then
|
||||
if test -f "$dir/$libname.la"; then
|
||||
found_la="$dir/$libname.la"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test "X$found_dir" = "X"; then
|
||||
for x in $LDFLAGS $LTLIB[]NAME; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
case "$x" in
|
||||
-L*)
|
||||
dir=`echo "X$x" | sed -e 's/^X-L//'`
|
||||
dnl First look for a shared library.
|
||||
if test -n "$acl_shlibext"; then
|
||||
if test -f "$dir/$libname$shrext"; then
|
||||
found_dir="$dir"
|
||||
found_so="$dir/$libname$shrext"
|
||||
else
|
||||
if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
|
||||
ver=`(cd "$dir" && \
|
||||
for f in "$libname$shrext".*; do echo "$f"; done \
|
||||
| sed -e "s,^$libname$shrext\\\\.,," \
|
||||
| sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
|
||||
| sed 1q ) 2>/dev/null`
|
||||
if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
|
||||
found_dir="$dir"
|
||||
found_so="$dir/$libname$shrext.$ver"
|
||||
fi
|
||||
else
|
||||
eval library_names=\"$acl_library_names_spec\"
|
||||
for f in $library_names; do
|
||||
if test -f "$dir/$f"; then
|
||||
found_dir="$dir"
|
||||
found_so="$dir/$f"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
dnl Then look for a static library.
|
||||
if test "X$found_dir" = "X"; then
|
||||
if test -f "$dir/$libname.$acl_libext"; then
|
||||
found_dir="$dir"
|
||||
found_a="$dir/$libname.$acl_libext"
|
||||
fi
|
||||
fi
|
||||
if test "X$found_dir" != "X"; then
|
||||
if test -f "$dir/$libname.la"; then
|
||||
found_la="$dir/$libname.la"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if test "X$found_dir" != "X"; then
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if test "X$found_dir" != "X"; then
|
||||
dnl Found the library.
|
||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
|
||||
if test "X$found_so" != "X"; then
|
||||
dnl Linking with a shared library. We attempt to hardcode its
|
||||
dnl directory into the executable's runpath, unless it's the
|
||||
dnl standard /usr/lib.
|
||||
if test "$enable_rpath" = no \
|
||||
|| test "X$found_dir" = "X/usr/$acl_libdirstem" \
|
||||
|| test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
|
||||
dnl No hardcoding is needed.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||
else
|
||||
dnl Use an explicit option to hardcode DIR into the resulting
|
||||
dnl binary.
|
||||
dnl Potentially add DIR to ltrpathdirs.
|
||||
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
||||
haveit=
|
||||
for x in $ltrpathdirs; do
|
||||
if test "X$x" = "X$found_dir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
ltrpathdirs="$ltrpathdirs $found_dir"
|
||||
fi
|
||||
dnl The hardcoding into $LIBNAME is system dependent.
|
||||
if test "$acl_hardcode_direct" = yes; then
|
||||
dnl Using DIR/libNAME.so during linking hardcodes DIR into the
|
||||
dnl resulting binary.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||
else
|
||||
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
||||
dnl Use an explicit option to hardcode DIR into the resulting
|
||||
dnl binary.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||
dnl Potentially add DIR to rpathdirs.
|
||||
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
||||
haveit=
|
||||
for x in $rpathdirs; do
|
||||
if test "X$x" = "X$found_dir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
rpathdirs="$rpathdirs $found_dir"
|
||||
fi
|
||||
else
|
||||
dnl Rely on "-L$found_dir".
|
||||
dnl But don't add it if it's already contained in the LDFLAGS
|
||||
dnl or the already constructed $LIBNAME
|
||||
haveit=
|
||||
for x in $LDFLAGS $LIB[]NAME; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X-L$found_dir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
|
||||
fi
|
||||
if test "$acl_hardcode_minus_L" != no; then
|
||||
dnl FIXME: Not sure whether we should use
|
||||
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
||||
dnl here.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
|
||||
else
|
||||
dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
|
||||
dnl here, because this doesn't fit in flags passed to the
|
||||
dnl compiler. So give up. No hardcoding. This affects only
|
||||
dnl very old systems.
|
||||
dnl FIXME: Not sure whether we should use
|
||||
dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
|
||||
dnl here.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
else
|
||||
if test "X$found_a" != "X"; then
|
||||
dnl Linking with a static library.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
|
||||
else
|
||||
dnl We shouldn't come here, but anyway it's good to have a
|
||||
dnl fallback.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
|
||||
fi
|
||||
fi
|
||||
dnl Assume the include files are nearby.
|
||||
additional_includedir=
|
||||
case "$found_dir" in
|
||||
*/$acl_libdirstem | */$acl_libdirstem/)
|
||||
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
|
||||
if test "$name" = '$1'; then
|
||||
LIB[]NAME[]_PREFIX="$basedir"
|
||||
fi
|
||||
additional_includedir="$basedir/include"
|
||||
;;
|
||||
*/$acl_libdirstem2 | */$acl_libdirstem2/)
|
||||
basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
|
||||
if test "$name" = '$1'; then
|
||||
LIB[]NAME[]_PREFIX="$basedir"
|
||||
fi
|
||||
additional_includedir="$basedir/include"
|
||||
;;
|
||||
esac
|
||||
if test "X$additional_includedir" != "X"; then
|
||||
dnl Potentially add $additional_includedir to $INCNAME.
|
||||
dnl But don't add it
|
||||
dnl 1. if it's the standard /usr/include,
|
||||
dnl 2. if it's /usr/local/include and we are using GCC on Linux,
|
||||
dnl 3. if it's already present in $CPPFLAGS or the already
|
||||
dnl constructed $INCNAME,
|
||||
dnl 4. if it doesn't exist as a directory.
|
||||
if test "X$additional_includedir" != "X/usr/include"; then
|
||||
haveit=
|
||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
||||
if test -n "$GCC"; then
|
||||
case $host_os in
|
||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
if test -z "$haveit"; then
|
||||
for x in $CPPFLAGS $INC[]NAME; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X-I$additional_includedir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
if test -d "$additional_includedir"; then
|
||||
dnl Really add $additional_includedir to $INCNAME.
|
||||
INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
dnl Look for dependencies.
|
||||
if test -n "$found_la"; then
|
||||
dnl Read the .la file. It defines the variables
|
||||
dnl dlname, library_names, old_library, dependency_libs, current,
|
||||
dnl age, revision, installed, dlopen, dlpreopen, libdir.
|
||||
save_libdir="$libdir"
|
||||
case "$found_la" in
|
||||
*/* | *\\*) . "$found_la" ;;
|
||||
*) . "./$found_la" ;;
|
||||
esac
|
||||
libdir="$save_libdir"
|
||||
dnl We use only dependency_libs.
|
||||
for dep in $dependency_libs; do
|
||||
case "$dep" in
|
||||
-L*)
|
||||
additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
|
||||
dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
|
||||
dnl But don't add it
|
||||
dnl 1. if it's the standard /usr/lib,
|
||||
dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
|
||||
dnl 3. if it's already present in $LDFLAGS or the already
|
||||
dnl constructed $LIBNAME,
|
||||
dnl 4. if it doesn't exist as a directory.
|
||||
if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
|
||||
&& test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
|
||||
haveit=
|
||||
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
|
||||
|| test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
|
||||
if test -n "$GCC"; then
|
||||
case $host_os in
|
||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
if test -z "$haveit"; then
|
||||
haveit=
|
||||
for x in $LDFLAGS $LIB[]NAME; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X-L$additional_libdir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
if test -d "$additional_libdir"; then
|
||||
dnl Really add $additional_libdir to $LIBNAME.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
|
||||
fi
|
||||
fi
|
||||
haveit=
|
||||
for x in $LDFLAGS $LTLIB[]NAME; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X-L$additional_libdir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
if test -d "$additional_libdir"; then
|
||||
dnl Really add $additional_libdir to $LTLIBNAME.
|
||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
-R*)
|
||||
dir=`echo "X$dep" | sed -e 's/^X-R//'`
|
||||
if test "$enable_rpath" != no; then
|
||||
dnl Potentially add DIR to rpathdirs.
|
||||
dnl The rpathdirs will be appended to $LIBNAME at the end.
|
||||
haveit=
|
||||
for x in $rpathdirs; do
|
||||
if test "X$x" = "X$dir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
rpathdirs="$rpathdirs $dir"
|
||||
fi
|
||||
dnl Potentially add DIR to ltrpathdirs.
|
||||
dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
|
||||
haveit=
|
||||
for x in $ltrpathdirs; do
|
||||
if test "X$x" = "X$dir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
ltrpathdirs="$ltrpathdirs $dir"
|
||||
fi
|
||||
fi
|
||||
;;
|
||||
-l*)
|
||||
dnl Handle this in the next round.
|
||||
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
|
||||
;;
|
||||
*.la)
|
||||
dnl Handle this in the next round. Throw away the .la's
|
||||
dnl directory; it is already contained in a preceding -L
|
||||
dnl option.
|
||||
names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
|
||||
;;
|
||||
*)
|
||||
dnl Most likely an immediate library name.
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
|
||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
else
|
||||
dnl Didn't find the library; assume it is in the system directories
|
||||
dnl known to the linker and runtime loader. (All the system
|
||||
dnl directories known to the linker should also be known to the
|
||||
dnl runtime loader, otherwise the system is severely misconfigured.)
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
|
||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
done
|
||||
if test "X$rpathdirs" != "X"; then
|
||||
if test -n "$acl_hardcode_libdir_separator"; then
|
||||
dnl Weird platform: only the last -rpath option counts, the user must
|
||||
dnl pass all path elements in one option. We can arrange that for a
|
||||
dnl single library, but not when more than one $LIBNAMEs are used.
|
||||
alldirs=
|
||||
for found_dir in $rpathdirs; do
|
||||
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
|
||||
done
|
||||
dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
|
||||
acl_save_libdir="$libdir"
|
||||
libdir="$alldirs"
|
||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||
libdir="$acl_save_libdir"
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
||||
else
|
||||
dnl The -rpath options are cumulative.
|
||||
for found_dir in $rpathdirs; do
|
||||
acl_save_libdir="$libdir"
|
||||
libdir="$found_dir"
|
||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||
libdir="$acl_save_libdir"
|
||||
LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
if test "X$ltrpathdirs" != "X"; then
|
||||
dnl When using libtool, the option that works for both libraries and
|
||||
dnl executables is -R. The -R options are cumulative.
|
||||
for found_dir in $ltrpathdirs; do
|
||||
LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
|
||||
done
|
||||
fi
|
||||
popdef([P_A_C_K])
|
||||
popdef([PACKLIBS])
|
||||
popdef([PACKUP])
|
||||
popdef([PACK])
|
||||
popdef([NAME])
|
||||
])
|
||||
|
||||
dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
|
||||
dnl unless already present in VAR.
|
||||
dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
|
||||
dnl contains two or three consecutive elements that belong together.
|
||||
AC_DEFUN([AC_LIB_APPENDTOVAR],
|
||||
[
|
||||
for element in [$2]; do
|
||||
haveit=
|
||||
for x in $[$1]; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X$element"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
[$1]="${[$1]}${[$1]:+ }$element"
|
||||
fi
|
||||
done
|
||||
])
|
||||
|
||||
dnl For those cases where a variable contains several -L and -l options
|
||||
dnl referring to unknown libraries and directories, this macro determines the
|
||||
dnl necessary additional linker options for the runtime path.
|
||||
dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
|
||||
dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
|
||||
dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
|
||||
dnl otherwise linking without libtool is assumed.
|
||||
AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
|
||||
[
|
||||
AC_REQUIRE([AC_LIB_RPATH])
|
||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
||||
$1=
|
||||
if test "$enable_rpath" != no; then
|
||||
if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
|
||||
dnl Use an explicit option to hardcode directories into the resulting
|
||||
dnl binary.
|
||||
rpathdirs=
|
||||
next=
|
||||
for opt in $2; do
|
||||
if test -n "$next"; then
|
||||
dir="$next"
|
||||
dnl No need to hardcode the standard /usr/lib.
|
||||
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
||||
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
||||
rpathdirs="$rpathdirs $dir"
|
||||
fi
|
||||
next=
|
||||
else
|
||||
case $opt in
|
||||
-L) next=yes ;;
|
||||
-L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
|
||||
dnl No need to hardcode the standard /usr/lib.
|
||||
if test "X$dir" != "X/usr/$acl_libdirstem" \
|
||||
&& test "X$dir" != "X/usr/$acl_libdirstem2"; then
|
||||
rpathdirs="$rpathdirs $dir"
|
||||
fi
|
||||
next= ;;
|
||||
*) next= ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
if test "X$rpathdirs" != "X"; then
|
||||
if test -n ""$3""; then
|
||||
dnl libtool is used for linking. Use -R options.
|
||||
for dir in $rpathdirs; do
|
||||
$1="${$1}${$1:+ }-R$dir"
|
||||
done
|
||||
else
|
||||
dnl The linker is used for linking directly.
|
||||
if test -n "$acl_hardcode_libdir_separator"; then
|
||||
dnl Weird platform: only the last -rpath option counts, the user
|
||||
dnl must pass all path elements in one option.
|
||||
alldirs=
|
||||
for dir in $rpathdirs; do
|
||||
alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
|
||||
done
|
||||
acl_save_libdir="$libdir"
|
||||
libdir="$alldirs"
|
||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||
libdir="$acl_save_libdir"
|
||||
$1="$flag"
|
||||
else
|
||||
dnl The -rpath options are cumulative.
|
||||
for dir in $rpathdirs; do
|
||||
acl_save_libdir="$libdir"
|
||||
libdir="$dir"
|
||||
eval flag=\"$acl_hardcode_libdir_flag_spec\"
|
||||
libdir="$acl_save_libdir"
|
||||
$1="${$1}${$1:+ }$flag"
|
||||
done
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
AC_SUBST([$1])
|
||||
])
|
||||
@@ -0,0 +1,224 @@
|
||||
# lib-prefix.m4 serial 7 (gettext-0.18)
|
||||
dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
|
||||
dnl This file is free software; the Free Software Foundation
|
||||
dnl gives unlimited permission to copy and/or distribute it,
|
||||
dnl with or without modifications, as long as this notice is preserved.
|
||||
|
||||
dnl From Bruno Haible.
|
||||
|
||||
dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and
|
||||
dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
|
||||
dnl require excessive bracketing.
|
||||
ifdef([AC_HELP_STRING],
|
||||
[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
|
||||
[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
|
||||
|
||||
dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
|
||||
dnl to access previously installed libraries. The basic assumption is that
|
||||
dnl a user will want packages to use other packages he previously installed
|
||||
dnl with the same --prefix option.
|
||||
dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
|
||||
dnl libraries, but is otherwise very convenient.
|
||||
AC_DEFUN([AC_LIB_PREFIX],
|
||||
[
|
||||
AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
|
||||
AC_REQUIRE([AC_PROG_CC])
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
|
||||
AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
|
||||
dnl By default, look in $includedir and $libdir.
|
||||
use_additional=yes
|
||||
AC_LIB_WITH_FINAL_PREFIX([
|
||||
eval additional_includedir=\"$includedir\"
|
||||
eval additional_libdir=\"$libdir\"
|
||||
])
|
||||
AC_LIB_ARG_WITH([lib-prefix],
|
||||
[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
|
||||
--without-lib-prefix don't search for libraries in includedir and libdir],
|
||||
[
|
||||
if test "X$withval" = "Xno"; then
|
||||
use_additional=no
|
||||
else
|
||||
if test "X$withval" = "X"; then
|
||||
AC_LIB_WITH_FINAL_PREFIX([
|
||||
eval additional_includedir=\"$includedir\"
|
||||
eval additional_libdir=\"$libdir\"
|
||||
])
|
||||
else
|
||||
additional_includedir="$withval/include"
|
||||
additional_libdir="$withval/$acl_libdirstem"
|
||||
fi
|
||||
fi
|
||||
])
|
||||
if test $use_additional = yes; then
|
||||
dnl Potentially add $additional_includedir to $CPPFLAGS.
|
||||
dnl But don't add it
|
||||
dnl 1. if it's the standard /usr/include,
|
||||
dnl 2. if it's already present in $CPPFLAGS,
|
||||
dnl 3. if it's /usr/local/include and we are using GCC on Linux,
|
||||
dnl 4. if it doesn't exist as a directory.
|
||||
if test "X$additional_includedir" != "X/usr/include"; then
|
||||
haveit=
|
||||
for x in $CPPFLAGS; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X-I$additional_includedir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
if test "X$additional_includedir" = "X/usr/local/include"; then
|
||||
if test -n "$GCC"; then
|
||||
case $host_os in
|
||||
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
if test -z "$haveit"; then
|
||||
if test -d "$additional_includedir"; then
|
||||
dnl Really add $additional_includedir to $CPPFLAGS.
|
||||
CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
dnl Potentially add $additional_libdir to $LDFLAGS.
|
||||
dnl But don't add it
|
||||
dnl 1. if it's the standard /usr/lib,
|
||||
dnl 2. if it's already present in $LDFLAGS,
|
||||
dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
|
||||
dnl 4. if it doesn't exist as a directory.
|
||||
if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
|
||||
haveit=
|
||||
for x in $LDFLAGS; do
|
||||
AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
|
||||
if test "X$x" = "X-L$additional_libdir"; then
|
||||
haveit=yes
|
||||
break
|
||||
fi
|
||||
done
|
||||
if test -z "$haveit"; then
|
||||
if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
|
||||
if test -n "$GCC"; then
|
||||
case $host_os in
|
||||
linux*) haveit=yes;;
|
||||
esac
|
||||
fi
|
||||
fi
|
||||
if test -z "$haveit"; then
|
||||
if test -d "$additional_libdir"; then
|
||||
dnl Really add $additional_libdir to $LDFLAGS.
|
||||
LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
])
|
||||
|
||||
dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
|
||||
dnl acl_final_exec_prefix, containing the values to which $prefix and
|
||||
dnl $exec_prefix will expand at the end of the configure script.
|
||||
AC_DEFUN([AC_LIB_PREPARE_PREFIX],
|
||||
[
|
||||
dnl Unfortunately, prefix and exec_prefix get only finally determined
|
||||
dnl at the end of configure.
|
||||
if test "X$prefix" = "XNONE"; then
|
||||
acl_final_prefix="$ac_default_prefix"
|
||||
else
|
||||
acl_final_prefix="$prefix"
|
||||
fi
|
||||
if test "X$exec_prefix" = "XNONE"; then
|
||||
acl_final_exec_prefix='${prefix}'
|
||||
else
|
||||
acl_final_exec_prefix="$exec_prefix"
|
||||
fi
|
||||
acl_save_prefix="$prefix"
|
||||
prefix="$acl_final_prefix"
|
||||
eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
|
||||
prefix="$acl_save_prefix"
|
||||
])
|
||||
|
||||
dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
|
||||
dnl variables prefix and exec_prefix bound to the values they will have
|
||||
dnl at the end of the configure script.
|
||||
AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
|
||||
[
|
||||
acl_save_prefix="$prefix"
|
||||
prefix="$acl_final_prefix"
|
||||
acl_save_exec_prefix="$exec_prefix"
|
||||
exec_prefix="$acl_final_exec_prefix"
|
||||
$1
|
||||
exec_prefix="$acl_save_exec_prefix"
|
||||
prefix="$acl_save_prefix"
|
||||
])
|
||||
|
||||
dnl AC_LIB_PREPARE_MULTILIB creates
|
||||
dnl - a variable acl_libdirstem, containing the basename of the libdir, either
|
||||
dnl "lib" or "lib64" or "lib/64",
|
||||
dnl - a variable acl_libdirstem2, as a secondary possible value for
|
||||
dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
|
||||
dnl "lib/amd64".
|
||||
AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
|
||||
[
|
||||
dnl There is no formal standard regarding lib and lib64.
|
||||
dnl On glibc systems, the current practice is that on a system supporting
|
||||
dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
|
||||
dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
|
||||
dnl the compiler's default mode by looking at the compiler's library search
|
||||
dnl path. If at least one of its elements ends in /lib64 or points to a
|
||||
dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
|
||||
dnl Otherwise we use the default, namely "lib".
|
||||
dnl On Solaris systems, the current practice is that on a system supporting
|
||||
dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
|
||||
dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
|
||||
dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
|
||||
AC_REQUIRE([AC_CANONICAL_HOST])
|
||||
acl_libdirstem=lib
|
||||
acl_libdirstem2=
|
||||
case "$host_os" in
|
||||
solaris*)
|
||||
dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
|
||||
dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
|
||||
dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
|
||||
dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
|
||||
dnl symlink is missing, so we set acl_libdirstem2 too.
|
||||
AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
|
||||
[AC_EGREP_CPP([sixtyfour bits], [
|
||||
#ifdef _LP64
|
||||
sixtyfour bits
|
||||
#endif
|
||||
], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
|
||||
])
|
||||
if test $gl_cv_solaris_64bit = yes; then
|
||||
acl_libdirstem=lib/64
|
||||
case "$host_cpu" in
|
||||
sparc*) acl_libdirstem2=lib/sparcv9 ;;
|
||||
i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
|
||||
esac
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
|
||||
if test -n "$searchpath"; then
|
||||
acl_save_IFS="${IFS= }"; IFS=":"
|
||||
for searchdir in $searchpath; do
|
||||
if test -d "$searchdir"; then
|
||||
case "$searchdir" in
|
||||
*/lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
|
||||
*/../ | */.. )
|
||||
# Better ignore directories of this form. They are misleading.
|
||||
;;
|
||||
*) searchdir=`cd "$searchdir" && pwd`
|
||||
case "$searchdir" in
|
||||
*/lib64 ) acl_libdirstem=lib64 ;;
|
||||
esac ;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
IFS="$acl_save_IFS"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
|
||||
])
|
||||
File renamed without changes.
@@ -0,0 +1,65 @@
|
||||
noinst_LTLIBRARIES = libeglib.la
|
||||
|
||||
AM_CFLAGS = $(WERROR_CFLAGS)
|
||||
|
||||
win_files = \
|
||||
eglib-config.hw \
|
||||
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
|
||||
gmodule-win32.c gmodule-win32-internals.h gtimer-win32.c gunicode-win32.c
|
||||
|
||||
unix_files = \
|
||||
gdate-unix.c gdir-unix.c gfile-unix.c gmisc-unix.c \
|
||||
gmodule-unix.c gtimer-unix.c
|
||||
|
||||
if HOST_WIN32
|
||||
os_files = $(win_files)
|
||||
else
|
||||
os_files = $(unix_files)
|
||||
endif
|
||||
|
||||
libeglib_la_SOURCES = \
|
||||
eglib-remap.h \
|
||||
sort.frag.h \
|
||||
glib.h \
|
||||
garray.c \
|
||||
gbytearray.c \
|
||||
gerror.c \
|
||||
ghashtable.c \
|
||||
giconv.c \
|
||||
gmem.c \
|
||||
gmodule.h \
|
||||
goutput.c \
|
||||
gqsort.c \
|
||||
gstr.c \
|
||||
gslist.c \
|
||||
gstring.c \
|
||||
gptrarray.c \
|
||||
glist.c \
|
||||
gqueue.c \
|
||||
gpath.c \
|
||||
gshell.c \
|
||||
gspawn.c \
|
||||
gfile.c \
|
||||
gfile-posix.c \
|
||||
gpattern.c \
|
||||
gmarkup.c \
|
||||
gutf8.c \
|
||||
gunicode.c \
|
||||
unicode-data.h \
|
||||
$(os_files)
|
||||
|
||||
libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2
|
||||
|
||||
AM_CPPFLAGS = -I$(srcdir)
|
||||
|
||||
if HOST_WIN32
|
||||
libeglib_la_LIBADD = -lm $(LIBICONV) -lpsapi
|
||||
else
|
||||
if PLATFORM_ANDROID
|
||||
libeglib_la_LIBADD = -llog
|
||||
endif
|
||||
endif
|
||||
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
|
||||
EXTRA_DIST = eglib-config.h.in $(win_files) $(unix_files)
|
||||
@@ -0,0 +1,42 @@
|
||||
#ifndef __EGLIB_CONFIG_H
|
||||
#define __EGLIB_CONFIG_H
|
||||
|
||||
/*
|
||||
* System-dependent settings
|
||||
*/
|
||||
#define G_GNUC_PRETTY_FUNCTION @GNUC_PRETTY@
|
||||
#define G_GNUC_UNUSED @GNUC_UNUSED@
|
||||
#define G_BYTE_ORDER @ORDER@
|
||||
#define G_GNUC_NORETURN @GNUC_NORETURN@
|
||||
#define G_SEARCHPATH_SEPARATOR_S "@SEARCHSEP@"
|
||||
#define G_SEARCHPATH_SEPARATOR '@SEARCHSEP@'
|
||||
#define G_DIR_SEPARATOR '@PATHSEP@'
|
||||
#define G_DIR_SEPARATOR_S "@PATHSEP@"
|
||||
#define G_BREAKPOINT() @BREAKPOINT@
|
||||
#define G_OS_@OS@
|
||||
#define GPOINTER_TO_INT(ptr) @GPOINTER_TO_INT@
|
||||
#define GPOINTER_TO_UINT(ptr) @GPOINTER_TO_UINT@
|
||||
#define GINT_TO_POINTER(v) @GINT_TO_POINTER@
|
||||
#define GUINT_TO_POINTER(v) @GUINT_TO_POINTER@
|
||||
|
||||
#if @HAVE_ALLOCA_H@ == 1
|
||||
#define G_HAVE_ALLOCA_H
|
||||
#endif
|
||||
|
||||
typedef unsigned @GSIZE@ gsize;
|
||||
typedef signed @GSIZE@ gssize;
|
||||
|
||||
#define G_GSIZE_FORMAT @GSIZE_FORMAT@
|
||||
|
||||
#if @G_HAVE_ISO_VARARGS@ == 1
|
||||
#define G_HAVE_ISO_VARARGS
|
||||
#endif
|
||||
|
||||
#if defined (__native_client__) || defined (HOST_WATCHOS)
|
||||
#undef G_BREAKPOINT
|
||||
#define G_BREAKPOINT()
|
||||
#endif
|
||||
|
||||
typedef @PIDTYPE@ GPid;
|
||||
|
||||
#endif
|
||||
@@ -0,0 +1,63 @@
|
||||
#ifndef __EGLIB_CONFIG_H
|
||||
#define __EGLIB_CONFIG_H
|
||||
|
||||
/*
|
||||
* System-dependent settings
|
||||
*/
|
||||
#define G_OS_WIN32 1
|
||||
|
||||
#ifdef _MSC_VER
|
||||
|
||||
#include <io.h>
|
||||
|
||||
#define G_GNUC_PRETTY_FUNCTION __FUNCTION__
|
||||
#define G_GNUC_UNUSED
|
||||
#define G_BYTE_ORDER 1234
|
||||
#define G_GNUC_NORETURN
|
||||
#define G_BREAKPOINT() __debugbreak()
|
||||
#define MAXPATHLEN 242
|
||||
|
||||
typedef uintptr_t gsize;
|
||||
typedef intptr_t gssize;
|
||||
typedef int pid_t;
|
||||
|
||||
#define G_DIR_SEPARATOR '\\'
|
||||
#define G_DIR_SEPARATOR_S "\\"
|
||||
#define G_SEARCHPATH_SEPARATOR_S ";"
|
||||
#define G_SEARCHPATH_SEPARATOR ';'
|
||||
#define G_GSIZE_FORMAT "d"
|
||||
#define GPOINTER_TO_INT(ptr) ((gint)(intptr_t) (ptr))
|
||||
#define GPOINTER_TO_UINT(ptr) ((guint)(intptr_t) (ptr))
|
||||
#define GINT_TO_POINTER(v) ((gpointer)(intptr_t) (v))
|
||||
#define GUINT_TO_POINTER(v) ((gpointer)(intptr_t) (v))
|
||||
|
||||
#define STDOUT_FILENO (int)(intptr_t)stdout
|
||||
#define STDERR_FILENO (int)(intptr_t)stderr
|
||||
|
||||
/* FIXME: what should this be ?*/
|
||||
#define X_OK 4 /* This is really read */
|
||||
#define WNOHANG 1
|
||||
#define F_SETFD 1
|
||||
#define FD_CLOEXEC 1
|
||||
|
||||
#undef inline
|
||||
#define inline __inline
|
||||
|
||||
#define strtok_r strtok_s
|
||||
|
||||
#undef G_HAVE_UNISTD_H
|
||||
#undef G_HAVE_SYS_TIME_H
|
||||
#undef G_HAVE_SYS_WAIT_H
|
||||
#undef G_HAVE_PWD_H
|
||||
#undef G_HAVE_STRNDUP
|
||||
#define G_HAVE_GETOPT_H 1
|
||||
|
||||
/* disable the following warnings
|
||||
* C4100: The formal parameter is not referenced in the body of the function. The unreferenced parameter is ignored.
|
||||
* C4127: conditional expression is constant
|
||||
*/
|
||||
#pragma warning(disable:4100 4127)
|
||||
#endif
|
||||
|
||||
typedef void * GPid;
|
||||
#endif
|
||||
@@ -1,11 +1,3 @@
|
||||
#undef g_malloc
|
||||
#undef g_realloc
|
||||
#undef g_malloc0
|
||||
#undef g_calloc
|
||||
#undef g_try_malloc
|
||||
#undef g_try_realloc
|
||||
#undef g_memdup
|
||||
|
||||
#define g_array_append monoeg_g_array_append
|
||||
#define g_array_append_vals monoeg_g_array_append_vals
|
||||
#define g_array_free monoeg_g_array_free
|
||||
@@ -137,7 +129,6 @@
|
||||
#define g_printerr monoeg_g_printerr
|
||||
#define g_propagate_error monoeg_g_propagate_error
|
||||
#define g_ptr_array_add monoeg_g_ptr_array_add
|
||||
#define g_ptr_array_capacity monoeg_g_ptr_array_capacity
|
||||
#define g_ptr_array_foreach monoeg_g_ptr_array_foreach
|
||||
#define g_ptr_array_free monoeg_g_ptr_array_free
|
||||
#define g_ptr_array_new monoeg_g_ptr_array_new
|
||||
@@ -213,9 +204,12 @@
|
||||
#define g_string_append_unichar monoeg_g_string_append_unichar
|
||||
#define g_string_append_printf monoeg_g_string_append_printf
|
||||
#define g_string_append_vprintf monoeg_g_string_append_vprintf
|
||||
#define g_string_erase monoeg_g_string_erase
|
||||
#define g_string_free monoeg_g_string_free
|
||||
#define g_string_insert monoeg_g_string_insert
|
||||
#define g_string_new monoeg_g_string_new
|
||||
#define g_string_new_len monoeg_g_string_new_len
|
||||
#define g_string_prepend monoeg_g_string_prepend
|
||||
#define g_string_printf monoeg_g_string_printf
|
||||
#define g_string_set_size monoeg_g_string_set_size
|
||||
#define g_string_sized_new monoeg_g_string_sized_new
|
||||
@@ -248,9 +242,6 @@
|
||||
#define g_usleep monoeg_g_usleep
|
||||
#define g_utf16_to_ucs4 monoeg_g_utf16_to_ucs4
|
||||
#define g_utf16_to_utf8 monoeg_g_utf16_to_utf8
|
||||
#define g_utf16_ascii_equal monoeg_g_utf16_ascii_equal
|
||||
#define g_utf16_asciiz_equal monoeg_g_utf16_asciiz_equal
|
||||
#define g_utf8_jump_table monoeg_g_utf8_jump_table
|
||||
#define g_utf8_get_char monoeg_g_utf8_get_char
|
||||
#define g_utf8_offset_to_pointer monoeg_g_utf8_offset_to_pointer
|
||||
#define g_utf8_pointer_to_offset monoeg_g_utf8_pointer_to_offset
|
||||
@@ -269,7 +260,6 @@
|
||||
#define g_vasprintf monoeg_g_vasprintf
|
||||
#define g_win32_getlocale monoeg_g_win32_getlocale
|
||||
#define g_assertion_message monoeg_assertion_message
|
||||
#define g_get_assertion_message monoeg_get_assertion_message
|
||||
#define g_malloc monoeg_malloc
|
||||
#define g_malloc0 monoeg_malloc0
|
||||
#define g_ptr_array_grow monoeg_ptr_array_grow
|
||||
@@ -286,7 +276,9 @@
|
||||
#define g_unichar_break_type monoeg_unichar_break_type
|
||||
#define g_unichar_isspace monoeg_unichar_isspace
|
||||
#define g_unichar_to_utf16 monoeg_unichar_to_utf16
|
||||
#define g_utf8_find_prev_char monoeg_utf8_find_prev_char
|
||||
#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
|
||||
|
||||
|
||||
@@ -294,5 +286,3 @@
|
||||
#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
|
||||
|
||||
#define g_size_to_int monoeg_size_to_int
|
||||
@@ -25,7 +25,7 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
|
||||
GByteArray *
|
||||
g_byte_array_new (void)
|
||||
g_byte_array_new ()
|
||||
{
|
||||
return (GByteArray *) g_array_new (FALSE, TRUE, 1);
|
||||
}
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
#include <time.h>
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -43,20 +42,20 @@ struct _GDir {
|
||||
};
|
||||
|
||||
GDir *
|
||||
g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
g_dir_open (const gchar *path, guint flags, GError **error)
|
||||
{
|
||||
GDir *dir;
|
||||
|
||||
g_return_val_if_fail (path != NULL, NULL);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, NULL);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
||||
|
||||
(void) flags; /* this is not used */
|
||||
dir = g_new (GDir, 1);
|
||||
dir->dir = opendir (path);
|
||||
if (dir->dir == NULL) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
gint err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
}
|
||||
g_free (dir);
|
||||
return NULL;
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -43,7 +42,7 @@ struct _GDir {
|
||||
};
|
||||
|
||||
GDir *
|
||||
g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
g_dir_open (const gchar *path, guint flags, GError **error)
|
||||
{
|
||||
GDir *dir;
|
||||
gunichar2* path_utf16;
|
||||
@@ -51,19 +50,19 @@ g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
WIN32_FIND_DATAW find_data;
|
||||
|
||||
g_return_val_if_fail (path != NULL, NULL);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, NULL);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
|
||||
|
||||
dir = g_new0 (GDir, 1);
|
||||
path_utf16 = u8to16 (path);
|
||||
path_utf16_search = g_malloc ((wcslen(path_utf16) + 3)*sizeof(gunichar2));
|
||||
path_utf16_search = g_malloc ((wcslen((wchar_t *) path_utf16) + 3)*sizeof(gunichar2));
|
||||
wcscpy (path_utf16_search, path_utf16);
|
||||
wcscat (path_utf16_search, L"\\*");
|
||||
|
||||
dir->handle = FindFirstFileW (path_utf16_search, &find_data);
|
||||
if (dir->handle == INVALID_HANDLE_VALUE) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
gint err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
}
|
||||
g_free (path_utf16_search);
|
||||
g_free (path_utf16);
|
||||
@@ -73,11 +72,11 @@ g_dir_open (const gchar *path, guint flags, GError **gerror)
|
||||
g_free (path_utf16_search);
|
||||
g_free (path_utf16);
|
||||
|
||||
while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0)) {
|
||||
while ((wcscmp ((wchar_t *) find_data.cFileName, L".") == 0) || (wcscmp ((wchar_t *) find_data.cFileName, L"..") == 0)) {
|
||||
if (!FindNextFileW (dir->handle, &find_data)) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
gint err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
|
||||
}
|
||||
g_free (dir);
|
||||
return NULL;
|
||||
@@ -112,7 +111,7 @@ g_dir_read_name (GDir *dir)
|
||||
dir->next = NULL;
|
||||
return dir->current;
|
||||
}
|
||||
} while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0));
|
||||
} while ((wcscmp ((wchar_t *) find_data.cFileName, L".") == 0) || (wcscmp ((wchar_t *) find_data.cFileName, L"..") == 0));
|
||||
|
||||
dir->next = u16to8 (find_data.cFileName);
|
||||
return dir->current;
|
||||
@@ -62,21 +62,21 @@ g_error_vnew (gpointer domain, gint code, const char *format, va_list ap)
|
||||
}
|
||||
|
||||
void
|
||||
g_clear_error (GError **gerror)
|
||||
g_clear_error (GError **error)
|
||||
{
|
||||
if (gerror && *gerror) {
|
||||
g_error_free (*gerror);
|
||||
*gerror = NULL;
|
||||
if (error && *error) {
|
||||
g_error_free (*error);
|
||||
*error = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
g_error_free (GError *gerror)
|
||||
g_error_free (GError *error)
|
||||
{
|
||||
g_return_if_fail (gerror != NULL);
|
||||
g_return_if_fail (error != NULL);
|
||||
|
||||
g_free (gerror->message);
|
||||
g_free (gerror);
|
||||
g_free (error->message);
|
||||
g_free (error);
|
||||
}
|
||||
|
||||
void
|
||||
@@ -50,7 +50,7 @@ int mkstemp (char *tmp_template);
|
||||
#define OPEN_FLAGS (O_RDONLY | O_LARGEFILE)
|
||||
#endif
|
||||
gboolean
|
||||
g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **gerror)
|
||||
g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **error)
|
||||
{
|
||||
gchar *str;
|
||||
int fd;
|
||||
@@ -60,7 +60,7 @@ g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GEr
|
||||
|
||||
g_return_val_if_fail (filename != NULL, FALSE);
|
||||
g_return_val_if_fail (contents != NULL, FALSE);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, FALSE);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
||||
*contents = NULL;
|
||||
if (length)
|
||||
@@ -68,17 +68,17 @@ g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GEr
|
||||
|
||||
fd = open (filename, OPEN_FLAGS);
|
||||
if (fd == -1) {
|
||||
if (gerror != NULL) {
|
||||
if (error != NULL) {
|
||||
int err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error opening file");
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error opening file");
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (fstat (fd, &st) != 0) {
|
||||
if (gerror != NULL) {
|
||||
if (error != NULL) {
|
||||
int err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in fstat()");
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in fstat()");
|
||||
}
|
||||
close (fd);
|
||||
return FALSE;
|
||||
@@ -103,29 +103,29 @@ g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GEr
|
||||
}
|
||||
|
||||
gint
|
||||
g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror)
|
||||
g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
|
||||
{
|
||||
const static gchar *default_tmpl = ".XXXXXX";
|
||||
gchar *t;
|
||||
gint fd;
|
||||
size_t len;
|
||||
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, -1);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, -1);
|
||||
|
||||
if (tmpl == NULL)
|
||||
tmpl = default_tmpl;
|
||||
|
||||
if (strchr (tmpl, G_DIR_SEPARATOR) != NULL) {
|
||||
if (gerror) {
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 24, "Template should not have any " G_DIR_SEPARATOR_S);
|
||||
if (error) {
|
||||
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should not have any " G_DIR_SEPARATOR_S);
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
len = strlen (tmpl);
|
||||
if (len < 6 || strcmp (tmpl + len - 6, "XXXXXX")) {
|
||||
if (gerror) {
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 24, "Template should end with XXXXXX");
|
||||
if (error) {
|
||||
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should end with XXXXXX");
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
@@ -135,9 +135,9 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror)
|
||||
fd = mkstemp (t);
|
||||
|
||||
if (fd == -1) {
|
||||
if (gerror) {
|
||||
if (error) {
|
||||
int err = errno;
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in mkstemp()");
|
||||
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in mkstemp()");
|
||||
}
|
||||
g_free (t);
|
||||
return -1;
|
||||
@@ -154,6 +154,15 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror)
|
||||
gchar *
|
||||
g_get_current_dir (void)
|
||||
{
|
||||
#ifdef __native_client__
|
||||
char *buffer;
|
||||
if ((buffer = g_getenv("NACL_PWD"))) {
|
||||
buffer = g_strdup(buffer);
|
||||
} else {
|
||||
buffer = g_strdup(".");
|
||||
}
|
||||
return buffer;
|
||||
#else
|
||||
int s = 32;
|
||||
char *buffer = NULL, *r;
|
||||
gboolean fail;
|
||||
@@ -172,4 +181,5 @@ g_get_current_dir (void)
|
||||
* so we return the buffer here since it has a pointer to the valid string
|
||||
*/
|
||||
return buffer;
|
||||
#endif
|
||||
}
|
||||
@@ -80,24 +80,13 @@ g_file_test (const gchar *filename, GFileTest test)
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_mkdtemp (char *temp)
|
||||
g_mkdtemp (char *tmp_template)
|
||||
{
|
||||
/*
|
||||
* On systems without mkdtemp, use a reimplemented version
|
||||
* adapted from the Win32 version of this file. AIX is an
|
||||
* exception because i before version 7.2 lacks mkdtemp in
|
||||
* libc, and GCC can "fix" system headers so that it isn't
|
||||
* present without redefining it.
|
||||
*/
|
||||
#if defined(HAVE_MKDTEMP) && !defined(_AIX)
|
||||
return mkdtemp (g_strdup (temp));
|
||||
#else
|
||||
temp = mktemp (g_strdup (temp));
|
||||
/* 0700 is the mode specified in specs */
|
||||
if (temp && *temp && mkdir (temp, 0700) == 0)
|
||||
return temp;
|
||||
#ifdef HAVE_MKDTEMP
|
||||
char *template_copy = g_strdup (tmp_template);
|
||||
|
||||
g_free (temp);
|
||||
return NULL;
|
||||
return mkdtemp (template_copy);
|
||||
#else
|
||||
g_error("Function not supported");
|
||||
#endif
|
||||
}
|
||||
File renamed without changes.
@@ -36,7 +36,7 @@
|
||||
#endif
|
||||
#include <errno.h>
|
||||
|
||||
static gpointer error_quark = (gpointer)"FileError";
|
||||
static gpointer error_quark = "FileError";
|
||||
|
||||
gpointer
|
||||
g_file_error_quark (void)
|
||||
@@ -25,11 +25,9 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <math.h>
|
||||
#include <glib.h>
|
||||
#include <eglib-remap.h> // Remove the cast macros and restore the rename macros.
|
||||
|
||||
typedef struct _Slot Slot;
|
||||
|
||||
@@ -547,9 +545,8 @@ void
|
||||
g_hash_table_destroy (GHashTable *hash)
|
||||
{
|
||||
int i;
|
||||
|
||||
if (!hash)
|
||||
return;
|
||||
|
||||
g_return_if_fail (hash != NULL);
|
||||
|
||||
for (i = 0; i < hash->table_size; i++){
|
||||
Slot *s, *next;
|
||||
@@ -658,7 +655,7 @@ g_int_hash (gconstpointer v1)
|
||||
gboolean
|
||||
g_str_equal (gconstpointer v1, gconstpointer v2)
|
||||
{
|
||||
return strcmp ((const char*)v1, (const char*)v2) == 0;
|
||||
return strcmp (v1, v2) == 0;
|
||||
}
|
||||
|
||||
guint
|
||||
@@ -22,7 +22,11 @@
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
* DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <glib.h>
|
||||
#include <string.h>
|
||||
#ifdef HAVE_ICONV_H
|
||||
@@ -47,7 +51,7 @@ struct _GIConv {
|
||||
Decoder decode;
|
||||
Encoder encode;
|
||||
gunichar c;
|
||||
#ifdef HAVE_LIBICONV
|
||||
#ifdef HAVE_ICONV
|
||||
iconv_t cd;
|
||||
#endif
|
||||
};
|
||||
@@ -108,7 +112,7 @@ static struct {
|
||||
GIConv
|
||||
g_iconv_open (const char *to_charset, const char *from_charset)
|
||||
{
|
||||
#ifdef HAVE_LIBICONV
|
||||
#ifdef HAVE_ICONV
|
||||
iconv_t icd = (iconv_t) -1;
|
||||
#endif
|
||||
Decoder decoder = NULL;
|
||||
@@ -131,7 +135,7 @@ g_iconv_open (const char *to_charset, const char *from_charset)
|
||||
}
|
||||
|
||||
if (!encoder || !decoder) {
|
||||
#ifdef HAVE_LIBICONV
|
||||
#ifdef HAVE_ICONV
|
||||
if ((icd = iconv_open (to_charset, from_charset)) == (iconv_t) -1)
|
||||
return (GIConv) -1;
|
||||
#else
|
||||
@@ -146,7 +150,7 @@ g_iconv_open (const char *to_charset, const char *from_charset)
|
||||
cd->encode = encoder;
|
||||
cd->c = -1;
|
||||
|
||||
#ifdef HAVE_LIBICONV
|
||||
#ifdef HAVE_ICONV
|
||||
cd->cd = icd;
|
||||
#endif
|
||||
|
||||
@@ -156,7 +160,7 @@ g_iconv_open (const char *to_charset, const char *from_charset)
|
||||
int
|
||||
g_iconv_close (GIConv cd)
|
||||
{
|
||||
#ifdef HAVE_LIBICONV
|
||||
#ifdef HAVE_ICONV
|
||||
if (cd->cd != (iconv_t) -1)
|
||||
iconv_close (cd->cd);
|
||||
#endif
|
||||
@@ -175,7 +179,7 @@ g_iconv (GIConv cd, gchar **inbytes, gsize *inbytesleft,
|
||||
gunichar c;
|
||||
int rc = 0;
|
||||
|
||||
#ifdef HAVE_LIBICONV
|
||||
#ifdef HAVE_ICONV
|
||||
if (cd->cd != (iconv_t) -1) {
|
||||
/* Note: gsize may have a different size than size_t, so we need to
|
||||
remap inbytesleft and outbytesleft to size_t's. */
|
||||
@@ -250,16 +254,8 @@ g_iconv (GIConv cd, gchar **inbytes, gsize *inbytesleft,
|
||||
* Unicode encoders and decoders
|
||||
*/
|
||||
|
||||
static FORCE_INLINE (uint32_t)
|
||||
read_uint32_endian (unsigned char *inptr, unsigned endian)
|
||||
{
|
||||
if (endian == G_LITTLE_ENDIAN)
|
||||
return (inptr[3] << 24) | (inptr[2] << 16) | (inptr[1] << 8) | inptr[0];
|
||||
return (inptr[0] << 24) | (inptr[1] << 16) | (inptr[2] << 8) | inptr[3];
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf32_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned endian)
|
||||
decode_utf32be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar c;
|
||||
@@ -269,7 +265,7 @@ decode_utf32_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return -1;
|
||||
}
|
||||
|
||||
c = read_uint32_endian (inptr, endian);
|
||||
c = (inptr[0] << 24) | (inptr[1] << 16) | (inptr[2] << 8) | inptr[3];
|
||||
|
||||
if (c >= 0xd800 && c < 0xe000) {
|
||||
errno = EILSEQ;
|
||||
@@ -284,16 +280,30 @@ decode_utf32_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return 4;
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf32be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf32_endian (inbuf, inleft, outchar, G_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf32le (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf32_endian (inbuf, inleft, outchar, G_LITTLE_ENDIAN);
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar c;
|
||||
|
||||
if (inleft < 4) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
c = (inptr[3] << 24) | (inptr[2] << 16) | (inptr[1] << 8) | inptr[0];
|
||||
|
||||
if (c >= 0xd800 && c < 0xe000) {
|
||||
errno = EILSEQ;
|
||||
return -1;
|
||||
} else if (c >= 0x110000) {
|
||||
errno = EILSEQ;
|
||||
return -1;
|
||||
}
|
||||
|
||||
*outchar = c;
|
||||
|
||||
return 4;
|
||||
}
|
||||
|
||||
static int
|
||||
@@ -332,16 +342,8 @@ encode_utf32le (gunichar c, char *outbuf, size_t outleft)
|
||||
return 4;
|
||||
}
|
||||
|
||||
static FORCE_INLINE (uint16_t)
|
||||
read_uint16_endian (unsigned char *inptr, unsigned endian)
|
||||
{
|
||||
if (endian == G_LITTLE_ENDIAN)
|
||||
return (inptr[1] << 8) | inptr[0];
|
||||
return (inptr[0] << 8) | inptr[1];
|
||||
}
|
||||
|
||||
static FORCE_INLINE (int)
|
||||
decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned endian)
|
||||
static int
|
||||
decode_utf16be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar2 c;
|
||||
@@ -352,7 +354,7 @@ decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return -1;
|
||||
}
|
||||
|
||||
u = read_uint16_endian (inptr, endian);
|
||||
u = (inptr[0] << 8) | inptr[1];
|
||||
|
||||
if (u < 0xd800) {
|
||||
/* 0x0000 -> 0xd7ff */
|
||||
@@ -365,7 +367,7 @@ decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
return -2;
|
||||
}
|
||||
|
||||
c = read_uint16_endian (inptr + 2, endian);
|
||||
c = (inptr[2] << 8) | inptr[3];
|
||||
|
||||
if (c < 0xdc00 || c > 0xdfff) {
|
||||
errno = EILSEQ;
|
||||
@@ -388,31 +390,54 @@ decode_utf16_endian (char *inbuf, size_t inleft, gunichar *outchar, unsigned end
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf16be (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
decode_utf16le (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf16_endian (inbuf, inleft, outchar, G_BIG_ENDIAN);
|
||||
unsigned char *inptr = (unsigned char *) inbuf;
|
||||
gunichar2 c;
|
||||
gunichar u;
|
||||
|
||||
if (inleft < 2) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
|
||||
u = (inptr[1] << 8) | inptr[0];
|
||||
|
||||
if (u < 0xd800) {
|
||||
/* 0x0000 -> 0xd7ff */
|
||||
*outchar = u;
|
||||
return 2;
|
||||
} else if (u < 0xdc00) {
|
||||
/* 0xd800 -> 0xdbff */
|
||||
if (inleft < 4) {
|
||||
errno = EINVAL;
|
||||
return -2;
|
||||
}
|
||||
|
||||
c = (inptr[3] << 8) | inptr[2];
|
||||
|
||||
if (c < 0xdc00 || c > 0xdfff) {
|
||||
errno = EILSEQ;
|
||||
return -2;
|
||||
}
|
||||
|
||||
u = ((u - 0xd800) << 10) + (c - 0xdc00) + 0x0010000UL;
|
||||
*outchar = u;
|
||||
|
||||
return 4;
|
||||
} else if (u < 0xe000) {
|
||||
/* 0xdc00 -> 0xdfff */
|
||||
errno = EILSEQ;
|
||||
return -1;
|
||||
} else {
|
||||
/* 0xe000 -> 0xffff */
|
||||
*outchar = u;
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
decode_utf16le (char *inbuf, size_t inleft, gunichar *outchar)
|
||||
{
|
||||
return decode_utf16_endian (inbuf, inleft, outchar, G_LITTLE_ENDIAN);
|
||||
}
|
||||
|
||||
static FORCE_INLINE (void)
|
||||
write_uint16_endian (unsigned char *outptr, uint16_t c, unsigned endian)
|
||||
{
|
||||
if (endian == G_LITTLE_ENDIAN) {
|
||||
outptr[0] = c & 0xff;
|
||||
outptr[1] = (c >> 8) & 0xff;
|
||||
return;
|
||||
}
|
||||
outptr[0] = (c >> 8) & 0xff;
|
||||
outptr[1] = c & 0xff;
|
||||
}
|
||||
|
||||
static FORCE_INLINE (int)
|
||||
encode_utf16_endian (gunichar c, char *outbuf, size_t outleft, unsigned endian)
|
||||
encode_utf16be (gunichar c, char *outbuf, size_t outleft)
|
||||
{
|
||||
unsigned char *outptr = (unsigned char *) outbuf;
|
||||
gunichar2 ch;
|
||||
@@ -424,7 +449,9 @@ encode_utf16_endian (gunichar c, char *outbuf, size_t outleft, unsigned endian)
|
||||
return -1;
|
||||
}
|
||||
|
||||
write_uint16_endian (outptr, c, endian);
|
||||
outptr[0] = (c >> 8) & 0xff;
|
||||
outptr[1] = c & 0xff;
|
||||
|
||||
return 2;
|
||||
} else {
|
||||
if (outleft < 4) {
|
||||
@@ -435,24 +462,52 @@ encode_utf16_endian (gunichar c, char *outbuf, size_t outleft, unsigned endian)
|
||||
c2 = c - 0x10000;
|
||||
|
||||
ch = (gunichar2) ((c2 >> 10) + 0xd800);
|
||||
write_uint16_endian (outptr, ch, endian);
|
||||
|
||||
outptr[0] = (ch >> 8) & 0xff;
|
||||
outptr[1] = ch & 0xff;
|
||||
|
||||
ch = (gunichar2) ((c2 & 0x3ff) + 0xdc00);
|
||||
write_uint16_endian (outptr + 2, ch, endian);
|
||||
outptr[2] = (ch >> 8) & 0xff;
|
||||
outptr[3] = ch & 0xff;
|
||||
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
encode_utf16be (gunichar c, char *outbuf, size_t outleft)
|
||||
{
|
||||
return encode_utf16_endian (c, outbuf, outleft, G_BIG_ENDIAN);
|
||||
}
|
||||
|
||||
static int
|
||||
encode_utf16le (gunichar c, char *outbuf, size_t outleft)
|
||||
{
|
||||
return encode_utf16_endian (c, outbuf, outleft, G_LITTLE_ENDIAN);
|
||||
unsigned char *outptr = (unsigned char *) outbuf;
|
||||
gunichar2 ch;
|
||||
gunichar c2;
|
||||
|
||||
if (c < 0x10000) {
|
||||
if (outleft < 2) {
|
||||
errno = E2BIG;
|
||||
return -1;
|
||||
}
|
||||
|
||||
outptr[0] = c & 0xff;
|
||||
outptr[1] = (c >> 8) & 0xff;
|
||||
|
||||
return 2;
|
||||
} else {
|
||||
if (outleft < 4) {
|
||||
errno = E2BIG;
|
||||
return -1;
|
||||
}
|
||||
|
||||
c2 = c - 0x10000;
|
||||
|
||||
ch = (gunichar2) ((c2 >> 10) + 0xd800);
|
||||
outptr[0] = ch & 0xff;
|
||||
outptr[1] = (ch >> 8) & 0xff;
|
||||
|
||||
ch = (gunichar2) ((c2 & 0x3ff) + 0xdc00);
|
||||
outptr[2] = ch & 0xff;
|
||||
outptr[3] = (ch >> 8) & 0xff;
|
||||
|
||||
return 4;
|
||||
}
|
||||
}
|
||||
|
||||
static FORCE_INLINE (int)
|
||||
@@ -596,7 +651,7 @@ encode_latin1 (gunichar c, char *outbuf, size_t outleft)
|
||||
* Simple conversion API
|
||||
*/
|
||||
|
||||
static gpointer error_quark = (gpointer)"ConvertError";
|
||||
static gpointer error_quark = "ConvertError";
|
||||
|
||||
gpointer
|
||||
g_convert_error_quark (void)
|
||||
@@ -829,7 +884,7 @@ g_utf8_to_ucs4_fast (const gchar *str, glong len, glong *items_written)
|
||||
}
|
||||
|
||||
static gunichar2 *
|
||||
eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong *items_written, gboolean include_nuls, gboolean replace_invalid_codepoints, GError **err)
|
||||
eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong *items_written, gboolean include_nuls, GError **err)
|
||||
{
|
||||
gunichar2 *outbuf, *outptr;
|
||||
size_t outlen = 0;
|
||||
@@ -860,12 +915,8 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
|
||||
break;
|
||||
|
||||
if ((u = g_unichar_to_utf16 (c, NULL)) < 0) {
|
||||
if (replace_invalid_codepoints) {
|
||||
u = 2;
|
||||
} else {
|
||||
errno = EILSEQ;
|
||||
goto error;
|
||||
}
|
||||
errno = EILSEQ;
|
||||
goto error;
|
||||
}
|
||||
|
||||
outlen += u;
|
||||
@@ -890,14 +941,7 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
|
||||
if (c == 0 && !include_nuls)
|
||||
break;
|
||||
|
||||
u = g_unichar_to_utf16 (c, outptr);
|
||||
if ((u < 0) && replace_invalid_codepoints) {
|
||||
outptr[0] = 0xFFFD;
|
||||
outptr[1] = 0xFFFD;
|
||||
u = 2;
|
||||
}
|
||||
|
||||
outptr += u;
|
||||
outptr += g_unichar_to_utf16 (c, outptr);
|
||||
inleft -= n;
|
||||
inptr += n;
|
||||
}
|
||||
@@ -929,19 +973,13 @@ eg_utf8_to_utf16_general (const gchar *str, glong len, glong *items_read, glong
|
||||
gunichar2 *
|
||||
g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err)
|
||||
{
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, FALSE, FALSE, err);
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, FALSE, err);
|
||||
}
|
||||
|
||||
gunichar2 *
|
||||
eg_utf8_to_utf16_with_nuls (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err)
|
||||
{
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, TRUE, FALSE, err);
|
||||
}
|
||||
|
||||
gunichar2 *
|
||||
eg_wtf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err)
|
||||
{
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, TRUE, TRUE, err);
|
||||
return eg_utf8_to_utf16_general (str, len, items_read, items_written, TRUE, err);
|
||||
}
|
||||
|
||||
gunichar *
|
||||
@@ -1,22 +1,5 @@
|
||||
#ifndef __GLIB_H
|
||||
#define __GLIB_H
|
||||
|
||||
// Ask stdint.h and inttypes.h for the full C99 features for CentOS 6 g++ 4.4, Android, etc.
|
||||
// See for example:
|
||||
// $HOME/android-toolchain/toolchains/armeabi-v7a-clang/sysroot/usr/include/inttypes.h
|
||||
// $HOME/android-toolchain/toolchains/armeabi-v7a-clang/sysroot/usr/include/stdint.h
|
||||
#ifdef __cplusplus
|
||||
#ifndef __STDC_LIMIT_MACROS
|
||||
#define __STDC_LIMIT_MACROS
|
||||
#endif
|
||||
#ifndef __STDC_CONSTANT_MACROS
|
||||
#define __STDC_CONSTANT_MACROS
|
||||
#endif
|
||||
#ifndef __STDC_FORMAT_MACROS
|
||||
#define __STDC_FORMAT_MACROS
|
||||
#endif
|
||||
#endif // __cplusplus
|
||||
|
||||
#include <stdarg.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
@@ -24,23 +7,15 @@
|
||||
#include <stddef.h>
|
||||
#include <ctype.h>
|
||||
#include <limits.h>
|
||||
#include <stdint.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#include <eglib-config.hw>
|
||||
#else
|
||||
#include <eglib-config.h>
|
||||
#pragma include_alias(<eglib-config.h>, <eglib-config.hw>)
|
||||
#endif
|
||||
|
||||
// - Pointers should only be converted to or from pointer-sized integers.
|
||||
// - Any size integer can be converted to any other size integer.
|
||||
// - Therefore a pointer-sized integer is the intermediary between
|
||||
// a pointer and any integer type.
|
||||
#define GPOINTER_TO_INT(ptr) ((gint)(gssize)(ptr))
|
||||
#define GPOINTER_TO_UINT(ptr) ((guint)(gsize)(ptr))
|
||||
#define GINT_TO_POINTER(v) ((gpointer)(gssize)(v))
|
||||
#define GUINT_TO_POINTER(v) ((gpointer)(gsize)(v))
|
||||
#include <stdint.h>
|
||||
|
||||
#include <eglib-config.h>
|
||||
#ifndef EGLIB_NO_REMAP
|
||||
#include <eglib-remap.h>
|
||||
#endif
|
||||
@@ -58,110 +33,14 @@
|
||||
# define offsetof(s_name,n_name) (size_t)(char *)&(((s_name*)0)->m_name)
|
||||
#endif
|
||||
|
||||
#define __EGLIB_X11 1
|
||||
|
||||
#ifdef __cplusplus
|
||||
#define G_BEGIN_DECLS extern "C" {
|
||||
#define G_END_DECLS }
|
||||
#define G_EXTERN_C extern "C"
|
||||
#else
|
||||
#define G_BEGIN_DECLS /* nothing */
|
||||
#define G_END_DECLS /* nothing */
|
||||
#define G_EXTERN_C /* nothing */
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
#define g_cast monoeg_g_cast // in case not inlined (see eglib-remap.h)
|
||||
|
||||
// g_cast converts void* to T*.
|
||||
// e.g. #define malloc(x) (g_cast (malloc (x)))
|
||||
// FIXME It used to do more. Rename?
|
||||
struct g_cast
|
||||
{
|
||||
private:
|
||||
void * const x;
|
||||
public:
|
||||
explicit g_cast (void *y) : x(y) { }
|
||||
// Lack of rvalue constructor inhibits ternary operator.
|
||||
// Either don't use ternary, or cast each side.
|
||||
// sa = (salen <= 128) ? g_alloca (salen) : g_malloc (salen);
|
||||
// w32socket.c:1045:24: error: call to deleted constructor of 'monoeg_g_cast'
|
||||
//g_cast (g_cast&& y) : x(y.x) { }
|
||||
g_cast (g_cast&&) = delete;
|
||||
g_cast () = delete;
|
||||
g_cast (const g_cast&) = delete;
|
||||
|
||||
template <typename TTo>
|
||||
operator TTo* () const
|
||||
{
|
||||
return (TTo*)x;
|
||||
}
|
||||
};
|
||||
|
||||
#else
|
||||
|
||||
// FIXME? Parens are omitted to preserve prior meaning.
|
||||
#define g_cast(x) x
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
||||
// G++4.4 breaks opeq below without this.
|
||||
#if defined (__GNUC__) || defined (__clang__)
|
||||
#define G_MAY_ALIAS __attribute__((__may_alias__))
|
||||
#else
|
||||
#define G_MAY_ALIAS /* nothing */
|
||||
#endif
|
||||
|
||||
// Provide for bit operations on enums, but not all integer operations.
|
||||
// This alleviates a fair number of casts in porting C to C++.
|
||||
|
||||
// Forward declare template with no generic implementation.
|
||||
template <size_t> struct g_size_to_int;
|
||||
|
||||
// Template specializations.
|
||||
template <> struct g_size_to_int<1> { typedef int8_t type; };
|
||||
template <> struct g_size_to_int<2> { typedef int16_t type; };
|
||||
template <> struct g_size_to_int<4> { typedef int32_t type; };
|
||||
template <> struct g_size_to_int<8> { typedef int64_t type; };
|
||||
|
||||
// g++4.4 does not accept:
|
||||
//template <typename T>
|
||||
//using g_size_to_int_t = typename g_size_to_int <sizeof (T)>::type;
|
||||
#define g_size_to_int_t(x) g_size_to_int <sizeof (x)>::type
|
||||
|
||||
#define G_ENUM_BINOP(Enum, op, opeq) \
|
||||
inline Enum \
|
||||
operator op (Enum a, Enum b) \
|
||||
{ \
|
||||
typedef g_size_to_int_t (Enum) type; \
|
||||
return static_cast<Enum>(static_cast<type>(a) op b); \
|
||||
} \
|
||||
\
|
||||
inline Enum& \
|
||||
operator opeq (Enum& a, Enum b) \
|
||||
{ \
|
||||
typedef g_size_to_int_t (Enum) G_MAY_ALIAS type; \
|
||||
return (Enum&)((type&)a opeq b); \
|
||||
} \
|
||||
|
||||
#define G_ENUM_FUNCTIONS(Enum) \
|
||||
extern "C++" { /* in case within extern "C" */ \
|
||||
inline Enum \
|
||||
operator~ (Enum a) \
|
||||
{ \
|
||||
typedef g_size_to_int_t (Enum) type; \
|
||||
return static_cast<Enum>(~static_cast<type>(a)); \
|
||||
} \
|
||||
\
|
||||
G_ENUM_BINOP (Enum, |, |=) \
|
||||
G_ENUM_BINOP (Enum, &, &=) \
|
||||
G_ENUM_BINOP (Enum, ^, ^=) \
|
||||
\
|
||||
} /* extern "C++" */
|
||||
|
||||
#else
|
||||
#define G_ENUM_FUNCTIONS(Enum) /* nothing */
|
||||
#define G_BEGIN_DECLS
|
||||
#define G_END_DECLS
|
||||
#endif
|
||||
|
||||
G_BEGIN_DECLS
|
||||
@@ -193,14 +72,7 @@ typedef float gfloat;
|
||||
typedef double gdouble;
|
||||
typedef int32_t gboolean;
|
||||
|
||||
#if defined (HOST_WIN32) || defined (_WIN32)
|
||||
G_END_DECLS
|
||||
#include <wchar.h>
|
||||
typedef wchar_t gunichar2;
|
||||
G_BEGIN_DECLS
|
||||
#else
|
||||
typedef guint16 gunichar2;
|
||||
#endif
|
||||
typedef guint32 gunichar;
|
||||
|
||||
/*
|
||||
@@ -216,12 +88,6 @@ typedef guint32 gunichar;
|
||||
#define G_MAXUSHORT USHRT_MAX
|
||||
#define G_MAXINT INT_MAX
|
||||
#define G_MININT INT_MIN
|
||||
#define G_MAXINT8 INT8_MAX
|
||||
#define G_MAXUINT8 UINT8_MAX
|
||||
#define G_MININT8 INT8_MIN
|
||||
#define G_MAXINT16 INT16_MAX
|
||||
#define G_MAXUINT16 UINT16_MAX
|
||||
#define G_MININT16 INT16_MIN
|
||||
#define G_MAXINT32 INT32_MAX
|
||||
#define G_MAXUINT32 UINT32_MAX
|
||||
#define G_MININT32 INT32_MIN
|
||||
@@ -240,14 +106,6 @@ typedef guint32 gunichar;
|
||||
#define ABS(a) ((a) > 0 ? (a) : -(a))
|
||||
#endif
|
||||
|
||||
#ifndef ALIGN_TO
|
||||
#define ALIGN_TO(val,align) ((((gssize)val) + ((align) - 1)) & ~((align) - 1))
|
||||
#endif
|
||||
|
||||
#ifndef ALIGN_PTR_TO
|
||||
#define ALIGN_PTR_TO(ptr,align) (gpointer)((((gssize)(ptr)) + (align - 1)) & (~(align - 1)))
|
||||
#endif
|
||||
|
||||
#define G_STRUCT_OFFSET(p_type,field) offsetof(p_type,field)
|
||||
|
||||
#define EGLIB_STRINGIFY(x) #x
|
||||
@@ -264,15 +122,10 @@ typedef guint32 gunichar;
|
||||
/*
|
||||
* Allocation
|
||||
*/
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_free (void *ptr);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
gpointer g_realloc (gpointer obj, gsize size);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
gpointer g_malloc (gsize x);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
gpointer g_malloc0 (gsize x);
|
||||
G_EXTERN_C // Used by profilers, at least.
|
||||
gpointer g_calloc (gsize n, gsize x);
|
||||
gpointer g_try_malloc (gsize x);
|
||||
gpointer g_try_realloc (gpointer obj, gsize size);
|
||||
@@ -282,10 +135,9 @@ gpointer g_try_realloc (gpointer obj, gsize size);
|
||||
#define g_newa(type,size) ((type *) alloca (sizeof (type) * (size)))
|
||||
|
||||
#define g_memmove(dest,src,len) memmove (dest, src, len)
|
||||
#define g_renew(struct_type, mem, n_structs) ((struct_type*)g_realloc (mem, sizeof (struct_type) * n_structs))
|
||||
#define g_alloca(size) (g_cast (alloca (size)))
|
||||
#define g_renew(struct_type, mem, n_structs) g_realloc (mem, sizeof (struct_type) * n_structs)
|
||||
#define g_alloca(size) alloca (size)
|
||||
|
||||
G_EXTERN_C // Used by libtest, at least.
|
||||
gpointer g_memdup (gconstpointer mem, guint byte_size);
|
||||
static inline gchar *g_strdup (const gchar *str) { if (str) { return (gchar*) g_memdup (str, (guint)strlen (str) + 1); } return NULL; }
|
||||
gchar **g_strdupv (gchar **str_array);
|
||||
@@ -310,10 +162,7 @@ typedef struct _GMemChunk GMemChunk;
|
||||
|
||||
gboolean g_hasenv(const gchar *variable);
|
||||
gchar * g_getenv(const gchar *variable);
|
||||
|
||||
G_EXTERN_C // sdks/wasm/driver.c is C and uses this
|
||||
gboolean g_setenv(const gchar *variable, const gchar *value, gboolean overwrite);
|
||||
|
||||
void g_unsetenv(const gchar *variable);
|
||||
|
||||
gchar* g_win32_getlocale(void);
|
||||
@@ -335,8 +184,8 @@ typedef struct {
|
||||
gchar *message;
|
||||
} GError;
|
||||
|
||||
void g_clear_error (GError **gerror);
|
||||
void g_error_free (GError *gerror);
|
||||
void g_clear_error (GError **error);
|
||||
void g_error_free (GError *error);
|
||||
GError *g_error_new (gpointer domain, gint code, const char *format, ...);
|
||||
void g_set_error (GError **err, gpointer domain, gint code, const gchar *format, ...);
|
||||
void g_propagate_error (GError **dest, GError *src);
|
||||
@@ -344,7 +193,6 @@ void g_propagate_error (GError **dest, GError *src);
|
||||
/*
|
||||
* Strings utility
|
||||
*/
|
||||
G_EXTERN_C // Used by libtest, at least.
|
||||
gchar *g_strdup_printf (const gchar *format, ...);
|
||||
gchar *g_strdup_vprintf (const gchar *format, va_list args);
|
||||
gchar *g_strndup (const gchar *str, gsize n);
|
||||
@@ -365,11 +213,11 @@ gchar *g_strchomp (gchar *str);
|
||||
void g_strdown (gchar *string);
|
||||
gchar *g_strnfill (gsize length, gchar fill_char);
|
||||
|
||||
void g_strdelimit (char *string, char delimiter, char new_delimiter);
|
||||
gchar *g_strdelimit (gchar *string, const gchar *delimiters, gchar new_delimiter);
|
||||
gchar *g_strescape (const gchar *source, const gchar *exceptions);
|
||||
|
||||
gchar *g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **gerror);
|
||||
gchar *g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror);
|
||||
gchar *g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **error);
|
||||
gchar *g_filename_from_uri (const gchar *uri, gchar **hostname, GError **error);
|
||||
|
||||
gint g_printf (gchar const *format, ...);
|
||||
gint g_fprintf (FILE *file, gchar const *format, ...);
|
||||
@@ -396,8 +244,6 @@ gint g_ascii_xdigit_value (gchar c);
|
||||
#define g_ascii_isalpha(c) (isalpha (c) != 0)
|
||||
#define g_ascii_isprint(c) (isprint (c) != 0)
|
||||
#define g_ascii_isxdigit(c) (isxdigit (c) != 0)
|
||||
gboolean g_utf16_ascii_equal (const gunichar2 *utf16, size_t ulen, const char *ascii, size_t alen);
|
||||
gboolean g_utf16_asciiz_equal (const gunichar2 *utf16, const char *ascii);
|
||||
|
||||
/* FIXME: g_strcasecmp supports utf8 unicode stuff */
|
||||
#ifdef _MSC_VER
|
||||
@@ -412,6 +258,9 @@ gboolean g_utf16_asciiz_equal (const gunichar2 *utf16, const char *ascii);
|
||||
#endif
|
||||
#define g_ascii_strdup strdup
|
||||
|
||||
|
||||
#define G_STR_DELIMITERS "_-|> <."
|
||||
|
||||
/*
|
||||
* String type
|
||||
*/
|
||||
@@ -434,7 +283,10 @@ GString *g_string_append_c (GString *string, gchar c);
|
||||
GString *g_string_append (GString *string, const gchar *val);
|
||||
GString *g_string_append_len (GString *string, const gchar *val, gssize len);
|
||||
GString *g_string_truncate (GString *string, gsize len);
|
||||
GString *g_string_prepend (GString *string, const gchar *val);
|
||||
GString *g_string_insert (GString *string, gssize pos, const gchar *val);
|
||||
GString *g_string_set_size (GString *string, gsize len);
|
||||
GString *g_string_erase (GString *string, gssize pos, gssize len);
|
||||
|
||||
#define g_string_sprintfa g_string_append_printf
|
||||
|
||||
@@ -571,28 +423,22 @@ struct _GHashTableIter
|
||||
gpointer dummy [8];
|
||||
};
|
||||
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
GHashTable *g_hash_table_new (GHashFunc hash_func, GEqualFunc key_equal_func);
|
||||
GHashTable *g_hash_table_new_full (GHashFunc hash_func, GEqualFunc key_equal_func,
|
||||
GDestroyNotify key_destroy_func, GDestroyNotify value_destroy_func);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_hash_table_insert_replace (GHashTable *hash, gpointer key, gpointer value, gboolean replace);
|
||||
guint g_hash_table_size (GHashTable *hash);
|
||||
GList *g_hash_table_get_keys (GHashTable *hash);
|
||||
GList *g_hash_table_get_values (GHashTable *hash);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
gpointer g_hash_table_lookup (GHashTable *hash, gconstpointer key);
|
||||
gboolean g_hash_table_lookup_extended (GHashTable *hash, gconstpointer key, gpointer *orig_key, gpointer *value);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_hash_table_foreach (GHashTable *hash, GHFunc func, gpointer user_data);
|
||||
gpointer g_hash_table_find (GHashTable *hash, GHRFunc predicate, gpointer user_data);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
gboolean g_hash_table_remove (GHashTable *hash, gconstpointer key);
|
||||
gboolean g_hash_table_steal (GHashTable *hash, gconstpointer key);
|
||||
void g_hash_table_remove_all (GHashTable *hash);
|
||||
guint g_hash_table_foreach_remove (GHashTable *hash, GHRFunc func, gpointer user_data);
|
||||
guint g_hash_table_foreach_steal (GHashTable *hash, GHRFunc func, gpointer user_data);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_hash_table_destroy (GHashTable *hash);
|
||||
void g_hash_table_print_stats (GHashTable *table);
|
||||
|
||||
@@ -604,9 +450,7 @@ guint g_spaced_primes_closest (guint x);
|
||||
#define g_hash_table_insert(h,k,v) g_hash_table_insert_replace ((h),(k),(v),FALSE)
|
||||
#define g_hash_table_replace(h,k,v) g_hash_table_insert_replace ((h),(k),(v),TRUE)
|
||||
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
gboolean g_direct_equal (gconstpointer v1, gconstpointer v2);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
guint g_direct_hash (gconstpointer v1);
|
||||
gboolean g_int_equal (gconstpointer v1, gconstpointer v2);
|
||||
guint g_int_hash (gconstpointer v1);
|
||||
@@ -650,7 +494,6 @@ void g_array_set_size (GArray *array, gint length);
|
||||
#define g_array_append_val(a,v) (g_array_append_vals((a),&(v),1))
|
||||
#define g_array_insert_val(a,i,v) (g_array_insert_vals((a),(i),&(v),1))
|
||||
#define g_array_index(a,t,i) *(t*)(((a)->data) + sizeof(t) * (i))
|
||||
//FIXME previous missing parens
|
||||
|
||||
/*
|
||||
* QSort
|
||||
@@ -680,9 +523,7 @@ void g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc co
|
||||
void g_ptr_array_set_size (GPtrArray *array, gint length);
|
||||
gpointer *g_ptr_array_free (GPtrArray *array, gboolean free_seg);
|
||||
void g_ptr_array_foreach (GPtrArray *array, GFunc func, gpointer user_data);
|
||||
guint g_ptr_array_capacity (GPtrArray *array);
|
||||
#define g_ptr_array_index(array,index) (array)->pdata[(index)]
|
||||
//FIXME previous missing parens
|
||||
|
||||
/*
|
||||
* Queues
|
||||
@@ -724,19 +565,13 @@ typedef enum {
|
||||
G_LOG_LEVEL_MASK = ~(G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL)
|
||||
} GLogLevelFlags;
|
||||
|
||||
G_ENUM_FUNCTIONS (GLogLevelFlags)
|
||||
|
||||
void g_printv (const gchar *format, va_list args);
|
||||
void g_print (const gchar *format, ...);
|
||||
void g_printerr (const gchar *format, ...);
|
||||
GLogLevelFlags g_log_set_always_fatal (GLogLevelFlags fatal_mask);
|
||||
GLogLevelFlags 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);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, ...);
|
||||
G_EXTERN_C // Used by MonoPosixHelper or MonoSupportW, at least.
|
||||
void g_assertion_message (const gchar *format, ...) G_GNUC_NORETURN;
|
||||
const char * g_get_assertion_message (void);
|
||||
|
||||
#ifdef HAVE_C99_SUPPORT
|
||||
/* The for (;;) tells gc thats g_error () doesn't return, avoiding warnings */
|
||||
@@ -882,34 +717,9 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
|
||||
#define eg_unreachable()
|
||||
#endif
|
||||
|
||||
/* g_assert is a boolean expression; the precise value is not preserved, just true or false. */
|
||||
#define g_assert(x) (G_LIKELY((x)) ? 1 : (g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x), 0))
|
||||
|
||||
#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
|
||||
|
||||
/* f is format -- like printf and scanf
|
||||
* Where you might have said:
|
||||
* if (!(expr))
|
||||
* g_error("%s invalid bar:%d", __func__, bar)
|
||||
*
|
||||
* You can say:
|
||||
* g_assertf(expr, "bar:%d", bar);
|
||||
*
|
||||
* The usual assertion text of file/line/expr/newline are builtin, and __func__.
|
||||
*
|
||||
* g_assertf is a boolean expression -- the precise value is not preserved, just true or false.
|
||||
*
|
||||
* Other than expr, the parameters are not evaluated unless expr is false.
|
||||
*
|
||||
* format must be a string literal, in order to be concatenated.
|
||||
* If this is too restrictive, g_error remains.
|
||||
*/
|
||||
#if defined(_MSC_VER) && (_MSC_VER < 1910)
|
||||
#define g_assertf(x, format, ...) (G_LIKELY((x)) ? 1 : (g_assertion_message ("* Assertion at %s:%d, condition `%s' not met, function:%s, " format "\n", __FILE__, __LINE__, #x, __func__, __VA_ARGS__), 0))
|
||||
#else
|
||||
#define g_assertf(x, format, ...) (G_LIKELY((x)) ? 1 : (g_assertion_message ("* Assertion at %s:%d, condition `%s' not met, function:%s, " format "\n", __FILE__, __LINE__, #x, __func__, ##__VA_ARGS__), 0))
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Unicode conversion
|
||||
*/
|
||||
@@ -930,11 +740,8 @@ gchar *g_utf8_strdown (const gchar *str, gssize len);
|
||||
gint g_unichar_to_utf8 (gunichar c, gchar *outbuf);
|
||||
gunichar *g_utf8_to_ucs4_fast (const gchar *str, glong len, glong *items_written);
|
||||
gunichar *g_utf8_to_ucs4 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
G_EXTERN_C // Used by libtest, at least.
|
||||
gunichar2 *g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar2 *eg_utf8_to_utf16_with_nuls (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar2 *eg_wtf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
G_EXTERN_C // Used by libtest, at least.
|
||||
gchar *g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gunichar *g_utf16_to_ucs4 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
gchar *g_ucs4_to_utf8 (const gunichar *str, glong len, glong *items_read, glong *items_written, GError **err);
|
||||
@@ -971,8 +778,8 @@ gboolean g_ensure_directory_exists (const gchar *filename);
|
||||
* Shell
|
||||
*/
|
||||
|
||||
gboolean g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **gerror);
|
||||
gchar *g_shell_unquote (const gchar *quoted_string, GError **gerror);
|
||||
gboolean g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **error);
|
||||
gchar *g_shell_unquote (const gchar *quoted_string, GError **error);
|
||||
gchar *g_shell_quote (const gchar *unquoted_string);
|
||||
|
||||
/*
|
||||
@@ -990,9 +797,9 @@ typedef enum {
|
||||
|
||||
typedef void (*GSpawnChildSetupFunc) (gpointer user_data);
|
||||
|
||||
gboolean g_spawn_command_line_sync (const gchar *command_line, gchar **standard_output, gchar **standard_error, gint *exit_status, GError **gerror);
|
||||
gboolean g_spawn_command_line_sync (const gchar *command_line, gchar **standard_output, gchar **standard_error, gint *exit_status, GError **error);
|
||||
gboolean g_spawn_async_with_pipes (const gchar *working_directory, gchar **argv, gchar **envp, GSpawnFlags flags, GSpawnChildSetupFunc child_setup,
|
||||
gpointer user_data, GPid *child_pid, gint *standard_input, gint *standard_output, gint *standard_error, GError **gerror);
|
||||
gpointer user_data, GPid *child_pid, gint *standard_input, gint *standard_output, gint *standard_error, GError **error);
|
||||
|
||||
int eg_getdtablesize (void);
|
||||
|
||||
@@ -1062,41 +869,17 @@ typedef enum {
|
||||
G_FILE_TEST_EXISTS = 1 << 4
|
||||
} GFileTest;
|
||||
|
||||
G_ENUM_FUNCTIONS (GFileTest)
|
||||
|
||||
gboolean g_file_set_contents (const gchar *filename, const gchar *contents, gssize length, GError **gerror);
|
||||
gboolean g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **gerror);
|
||||
gboolean g_file_set_contents (const gchar *filename, const gchar *contents, gssize length, GError **error);
|
||||
gboolean g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **error);
|
||||
GFileError g_file_error_from_errno (gint err_no);
|
||||
gint g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **gerror);
|
||||
gint g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error);
|
||||
gboolean g_file_test (const gchar *filename, GFileTest test);
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_open _open
|
||||
#else
|
||||
#define g_open open
|
||||
#endif
|
||||
#define g_rename rename
|
||||
#define g_stat stat
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_access _access
|
||||
#else
|
||||
#define g_access access
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_mktemp _mktemp
|
||||
#else
|
||||
#define g_mktemp mktemp
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_unlink _unlink
|
||||
#else
|
||||
#define g_unlink unlink
|
||||
#endif
|
||||
#ifdef G_OS_WIN32
|
||||
#define g_write _write
|
||||
#else
|
||||
#define g_write write
|
||||
#endif
|
||||
#define g_fopen fopen
|
||||
#define g_lstat lstat
|
||||
#define g_rmdir rmdir
|
||||
@@ -1119,7 +902,7 @@ gboolean g_pattern_match_string (GPatternSpec *pspec, const gchar *string)
|
||||
* Directory
|
||||
*/
|
||||
typedef struct _GDir GDir;
|
||||
GDir *g_dir_open (const gchar *path, guint flags, GError **gerror);
|
||||
GDir *g_dir_open (const gchar *path, guint flags, GError **error);
|
||||
const gchar *g_dir_read_name (GDir *dir);
|
||||
void g_dir_rewind (GDir *dir);
|
||||
void g_dir_close (GDir *dir);
|
||||
@@ -1144,26 +927,26 @@ typedef struct {
|
||||
const gchar **attribute_names,
|
||||
const gchar **attribute_values,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
void (*end_element) (GMarkupParseContext *context,
|
||||
const gchar *element_name,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
void (*text) (GMarkupParseContext *context,
|
||||
const gchar *text,
|
||||
gsize text_len,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
void (*passthrough) (GMarkupParseContext *context,
|
||||
const gchar *passthrough_text,
|
||||
gsize text_len,
|
||||
gpointer user_data,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
void (*error) (GMarkupParseContext *context,
|
||||
GError *gerror,
|
||||
GError *error,
|
||||
gpointer user_data);
|
||||
} GMarkupParser;
|
||||
|
||||
@@ -1174,9 +957,9 @@ GMarkupParseContext *g_markup_parse_context_new (const GMarkupParser *parser,
|
||||
void g_markup_parse_context_free (GMarkupParseContext *context);
|
||||
gboolean g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
const gchar *text, gssize text_len,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
|
||||
/*
|
||||
* Character set conversion
|
||||
@@ -1190,14 +973,14 @@ int g_iconv_close (GIConv cd);
|
||||
gboolean g_get_charset (G_CONST_RETURN char **charset);
|
||||
gchar *g_locale_to_utf8 (const gchar *opsysstring, gssize len,
|
||||
gsize *bytes_read, gsize *bytes_written,
|
||||
GError **gerror);
|
||||
GError **error);
|
||||
gchar *g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read,
|
||||
gsize *bytes_written, GError **gerror);
|
||||
gsize *bytes_written, GError **error);
|
||||
gchar *g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read,
|
||||
gsize *bytes_written, GError **gerror);
|
||||
gsize *bytes_written, GError **error);
|
||||
gchar *g_convert (const gchar *str, gssize len,
|
||||
const gchar *to_codeset, const gchar *from_codeset,
|
||||
gsize *bytes_read, gsize *bytes_written, GError **gerror);
|
||||
gsize *bytes_read, gsize *bytes_written, GError **error);
|
||||
|
||||
/*
|
||||
* Unicode manipulation
|
||||
@@ -1206,6 +989,8 @@ extern const guchar g_utf8_jump_table[256];
|
||||
|
||||
gboolean g_utf8_validate (const gchar *str, gssize max_len, const gchar **end);
|
||||
gunichar g_utf8_get_char_validated (const gchar *str, gssize max_len);
|
||||
gchar *g_utf8_find_prev_char (const char *str, const char *p);
|
||||
gchar *g_utf8_prev_char (const char *str);
|
||||
#define g_utf8_next_char(p) ((p) + g_utf8_jump_table[(guchar)(*p)])
|
||||
gunichar g_utf8_get_char (const gchar *src);
|
||||
glong g_utf8_strlen (const gchar *str, gssize max);
|
||||
@@ -1287,22 +1072,7 @@ glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
// For each allocator; i.e. returning gpointer that needs to be cast.
|
||||
// Macros do not recurse, so naming function and macro the same is ok.
|
||||
// However these are also already macros.
|
||||
#undef g_malloc
|
||||
#undef g_realloc
|
||||
#undef g_malloc0
|
||||
#undef g_calloc
|
||||
#undef g_try_malloc
|
||||
#undef g_try_realloc
|
||||
#undef g_memdup
|
||||
#define g_malloc(x) (g_cast (monoeg_malloc (x)))
|
||||
#define g_realloc(obj, size) (g_cast (monoeg_realloc ((obj), (size))))
|
||||
#define g_malloc0(x) (g_cast (monoeg_malloc0 (x)))
|
||||
#define g_calloc(x, y) (g_cast (monoeg_g_calloc ((x), (y))))
|
||||
#define g_try_malloc(x) (g_cast (monoeg_try_malloc (x)))
|
||||
#define g_try_realloc(obj, size) (g_cast (monoeg_try_realloc ((obj), (size))))
|
||||
#define g_memdup(mem, size) (g_cast (monoeg_g_memdup ((mem), (size))))
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
#endif // __GLIB_H
|
||||
@@ -26,12 +26,11 @@
|
||||
*
|
||||
* (C) 2006 Novell, Inc.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
GList*
|
||||
g_list_alloc (void)
|
||||
g_list_alloc ()
|
||||
{
|
||||
return g_new0 (GList, 1);
|
||||
}
|
||||
@@ -39,12 +39,11 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#define set_error(msg, ...) do { if (gerror != NULL) *gerror = g_error_new (GINT_TO_POINTER (1), 1, msg, __VA_ARGS__); } while (0);
|
||||
#define set_error(msg, ...) do { if (error != NULL) *error = g_error_new (GINT_TO_POINTER (1), 1, msg, __VA_ARGS__); } while (0);
|
||||
|
||||
typedef enum {
|
||||
START,
|
||||
@@ -54,13 +53,13 @@ typedef enum {
|
||||
CLOSING_ELEMENT,
|
||||
COMMENT,
|
||||
SKIP_XML_DECLARATION
|
||||
} MonoGMarkupParseState;
|
||||
} ParseState;
|
||||
|
||||
struct _GMarkupParseContext {
|
||||
GMarkupParser parser;
|
||||
gpointer user_data;
|
||||
GDestroyNotify user_data_dnotify;
|
||||
MonoGMarkupParseState state;
|
||||
ParseState state;
|
||||
|
||||
/* Stores the name of the current element, so we can issue the end_element */
|
||||
GSList *level;
|
||||
@@ -128,24 +127,6 @@ my_isalpha (char c)
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
my_isnamestartchar (char c)
|
||||
{
|
||||
/* NameStartChar from https://www.w3.org/TR/xml/#sec-common-syn excluding non-ASCII and ':' */
|
||||
if (my_isalpha (c) || c == '_')
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
my_isnamechar (char c)
|
||||
{
|
||||
/* NameChar from https://www.w3.org/TR/xml/#sec-common-syn excluding non-ASCII and ':' */
|
||||
if (my_isalnum (c) || c == '_' || c == '-' || c == '.')
|
||||
return TRUE;
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static const char *
|
||||
skip_space (const char *p, const char *end)
|
||||
{
|
||||
@@ -155,7 +136,7 @@ skip_space (const char *p, const char *end)
|
||||
}
|
||||
|
||||
static const char *
|
||||
parse_value (const char *p, const char *end, char **value, GError **gerror)
|
||||
parse_value (const char *p, const char *end, char **value, GError **error)
|
||||
{
|
||||
const char *start;
|
||||
int l;
|
||||
@@ -185,9 +166,8 @@ parse_name (const char *p, const char *end, char **value)
|
||||
const char *start = p;
|
||||
int l;
|
||||
|
||||
if (p < end && my_isnamestartchar (*p))
|
||||
for (; p < end && my_isnamechar (*p); p++)
|
||||
;
|
||||
for (; p < end && my_isalnum (*p); p++)
|
||||
;
|
||||
if (p == end)
|
||||
return end;
|
||||
|
||||
@@ -201,7 +181,7 @@ parse_name (const char *p, const char *end, char **value)
|
||||
}
|
||||
|
||||
static const char *
|
||||
parse_attributes (const char *p, const char *end, char ***names, char ***values, GError **gerror, int *full_stop, int state)
|
||||
parse_attributes (const char *p, const char *end, char ***names, char ***values, GError **error, int *full_stop, int state)
|
||||
{
|
||||
int nnames = 0;
|
||||
|
||||
@@ -246,7 +226,7 @@ parse_attributes (const char *p, const char *end, char ***names, char ***values,
|
||||
return end;
|
||||
}
|
||||
|
||||
p = parse_value (p, end, &value, gerror);
|
||||
p = parse_value (p, end, &value, error);
|
||||
if (p == end){
|
||||
g_free (name);
|
||||
return p;
|
||||
@@ -281,7 +261,7 @@ destroy_parse_state (GMarkupParseContext *context)
|
||||
gboolean
|
||||
g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
const gchar *text, gssize text_len,
|
||||
GError **gerror)
|
||||
GError **error)
|
||||
{
|
||||
const char *p, *end;
|
||||
|
||||
@@ -329,12 +309,12 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
break;
|
||||
}
|
||||
|
||||
if (!my_isnamestartchar (*p)){
|
||||
if (!my_isalpha (*p)){
|
||||
set_error ("%s", "Expected an element name");
|
||||
goto fail;
|
||||
}
|
||||
|
||||
for (++p; p < end && my_isnamechar (*p); p++)
|
||||
for (++p; p < end && (my_isalnum (*p) || (*p == '.')); p++)
|
||||
;
|
||||
if (p == end){
|
||||
set_error ("%s", "Expected an element");
|
||||
@@ -348,14 +328,14 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
set_error ("%s", "Unfinished element");
|
||||
goto fail;
|
||||
}
|
||||
p = parse_attributes (p, end, &names, &values, gerror, &full_stop, context->state);
|
||||
p = parse_attributes (p, end, &names, &values, error, &full_stop, context->state);
|
||||
if (p == end){
|
||||
if (names != NULL) {
|
||||
g_strfreev (names);
|
||||
g_strfreev (values);
|
||||
}
|
||||
/* Only set the error if parse_attributes did not */
|
||||
if (gerror != NULL && *gerror == NULL)
|
||||
if (error != NULL && *error == NULL)
|
||||
set_error ("%s", "Unfinished sequence");
|
||||
goto fail;
|
||||
}
|
||||
@@ -371,22 +351,22 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
context->parser.start_element (context, ename,
|
||||
(const gchar **) names,
|
||||
(const gchar **) values,
|
||||
context->user_data, gerror);
|
||||
context->user_data, error);
|
||||
|
||||
if (names != NULL){
|
||||
g_strfreev (names);
|
||||
g_strfreev (values);
|
||||
}
|
||||
|
||||
if (gerror != NULL && *gerror != NULL){
|
||||
if (error != NULL && *error != NULL){
|
||||
g_free (ename);
|
||||
goto fail;
|
||||
}
|
||||
|
||||
if (full_stop){
|
||||
if (context->parser.end_element != NULL && context->state == START_ELEMENT){
|
||||
context->parser.end_element (context, ename, context->user_data, gerror);
|
||||
if (gerror != NULL && *gerror != NULL){
|
||||
context->parser.end_element (context, ename, context->user_data, error);
|
||||
if (error != NULL && *error != NULL){
|
||||
g_free (ename);
|
||||
goto fail;
|
||||
}
|
||||
@@ -426,8 +406,8 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
case FLUSH_TEXT:
|
||||
if (context->parser.text != NULL && context->text != NULL){
|
||||
context->parser.text (context, context->text->str, context->text->len,
|
||||
context->user_data, gerror);
|
||||
if (gerror != NULL && *gerror != NULL)
|
||||
context->user_data, error);
|
||||
if (error != NULL && *error != NULL)
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@@ -448,10 +428,10 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
goto fail;
|
||||
}
|
||||
|
||||
text = (char*)current->data;
|
||||
text = current->data;
|
||||
if (context->parser.end_element != NULL){
|
||||
context->parser.end_element (context, text, context->user_data, gerror);
|
||||
if (gerror != NULL && *gerror != NULL){
|
||||
context->parser.end_element (context, text, context->user_data, error);
|
||||
if (error != NULL && *error != NULL){
|
||||
g_free (text);
|
||||
goto fail;
|
||||
}
|
||||
@@ -473,15 +453,15 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
|
||||
|
||||
return TRUE;
|
||||
fail:
|
||||
if (context->parser.error && gerror != NULL && *gerror)
|
||||
context->parser.error (context, *gerror, context->user_data);
|
||||
if (context->parser.error && error != NULL && *error)
|
||||
context->parser.error (context, *error, context->user_data);
|
||||
|
||||
destroy_parse_state (context);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_markup_parse_context_end_parse (GMarkupParseContext *context, GError **gerror)
|
||||
g_markup_parse_context_end_parse (GMarkupParseContext *context, GError **error)
|
||||
{
|
||||
g_return_val_if_fail (context != NULL, FALSE);
|
||||
|
||||
@@ -29,11 +29,6 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <glib.h>
|
||||
#include <eglib-remap.h> // Remove the cast macros and restore the rename macros.
|
||||
#undef malloc
|
||||
#undef realloc
|
||||
#undef free
|
||||
#undef calloc
|
||||
|
||||
#if defined (ENABLE_OVERRIDABLE_ALLOCATORS)
|
||||
|
||||
@@ -116,7 +111,7 @@ gpointer g_calloc (gsize n, gsize x)
|
||||
gpointer ptr;
|
||||
if (!x || !n)
|
||||
return 0;
|
||||
ptr = G_CALLOC_INTERNAL (n, x);
|
||||
ptr = G_CALLOC_INTERNAL (n, x);
|
||||
if (ptr)
|
||||
return ptr;
|
||||
g_error ("Could not allocate %i (%i * %i) bytes", x*n, n, x);
|
||||
@@ -127,7 +127,7 @@ get_pw_data (void)
|
||||
{
|
||||
#ifdef HAVE_GETPWUID_R
|
||||
struct passwd pw;
|
||||
struct passwd *result = NULL;
|
||||
struct passwd *result;
|
||||
char buf [4096];
|
||||
#endif
|
||||
|
||||
@@ -145,7 +145,7 @@ get_pw_data (void)
|
||||
|
||||
#ifdef HAVE_GETPWUID_R
|
||||
if (home_dir == NULL || user_name == NULL) {
|
||||
if (getpwuid_r (getuid (), &pw, buf, 4096, &result) == 0 && result) {
|
||||
if (getpwuid_r (getuid (), &pw, buf, 4096, &result) == 0) {
|
||||
if (home_dir == NULL)
|
||||
home_dir = g_strdup (pw.pw_dir);
|
||||
if (user_name == NULL)
|
||||
File renamed without changes.
@@ -133,12 +133,7 @@ g_get_known_folder_path (void)
|
||||
{
|
||||
gchar *folder_path = NULL;
|
||||
PWSTR profile_path = NULL;
|
||||
#ifdef __cplusplus
|
||||
REFGUID folderid = FOLDERID_Profile;
|
||||
#else
|
||||
REFGUID folderid = &FOLDERID_Profile;
|
||||
#endif
|
||||
HRESULT hr = SHGetKnownFolderPath (folderid, KF_FLAG_DEFAULT, NULL, &profile_path);
|
||||
HRESULT hr = SHGetKnownFolderPath (&FOLDERID_Profile, KF_FLAG_DEFAULT, NULL, &profile_path);
|
||||
if (SUCCEEDED(hr)) {
|
||||
folder_path = u16to8 (profile_path);
|
||||
CoTaskMemFree (profile_path);
|
||||
@@ -175,8 +170,8 @@ g_get_home_dir (void)
|
||||
sprintf (home_dir, "%s%s", drive, path);
|
||||
}
|
||||
}
|
||||
g_free ((void*)drive);
|
||||
g_free ((void*)path);
|
||||
g_free (drive);
|
||||
g_free (path);
|
||||
}
|
||||
|
||||
return home_dir;
|
||||
@@ -273,7 +273,7 @@ g_module_close (GModule *module)
|
||||
gchar *
|
||||
g_module_build_path (const gchar *directory, const gchar *module_name)
|
||||
{
|
||||
const char *lib_prefix = "";
|
||||
char *lib_prefix = "";
|
||||
|
||||
if (module_name == NULL)
|
||||
return NULL;
|
||||
@@ -281,8 +281,10 @@ g_module_build_path (const gchar *directory, const gchar *module_name)
|
||||
if (strncmp (module_name, "lib", 3) != 0)
|
||||
lib_prefix = LIBPREFIX;
|
||||
|
||||
if (directory && *directory)
|
||||
if (directory && *directory){
|
||||
|
||||
return g_strdup_printf ("%s/%s%s" LIBSUFFIX, directory, lib_prefix, module_name);
|
||||
}
|
||||
return g_strdup_printf ("%s%s" LIBSUFFIX, lib_prefix, module_name);
|
||||
}
|
||||
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -20,14 +20,9 @@ typedef enum {
|
||||
G_MODULE_BIND_LOCAL = 0x02,
|
||||
G_MODULE_BIND_MASK = 0x03
|
||||
} GModuleFlags;
|
||||
|
||||
G_ENUM_FUNCTIONS (GModuleFlags)
|
||||
|
||||
typedef struct _GModule GModule;
|
||||
|
||||
G_EXTERN_C // Used by libtest, at least.
|
||||
GModule *g_module_open (const gchar *file, GModuleFlags flags);
|
||||
G_EXTERN_C // Used by libtest, at least.
|
||||
gboolean g_module_symbol (GModule *module, const gchar *symbol_name,
|
||||
gpointer *symbol);
|
||||
const gchar *g_module_error (void);
|
||||
@@ -0,0 +1,277 @@
|
||||
/*
|
||||
* Output and debugging functions
|
||||
*
|
||||
* Author:
|
||||
* Miguel de Icaza ([email protected])
|
||||
*
|
||||
* (C) 2006 Novell, Inc.
|
||||
* Copyright 2011 Xamarin Inc.
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <glib.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);
|
||||
|
||||
void
|
||||
g_print (const gchar *format, ...)
|
||||
{
|
||||
char *msg;
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
if (g_vasprintf (&msg, format, args) < 0) {
|
||||
va_end (args);
|
||||
return;
|
||||
}
|
||||
va_end (args);
|
||||
|
||||
if (!stdout_handler)
|
||||
stdout_handler = default_stdout_handler;
|
||||
|
||||
stdout_handler (msg);
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
void
|
||||
g_printerr (const gchar *format, ...)
|
||||
{
|
||||
char *msg;
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
if (g_vasprintf (&msg, format, args) < 0) {
|
||||
va_end (args);
|
||||
return;
|
||||
}
|
||||
va_end (args);
|
||||
|
||||
if (!stderr_handler)
|
||||
stderr_handler = default_stderr_handler;
|
||||
|
||||
stderr_handler (msg);
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
GLogLevelFlags
|
||||
g_log_set_always_fatal (GLogLevelFlags fatal_mask)
|
||||
{
|
||||
GLogLevelFlags old_fatal = fatal;
|
||||
|
||||
fatal |= fatal_mask;
|
||||
|
||||
return old_fatal;
|
||||
}
|
||||
|
||||
GLogLevelFlags
|
||||
g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask)
|
||||
{
|
||||
/*
|
||||
* Mono does not use a G_LOG_DOMAIN currently, so we just assume things are fatal
|
||||
* if we decide to set G_LOG_DOMAIN (we probably should) we should implement
|
||||
* this.
|
||||
*/
|
||||
return fatal_mask;
|
||||
}
|
||||
|
||||
void
|
||||
g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args)
|
||||
{
|
||||
char *msg;
|
||||
|
||||
if (!default_log_func)
|
||||
default_log_func = g_log_default_handler;
|
||||
|
||||
if (g_vasprintf (&msg, format, args) < 0)
|
||||
return;
|
||||
|
||||
default_log_func (log_domain, log_level, msg, default_log_func_user_data);
|
||||
g_free (msg);
|
||||
}
|
||||
|
||||
void
|
||||
g_log (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
g_logv (log_domain, log_level, format, args);
|
||||
va_end (args);
|
||||
}
|
||||
|
||||
void
|
||||
g_assertion_message (const gchar *format, ...)
|
||||
{
|
||||
va_list args;
|
||||
|
||||
va_start (args, format);
|
||||
g_logv (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, format, args);
|
||||
va_end (args);
|
||||
exit (0);
|
||||
}
|
||||
|
||||
|
||||
#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;
|
||||
}
|
||||
|
||||
@@ -97,9 +97,9 @@ strrchr_seperator (const gchar* filename)
|
||||
#endif
|
||||
char *p;
|
||||
|
||||
p = (char*)strrchr (filename, G_DIR_SEPARATOR);
|
||||
p = strrchr (filename, G_DIR_SEPARATOR);
|
||||
#ifdef G_OS_WIN32
|
||||
p2 = (char*)strrchr (filename, '/');
|
||||
p2 = strrchr (filename, '/');
|
||||
if (p2 > p)
|
||||
p = p2;
|
||||
#endif
|
||||
@@ -160,8 +160,7 @@ g_path_get_basename (const char *filename)
|
||||
return g_strdup (&r[1]);
|
||||
}
|
||||
|
||||
//wasm does have strtok_r even though autoconf fails to find
|
||||
#if !defined (HAVE_STRTOK_R) && !defined (HOST_WASM)
|
||||
#ifndef HAVE_STRTOK_R
|
||||
// This is from BSD's strtok_r
|
||||
|
||||
char *
|
||||
@@ -224,7 +223,7 @@ g_find_program_in_path (const gchar *program)
|
||||
char *save = NULL;
|
||||
#ifdef G_OS_WIN32
|
||||
char *program_exe;
|
||||
static char const * const suffix_list[5] = {".exe",".cmd",".bat",".com",NULL};
|
||||
char *suffix_list[5] = {".exe",".cmd",".bat",".com",NULL};
|
||||
int listx;
|
||||
gboolean hasSuffix;
|
||||
#endif
|
||||
@@ -251,13 +250,11 @@ g_find_program_in_path (const gchar *program)
|
||||
|
||||
x = NULL;
|
||||
probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program, NULL);
|
||||
#ifdef HAVE_ACCESS
|
||||
if (g_access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
g_free (curdir);
|
||||
g_free (p);
|
||||
return probe_path;
|
||||
}
|
||||
#endif
|
||||
g_free (probe_path);
|
||||
|
||||
#ifdef G_OS_WIN32
|
||||
@@ -267,14 +264,12 @@ g_find_program_in_path (const gchar *program)
|
||||
while (suffix_list[listx]) {
|
||||
program_exe = g_strjoin(NULL,program,suffix_list[listx],NULL);
|
||||
probe_path = g_build_path (G_DIR_SEPARATOR_S, l, program_exe, NULL);
|
||||
#ifdef HAVE_ACCESS
|
||||
if (g_access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
if (access (probe_path, X_OK) == 0){ /* FIXME: on windows this is just a read permissions test */
|
||||
g_free (curdir);
|
||||
g_free (p);
|
||||
g_free (program_exe);
|
||||
return probe_path;
|
||||
}
|
||||
#endif
|
||||
listx++;
|
||||
g_free (probe_path);
|
||||
g_free (program_exe);
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <glib.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
@@ -27,7 +27,7 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -225,8 +225,3 @@ g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc compare, gpointer
|
||||
g_qsort_with_data (array->pdata, array->len, sizeof (gpointer), compare, user_data);
|
||||
}
|
||||
|
||||
guint
|
||||
g_ptr_array_capacity (GPtrArray *array)
|
||||
{
|
||||
return ((GPtrArrayPriv *)array)->size;
|
||||
}
|
||||
@@ -24,7 +24,7 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -40,14 +40,14 @@ typedef struct _QSortStack {
|
||||
size_t count;
|
||||
} QSortStack;
|
||||
|
||||
#define QSORT_PUSH(sp, a, c) ((sp)->array = (char*)(a), (sp)->count = (c), (sp)++)
|
||||
#define QSORT_POP(sp, a, c) ((sp)--, (a) = (sp)->array, (c) = (sp)->count)
|
||||
#define QSORT_PUSH(sp, a, c) (sp->array = a, sp->count = c, sp++)
|
||||
#define QSORT_POP(sp, a, c) (sp--, a = sp->array, c = sp->count)
|
||||
|
||||
#define SWAPTYPE(TYPE, a, b) { \
|
||||
gssize __n = size / sizeof (TYPE); \
|
||||
TYPE *__a = (TYPE *) (a); \
|
||||
TYPE *__b = (TYPE *) (b); \
|
||||
TYPE t; \
|
||||
long __n = size / sizeof (TYPE); \
|
||||
register TYPE *__a = (TYPE *) (a); \
|
||||
register TYPE *__b = (TYPE *) (b); \
|
||||
register TYPE t; \
|
||||
\
|
||||
do { \
|
||||
t = *__a; \
|
||||
@@ -69,7 +69,7 @@ void
|
||||
g_qsort_with_data (gpointer base, size_t nmemb, size_t size, GCompareDataFunc compare, gpointer user_data)
|
||||
{
|
||||
QSortStack stack[STACK_SIZE], *sp;
|
||||
char *i, *k, *mid;
|
||||
register char *i, *k, *mid;
|
||||
size_t n, n1, n2;
|
||||
char *lo, *hi;
|
||||
int swaplong;
|
||||
@@ -27,7 +27,7 @@
|
||||
* Copyright (c) 2006-2009 Novell, Inc.
|
||||
*
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -25,12 +25,11 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
static int
|
||||
split_cmdline (const gchar *cmdline, GPtrArray *array, GError **gerror)
|
||||
split_cmdline (const gchar *cmdline, GPtrArray *array, GError **error)
|
||||
{
|
||||
gchar *ptr;
|
||||
gchar c;
|
||||
@@ -82,15 +81,15 @@ split_cmdline (const gchar *cmdline, GPtrArray *array, GError **gerror)
|
||||
}
|
||||
|
||||
if (escaped) {
|
||||
if (gerror)
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 0, "Unfinished escape.");
|
||||
if (error)
|
||||
*error = g_error_new (G_LOG_DOMAIN, 0, "Unfinished escape.");
|
||||
g_string_free (str, TRUE);
|
||||
return -1;
|
||||
}
|
||||
|
||||
if (quote_char) {
|
||||
if (gerror)
|
||||
*gerror = g_error_new (G_LOG_DOMAIN, 0, "Unfinished quote.");
|
||||
if (error)
|
||||
*error = g_error_new (G_LOG_DOMAIN, 0, "Unfinished quote.");
|
||||
g_string_free (str, TRUE);
|
||||
return -1;
|
||||
}
|
||||
@@ -105,17 +104,17 @@ split_cmdline (const gchar *cmdline, GPtrArray *array, GError **gerror)
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **gerror)
|
||||
g_shell_parse_argv (const gchar *command_line, gint *argcp, gchar ***argvp, GError **error)
|
||||
{
|
||||
GPtrArray *array;
|
||||
gint argc;
|
||||
gchar **argv;
|
||||
|
||||
g_return_val_if_fail (command_line, FALSE);
|
||||
g_return_val_if_fail (gerror == NULL || *gerror == NULL, FALSE);
|
||||
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
|
||||
|
||||
array = g_ptr_array_new();
|
||||
if (split_cmdline (command_line, array, gerror)) {
|
||||
if (split_cmdline (command_line, array, error)) {
|
||||
g_ptr_array_add (array, NULL);
|
||||
g_strfreev ((gchar **) array->pdata);
|
||||
g_ptr_array_free (array, FALSE);
|
||||
@@ -161,7 +160,7 @@ g_shell_quote (const gchar *unquoted_string)
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
g_shell_unquote (const gchar *quoted_string, GError **error)
|
||||
{
|
||||
GString *result;
|
||||
const char *p;
|
||||
@@ -193,7 +192,7 @@ g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
g_string_append_c (result, *p);
|
||||
}
|
||||
if (!*p){
|
||||
g_set_error (gerror, 0, 0, "Open quote");
|
||||
g_set_error (error, 0, 0, "Open quote");
|
||||
return NULL;
|
||||
}
|
||||
} else if (*p == '"'){
|
||||
@@ -204,7 +203,7 @@ g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
if (*p == '\\'){
|
||||
p++;
|
||||
if (*p == 0){
|
||||
g_set_error (gerror, 0, 0, "Open quote");
|
||||
g_set_error (error, 0, 0, "Open quote");
|
||||
return NULL;
|
||||
}
|
||||
switch (*p){
|
||||
@@ -221,7 +220,7 @@ g_shell_unquote (const gchar *quoted_string, GError **gerror)
|
||||
g_string_append_c (result, *p);
|
||||
}
|
||||
if (!*p){
|
||||
g_set_error (gerror, 0, 0, "Open quote");
|
||||
g_set_error (error, 0, 0, "Open quote");
|
||||
return NULL;
|
||||
}
|
||||
} else if (*p == '\\'){
|
||||
@@ -26,7 +26,7 @@
|
||||
*
|
||||
* (C) 2006 Novell, Inc.
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -68,9 +68,9 @@
|
||||
#define pipe(x) _pipe(x, 256, 0)
|
||||
#endif
|
||||
|
||||
#define set_error(msg, ...) do { if (gerror != NULL) *gerror = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_cond(cond,msg, ...) do { if ((cond) && gerror != NULL) *gerror = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_status(status,msg, ...) do { if (gerror != NULL) *gerror = g_error_new (G_LOG_DOMAIN, status, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error(msg, ...) do { if (error != NULL) *error = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_cond(cond,msg, ...) do { if ((cond) && error != NULL) *error = g_error_new (G_LOG_DOMAIN, 1, msg, __VA_ARGS__); } while (0)
|
||||
#define set_error_status(status,msg, ...) do { if (error != NULL) *error = g_error_new (G_LOG_DOMAIN, status, msg, __VA_ARGS__); } while (0)
|
||||
#define NO_INTR(var,cmd) do { (var) = (cmd); } while ((var) == -1 && errno == EINTR)
|
||||
#define CLOSE_PIPE(p) do { close (p [0]); close (p [1]); } while (0)
|
||||
|
||||
@@ -80,9 +80,7 @@
|
||||
* arm-apple-darwin9. We'll manually define the symbol on Apple as it does
|
||||
* in fact exist on all implementations (so far)
|
||||
*/
|
||||
G_BEGIN_DECLS
|
||||
gchar ***_NSGetEnviron(void);
|
||||
G_END_DECLS
|
||||
#define environ (*_NSGetEnviron())
|
||||
#else
|
||||
static char *mono_environ[1] = { NULL };
|
||||
@@ -91,14 +89,12 @@ static char *mono_environ[1] = { NULL };
|
||||
#elif defined(_MSC_VER)
|
||||
/* MS defines this in stdlib.h */
|
||||
#else
|
||||
G_BEGIN_DECLS
|
||||
extern char **environ;
|
||||
G_END_DECLS
|
||||
#endif
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static int
|
||||
safe_read (int fd, gchar *buffer, gint count, GError **gerror)
|
||||
safe_read (int fd, gchar *buffer, gint count, GError **error)
|
||||
{
|
||||
int res;
|
||||
|
||||
@@ -108,7 +104,7 @@ safe_read (int fd, gchar *buffer, gint count, GError **gerror)
|
||||
}
|
||||
|
||||
static int
|
||||
read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **gerror)
|
||||
read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **error)
|
||||
{
|
||||
fd_set rfds;
|
||||
int res;
|
||||
@@ -155,7 +151,7 @@ read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **ger
|
||||
if (buffer == NULL)
|
||||
buffer = g_malloc (1024);
|
||||
if (!out_closed && FD_ISSET (outfd, &rfds)) {
|
||||
nread = safe_read (outfd, buffer, 1024, gerror);
|
||||
nread = safe_read (outfd, buffer, 1024, error);
|
||||
if (nread < 0) {
|
||||
close (errfd);
|
||||
close (outfd);
|
||||
@@ -169,7 +165,7 @@ read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **ger
|
||||
}
|
||||
|
||||
if (!err_closed && FD_ISSET (errfd, &rfds)) {
|
||||
nread = safe_read (errfd, buffer, 1024, gerror);
|
||||
nread = safe_read (errfd, buffer, 1024, error);
|
||||
if (nread < 0) {
|
||||
close (errfd);
|
||||
close (outfd);
|
||||
@@ -195,7 +191,7 @@ read_pipes (int outfd, gchar **out_str, int errfd, gchar **err_str, GError **ger
|
||||
}
|
||||
|
||||
static gboolean
|
||||
create_pipe (int *fds, GError **gerror)
|
||||
create_pipe (int *fds, GError **error)
|
||||
{
|
||||
if (pipe (fds) == -1) {
|
||||
set_error ("%s", "Error creating pipe.");
|
||||
@@ -254,7 +250,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
gchar **standard_output,
|
||||
gchar **standard_error,
|
||||
gint *exit_status,
|
||||
GError **gerror)
|
||||
GError **error)
|
||||
{
|
||||
#ifdef G_OS_WIN32
|
||||
#elif !defined (HAVE_FORK) || !defined (HAVE_EXECV)
|
||||
@@ -269,13 +265,13 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
int status;
|
||||
int res;
|
||||
|
||||
if (!g_shell_parse_argv (command_line, &argc, &argv, gerror))
|
||||
if (!g_shell_parse_argv (command_line, &argc, &argv, error))
|
||||
return FALSE;
|
||||
|
||||
if (standard_output && !create_pipe (stdout_pipe, gerror))
|
||||
if (standard_output && !create_pipe (stdout_pipe, error))
|
||||
return FALSE;
|
||||
|
||||
if (standard_error && !create_pipe (stderr_pipe, gerror)) {
|
||||
if (standard_error && !create_pipe (stderr_pipe, error)) {
|
||||
if (standard_output) {
|
||||
CLOSE_PIPE (stdout_pipe);
|
||||
}
|
||||
@@ -321,7 +317,7 @@ g_spawn_command_line_sync (const gchar *command_line,
|
||||
close (stderr_pipe [1]);
|
||||
|
||||
if (standard_output || standard_error) {
|
||||
res = read_pipes (stdout_pipe [0], standard_output, stderr_pipe [0], standard_error, gerror);
|
||||
res = read_pipes (stdout_pipe [0], standard_output, stderr_pipe [0], standard_error, error);
|
||||
if (res) {
|
||||
waitpid (pid, &status, WNOHANG); /* avoid zombie */
|
||||
return FALSE;
|
||||
@@ -353,7 +349,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
gint *standard_input,
|
||||
gint *standard_output,
|
||||
gint *standard_error,
|
||||
GError **gerror)
|
||||
GError **error)
|
||||
{
|
||||
#ifdef G_OS_WIN32
|
||||
#elif !defined (HAVE_FORK) || !defined (HAVE_EXECVE)
|
||||
@@ -369,21 +365,21 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
|
||||
g_return_val_if_fail (argv != NULL, FALSE); /* Only mandatory arg */
|
||||
|
||||
if (!create_pipe (info_pipe, gerror))
|
||||
if (!create_pipe (info_pipe, error))
|
||||
return FALSE;
|
||||
|
||||
if (standard_output && !create_pipe (out_pipe, gerror)) {
|
||||
if (standard_output && !create_pipe (out_pipe, error)) {
|
||||
CLOSE_PIPE (info_pipe);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (standard_error && !create_pipe (err_pipe, gerror)) {
|
||||
if (standard_error && !create_pipe (err_pipe, error)) {
|
||||
CLOSE_PIPE (info_pipe);
|
||||
CLOSE_PIPE (out_pipe);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (standard_input && !create_pipe (in_pipe, gerror)) {
|
||||
if (standard_input && !create_pipe (in_pipe, error)) {
|
||||
CLOSE_PIPE (info_pipe);
|
||||
CLOSE_PIPE (out_pipe);
|
||||
CLOSE_PIPE (err_pipe);
|
||||
@@ -481,8 +477,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
|
||||
}
|
||||
|
||||
execve (arg0, actual_args, envp);
|
||||
int const err = errno;
|
||||
write_all (info_pipe [1], &err, sizeof (int));
|
||||
write_all (info_pipe [1], &errno, sizeof (int));
|
||||
exit (0);
|
||||
}
|
||||
} else if ((flags & G_SPAWN_DO_NOT_REAP_CHILD) == 0) {
|
||||
@@ -32,12 +32,6 @@
|
||||
#include <ctype.h>
|
||||
#include <glib.h>
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#include <errno.h>
|
||||
|
||||
/*
|
||||
* g_strndup and g_vasprintf need to allocate memory with g_malloc if
|
||||
* ENABLE_OVERRIDABLE_ALLOCATORS is defined so that it can be safely freed with g_free
|
||||
@@ -197,79 +191,10 @@ g_strdup_printf (const gchar *format, ...)
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
Max error number we support. It's empirically found by looking at our target OS.
|
||||
|
||||
Last this was checked was June-2017.
|
||||
|
||||
Apple is at 106.
|
||||
Android is at 133.
|
||||
*/
|
||||
#define MONO_ERRNO_MAX 200
|
||||
#define str(s) #s
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static pthread_mutex_t strerror_lock = PTHREAD_MUTEX_INITIALIZER;
|
||||
#endif
|
||||
|
||||
static char *error_messages [MONO_ERRNO_MAX];
|
||||
|
||||
const gchar *
|
||||
g_strerror (gint errnum)
|
||||
{
|
||||
if (errnum < 0)
|
||||
errnum = -errnum;
|
||||
if (errnum >= MONO_ERRNO_MAX)
|
||||
return ("Error number higher than " str (MONO_ERRNO_MAX));
|
||||
|
||||
if (!error_messages [errnum]) {
|
||||
#ifndef G_OS_WIN32
|
||||
pthread_mutex_lock (&strerror_lock);
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_STRERROR_R
|
||||
char tmp_buff [128]; //Quite arbitrary, should be large enough
|
||||
char *buff = tmp_buff;
|
||||
size_t buff_len = sizeof (tmp_buff);
|
||||
buff [0] = 0;
|
||||
|
||||
#ifndef STRERROR_R_CHAR_P
|
||||
int r;
|
||||
while ((r = strerror_r (errnum, buff, buff_len - 1))) {
|
||||
if (r != ERANGE) {
|
||||
buff = g_strdup_printf ("Invalid Error code '%d'", errnum);
|
||||
break;
|
||||
}
|
||||
if (buff == tmp_buff)
|
||||
buff = g_malloc (buff_len * 2);
|
||||
else
|
||||
buff = g_realloc (buff, buff_len * 2);
|
||||
buff_len *= 2;
|
||||
//Spec is not clean on whether size argument includes space for null terminator or not
|
||||
}
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup (buff);
|
||||
if (buff != tmp_buff)
|
||||
g_free (buff);
|
||||
#else /* STRERROR_R_CHAR_P */
|
||||
buff = strerror_r (errnum, buff, buff_len);
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup (buff);
|
||||
#endif /* STRERROR_R_CHAR_P */
|
||||
|
||||
#else /* HAVE_STRERROR_R */
|
||||
if (!error_messages [errnum])
|
||||
error_messages [errnum] = g_strdup_printf ("Error code '%d'", errnum);
|
||||
#endif /* HAVE_STRERROR_R */
|
||||
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
pthread_mutex_unlock (&strerror_lock);
|
||||
#endif
|
||||
|
||||
}
|
||||
return error_messages [errnum];
|
||||
return strerror (errnum);
|
||||
}
|
||||
|
||||
gchar *
|
||||
@@ -662,7 +587,7 @@ char_needs_encoding (char c)
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **gerror)
|
||||
g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **error)
|
||||
{
|
||||
size_t n;
|
||||
char *ret, *rp;
|
||||
@@ -679,8 +604,8 @@ g_filename_to_uri (const gchar *filename, const gchar *hostname, GError **gerror
|
||||
g_warning ("%s", "eglib: g_filename_to_uri: hostname not handled");
|
||||
|
||||
if (!g_path_is_absolute (filename)){
|
||||
if (gerror != NULL)
|
||||
*gerror = g_error_new (NULL, 2, "Not an absolute filename");
|
||||
if (error != NULL)
|
||||
*error = g_error_new (NULL, 2, "Not an absolute filename");
|
||||
|
||||
return NULL;
|
||||
}
|
||||
@@ -724,15 +649,15 @@ decode (char p)
|
||||
if (p >= '0' && p <= '9')
|
||||
return p - '0';
|
||||
if (p >= 'A' && p <= 'F')
|
||||
return (p - 'A') + 10;
|
||||
return p - 'A';
|
||||
if (p >= 'a' && p <= 'f')
|
||||
return (p - 'a') + 10;
|
||||
return p - 'a';
|
||||
g_assert_not_reached ();
|
||||
return 0;
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror)
|
||||
g_filename_from_uri (const gchar *uri, gchar **hostname, GError **error)
|
||||
{
|
||||
const char *p;
|
||||
char *r, *result;
|
||||
@@ -744,8 +669,8 @@ g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror)
|
||||
g_warning ("%s", "eglib: g_filename_from_uri: hostname not handled");
|
||||
|
||||
if (strncmp (uri, "file:///", 8) != 0){
|
||||
if (gerror != NULL)
|
||||
*gerror = g_error_new (NULL, 2, "URI does not start with the file: scheme");
|
||||
if (error != NULL)
|
||||
*error = g_error_new (NULL, 2, "URI does not start with the file: scheme");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
@@ -754,8 +679,8 @@ g_filename_from_uri (const gchar *uri, gchar **hostname, GError **gerror)
|
||||
if (p [1] && p [2] && isxdigit (p [1]) && isxdigit (p [2])){
|
||||
p += 2;
|
||||
} else {
|
||||
if (gerror != NULL)
|
||||
*gerror = g_error_new (NULL, 2, "URI contains an invalid escape sequence");
|
||||
if (error != NULL)
|
||||
*error = g_error_new (NULL, 2, "URI contains an invalid escape sequence");
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
@@ -886,45 +811,22 @@ g_ascii_strcasecmp (const gchar *s1, const gchar *s2)
|
||||
return (*sp1) - (*sp2);
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_utf16_ascii_equal (const gunichar2 *utf16, size_t ulen, const char *ascii, size_t alen)
|
||||
{
|
||||
size_t i;
|
||||
if (ulen != alen)
|
||||
return FALSE;
|
||||
for (i = 0; i < ulen; ++i) {
|
||||
if (utf16[i] != ascii[i])
|
||||
return FALSE;
|
||||
}
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_utf16_asciiz_equal (const gunichar2 *utf16, const char *ascii)
|
||||
// z for zero means null terminated
|
||||
{
|
||||
while (1)
|
||||
{
|
||||
char a = *ascii++;
|
||||
gunichar2 u = *utf16++;
|
||||
if (a != u)
|
||||
return FALSE;
|
||||
if (a == 0)
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
g_strdelimit (gchar *string, gchar delimiter, gchar new_delimiter)
|
||||
gchar *
|
||||
g_strdelimit (gchar *string, const gchar *delimiters, gchar new_delimiter)
|
||||
{
|
||||
gchar *ptr;
|
||||
|
||||
g_return_if_fail (string != NULL);
|
||||
g_return_val_if_fail (string != NULL, NULL);
|
||||
|
||||
if (delimiters == NULL)
|
||||
delimiters = G_STR_DELIMITERS;
|
||||
|
||||
for (ptr = string; *ptr; ptr++) {
|
||||
if (delimiter == *ptr)
|
||||
if (strchr (delimiters, *ptr))
|
||||
*ptr = new_delimiter;
|
||||
}
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
gsize
|
||||
@@ -26,7 +26,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -147,6 +146,41 @@ g_string_append_unichar (GString *string, gunichar c)
|
||||
return g_string_append_len (string, utf8, len);
|
||||
}
|
||||
|
||||
GString *
|
||||
g_string_prepend (GString *string, const gchar *val)
|
||||
{
|
||||
gssize len;
|
||||
|
||||
g_return_val_if_fail (string != NULL, string);
|
||||
g_return_val_if_fail (val != NULL, string);
|
||||
|
||||
len = strlen (val);
|
||||
|
||||
GROW_IF_NECESSARY(string, len);
|
||||
memmove(string->str + len, string->str, string->len + 1);
|
||||
memcpy(string->str, val, len);
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
GString *
|
||||
g_string_insert (GString *string, gssize pos, const gchar *val)
|
||||
{
|
||||
gssize len;
|
||||
|
||||
g_return_val_if_fail (string != NULL, string);
|
||||
g_return_val_if_fail (val != NULL, string);
|
||||
g_return_val_if_fail (pos <= string->len, string);
|
||||
|
||||
len = strlen (val);
|
||||
|
||||
GROW_IF_NECESSARY(string, len);
|
||||
memmove(string->str + pos + len, string->str + pos, string->len - pos - len + 1);
|
||||
memcpy(string->str + pos, val, len);
|
||||
|
||||
return string;
|
||||
}
|
||||
|
||||
void
|
||||
g_string_append_printf (GString *string, const gchar *format, ...)
|
||||
{
|
||||
@@ -220,3 +254,23 @@ g_string_set_size (GString *string, gsize len)
|
||||
string->str[len] = 0;
|
||||
return string;
|
||||
}
|
||||
|
||||
GString *
|
||||
g_string_erase (GString *string, gssize pos, gssize len)
|
||||
{
|
||||
g_return_val_if_fail (string != NULL, string);
|
||||
|
||||
/* Silent return */
|
||||
if (pos >= string->len)
|
||||
return string;
|
||||
|
||||
if (len == -1 || (pos + len) >= string->len) {
|
||||
string->str[pos] = 0;
|
||||
}
|
||||
else {
|
||||
memmove (string->str + pos, string->str + pos + len, string->len - (pos + len) + 1);
|
||||
string->len -= len;
|
||||
}
|
||||
|
||||
return string;
|
||||
}
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <glib.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
@@ -25,7 +25,6 @@
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
#include "config.h"
|
||||
#include <glib.h>
|
||||
#include <windows.h>
|
||||
|
||||
@@ -11,24 +11,24 @@
|
||||
#define CODESET 1
|
||||
#include <windows.h>
|
||||
|
||||
extern const char *eg_my_charset;
|
||||
extern const char *my_charset;
|
||||
static gboolean is_utf8;
|
||||
|
||||
gboolean
|
||||
g_get_charset (G_CONST_RETURN char **charset)
|
||||
{
|
||||
if (eg_my_charset == NULL) {
|
||||
if (my_charset == NULL) {
|
||||
static char buf [14];
|
||||
CPINFOEXW cp_info;
|
||||
CPINFOEXA cp_info;
|
||||
|
||||
GetCPInfoExW (CP_ACP, 0, &cp_info);
|
||||
GetCPInfoExA (CP_ACP, 0, &cp_info);
|
||||
sprintf (buf, "CP%u", cp_info.CodePage);
|
||||
eg_my_charset = buf;
|
||||
my_charset = buf;
|
||||
is_utf8 = FALSE;
|
||||
}
|
||||
|
||||
if (charset != NULL)
|
||||
*charset = eg_my_charset;
|
||||
*charset = my_charset;
|
||||
|
||||
return is_utf8;
|
||||
}
|
||||
@@ -11,21 +11,21 @@
|
||||
#define CODESET 1
|
||||
#include <windows.h>
|
||||
|
||||
extern const char *eg_my_charset;
|
||||
extern const char *my_charset;
|
||||
static gboolean is_utf8;
|
||||
|
||||
gboolean
|
||||
g_get_charset (G_CONST_RETURN char **charset)
|
||||
{
|
||||
if (eg_my_charset == NULL) {
|
||||
if (my_charset == NULL) {
|
||||
static char buf [14];
|
||||
sprintf (buf, "CP%u", GetACP ());
|
||||
eg_my_charset = buf;
|
||||
my_charset = buf;
|
||||
is_utf8 = FALSE;
|
||||
}
|
||||
|
||||
if (charset != NULL)
|
||||
*charset = eg_my_charset;
|
||||
*charset = my_charset;
|
||||
|
||||
return is_utf8;
|
||||
}
|
||||
@@ -0,0 +1,240 @@
|
||||
/*
|
||||
* gunicode.c: Some Unicode routines
|
||||
*
|
||||
* Author:
|
||||
* Miguel de Icaza ([email protected])
|
||||
*
|
||||
* (C) 2006 Novell, Inc.
|
||||
*
|
||||
* utf8 validation code came from:
|
||||
* libxml2-2.6.26 licensed under the MIT X11 license
|
||||
*
|
||||
* Authors credit in libxml's string.c:
|
||||
* William Brack <[email protected]>
|
||||
* [email protected]
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining
|
||||
* a copy of this software and associated documentation files (the
|
||||
* "Software"), to deal in the Software without restriction, including
|
||||
* without limitation the rights to use, copy, modify, merge, publish,
|
||||
* distribute, sublicense, and/or sell copies of the Software, and to
|
||||
* permit persons to whom the Software is furnished to do so, subject to
|
||||
* the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be
|
||||
* included in all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*
|
||||
*/
|
||||
#include <config.h>
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
#include <unicode-data.h>
|
||||
#include <errno.h>
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
# ifdef HAVE_LOCALCHARSET_H
|
||||
# include <localcharset.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
const char *my_charset;
|
||||
|
||||
/*
|
||||
* Character set conversion
|
||||
*/
|
||||
|
||||
GUnicodeType
|
||||
g_unichar_type (gunichar c)
|
||||
{
|
||||
int i;
|
||||
|
||||
guint16 cp = (guint16) c;
|
||||
for (i = 0; i < unicode_category_ranges_count; i++) {
|
||||
if (cp < unicode_category_ranges [i].start)
|
||||
continue;
|
||||
if (unicode_category_ranges [i].end <= cp)
|
||||
continue;
|
||||
return unicode_category [i] [cp - unicode_category_ranges [i].start];
|
||||
}
|
||||
|
||||
/*
|
||||
// 3400-4DB5: OtherLetter
|
||||
// 4E00-9FC3: OtherLetter
|
||||
// AC00-D7A3: OtherLetter
|
||||
// D800-DFFF: OtherSurrogate
|
||||
// E000-F8FF: OtherPrivateUse
|
||||
// 20000-2A6D6 OtherLetter
|
||||
// F0000-FFFFD OtherPrivateUse
|
||||
// 100000-10FFFD OtherPrivateUse
|
||||
*/
|
||||
if (0x3400 <= cp && cp < 0x4DB5)
|
||||
return G_UNICODE_OTHER_LETTER;
|
||||
if (0x4E00 <= cp && cp < 0x9FC3)
|
||||
return G_UNICODE_OTHER_LETTER;
|
||||
if (0xAC00<= cp && cp < 0xD7A3)
|
||||
return G_UNICODE_OTHER_LETTER;
|
||||
if (0xD800 <= cp && cp < 0xDFFF)
|
||||
return G_UNICODE_SURROGATE;
|
||||
if (0xE000 <= cp && cp < 0xF8FF)
|
||||
return G_UNICODE_PRIVATE_USE;
|
||||
/* since the argument is UTF-16, we cannot check beyond FFFF */
|
||||
|
||||
/* It should match any of above */
|
||||
return 0;
|
||||
}
|
||||
|
||||
GUnicodeBreakType
|
||||
g_unichar_break_type (gunichar c)
|
||||
{
|
||||
// MOONLIGHT_FIXME
|
||||
return G_UNICODE_BREAK_UNKNOWN;
|
||||
}
|
||||
|
||||
gunichar
|
||||
g_unichar_case (gunichar c, gboolean upper)
|
||||
{
|
||||
gint8 i, i2;
|
||||
guint32 cp = (guint32) c, v;
|
||||
|
||||
for (i = 0; i < simple_case_map_ranges_count; i++) {
|
||||
if (cp < simple_case_map_ranges [i].start)
|
||||
return c;
|
||||
if (simple_case_map_ranges [i].end <= cp)
|
||||
continue;
|
||||
if (c < 0x10000) {
|
||||
const guint16 *tab = upper ? simple_upper_case_mapping_lowarea [i] : simple_lower_case_mapping_lowarea [i];
|
||||
v = tab [cp - simple_case_map_ranges [i].start];
|
||||
} else {
|
||||
const guint32 *tab;
|
||||
i2 = (gint8)(i - (upper ? simple_upper_case_mapping_lowarea_table_count : simple_lower_case_mapping_lowarea_table_count));
|
||||
tab = upper ? simple_upper_case_mapping_higharea [i2] : simple_lower_case_mapping_higharea [i2];
|
||||
v = tab [cp - simple_case_map_ranges [i].start];
|
||||
}
|
||||
return v != 0 ? (gunichar) v : c;
|
||||
}
|
||||
return c;
|
||||
}
|
||||
|
||||
gunichar
|
||||
g_unichar_toupper (gunichar c)
|
||||
{
|
||||
return g_unichar_case (c, TRUE);
|
||||
}
|
||||
|
||||
gunichar
|
||||
g_unichar_tolower (gunichar c)
|
||||
{
|
||||
return g_unichar_case (c, FALSE);
|
||||
}
|
||||
|
||||
gunichar
|
||||
g_unichar_totitle (gunichar c)
|
||||
{
|
||||
guint8 i;
|
||||
guint32 cp;
|
||||
|
||||
cp = (guint32) c;
|
||||
for (i = 0; i < simple_titlecase_mapping_count; i++) {
|
||||
if (simple_titlecase_mapping [i].codepoint == cp)
|
||||
return simple_titlecase_mapping [i].title;
|
||||
if (simple_titlecase_mapping [i].codepoint > cp)
|
||||
/* it is ordered, hence no more match */
|
||||
break;
|
||||
}
|
||||
return g_unichar_toupper (c);
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_unichar_isxdigit (gunichar c)
|
||||
{
|
||||
return (g_unichar_xdigit_value (c) != -1);
|
||||
|
||||
}
|
||||
|
||||
gint
|
||||
g_unichar_xdigit_value (gunichar c)
|
||||
{
|
||||
if (c >= 0x30 && c <= 0x39) /*0-9*/
|
||||
return (c - 0x30);
|
||||
if (c >= 0x41 && c <= 0x46) /*A-F*/
|
||||
return (c - 0x37);
|
||||
if (c >= 0x61 && c <= 0x66) /*a-f*/
|
||||
return (c - 0x57);
|
||||
return -1;
|
||||
}
|
||||
|
||||
gboolean
|
||||
g_unichar_isspace (gunichar c)
|
||||
{
|
||||
GUnicodeType type = g_unichar_type (c);
|
||||
if (type == G_UNICODE_LINE_SEPARATOR ||
|
||||
type == G_UNICODE_PARAGRAPH_SEPARATOR ||
|
||||
type == G_UNICODE_SPACE_SEPARATOR)
|
||||
return TRUE;
|
||||
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* This is broken, and assumes an UTF8 system, but will do for eglib's first user
|
||||
*/
|
||||
gchar *
|
||||
g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error)
|
||||
{
|
||||
char *res;
|
||||
|
||||
if (len == -1)
|
||||
len = strlen (utf8string);
|
||||
|
||||
res = g_malloc (len + 1);
|
||||
g_strlcpy (res, utf8string, len + 1);
|
||||
return res;
|
||||
}
|
||||
|
||||
#ifndef G_OS_WIN32
|
||||
static gboolean is_utf8;
|
||||
|
||||
gboolean
|
||||
g_get_charset (G_CONST_RETURN char **charset)
|
||||
{
|
||||
if (my_charset == NULL) {
|
||||
/* These shouldn't be heap allocated */
|
||||
#if defined(HAVE_LOCALCHARSET_H)
|
||||
my_charset = locale_charset ();
|
||||
#else
|
||||
my_charset = "UTF-8";
|
||||
#endif
|
||||
is_utf8 = strcmp (my_charset, "UTF-8") == 0;
|
||||
}
|
||||
|
||||
if (charset != NULL)
|
||||
*charset = my_charset;
|
||||
|
||||
return is_utf8;
|
||||
}
|
||||
#endif /* G_OS_WIN32 */
|
||||
|
||||
gchar *
|
||||
g_locale_to_utf8 (const gchar *opsysstring, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error)
|
||||
{
|
||||
g_get_charset (NULL);
|
||||
|
||||
return g_convert (opsysstring, len, "UTF-8", my_charset, bytes_read, bytes_written, error);
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsize *bytes_written, GError **error)
|
||||
{
|
||||
g_get_charset (NULL);
|
||||
|
||||
return g_convert (utf8string, len, my_charset, "UTF-8", bytes_read, bytes_written, error);
|
||||
}
|
||||
@@ -7,7 +7,7 @@
|
||||
* (C) 2006 Novell, Inc.
|
||||
* Copyright 2012 Xamarin Inc
|
||||
*/
|
||||
#include "config.h"
|
||||
|
||||
#include <stdio.h>
|
||||
#include <glib.h>
|
||||
|
||||
@@ -286,6 +286,28 @@ g_utf8_get_char (const gchar *src)
|
||||
return u;
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_utf8_find_prev_char (const gchar *str, const gchar *p)
|
||||
{
|
||||
while (p > str) {
|
||||
p--;
|
||||
if ((*p & 0xc0) != 0xb0)
|
||||
return (gchar *)p;
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_utf8_prev_char (const gchar *str)
|
||||
{
|
||||
const gchar *p = str;
|
||||
do {
|
||||
p--;
|
||||
} while ((*p & 0xc0) == 0xb0);
|
||||
|
||||
return (gchar *)p;
|
||||
}
|
||||
|
||||
gchar *
|
||||
g_utf8_offset_to_pointer (const gchar *str, glong offset)
|
||||
{
|
||||
@@ -306,7 +328,7 @@ g_utf8_offset_to_pointer (const gchar *str, glong offset)
|
||||
|
||||
// if we land in the middle of a character
|
||||
// walk to the beginning
|
||||
while ((*jump & 0xc0) == 0x80)
|
||||
while ((*jump & 0xc0) == 0xb0)
|
||||
jump --;
|
||||
|
||||
// count how many characters we've actually walked
|
||||
File renamed without changes.
Loaded 100 of 6593 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user