Compare commits

..
394 Commits
Author SHA1 Message Date
Miguel de Icaza b60927f21f Fix win32 build 2011-02-23 14:21:01 -05:00
Ankit Jain a77fdbe8b5 [xbuild] Fix bug #674337.
Use appropriate path separator for handling environment variable
MSBuildExtensionsPath.
2011-02-23 21:29:37 +05:30
Jérémie Laval 81f2bb71ed Allow people to optionally fallback to the old scheduler with an environment variable 2011-02-23 14:44:59 +00:00
Jérémie Laval 3d1b4715eb Remove ctors in TpScheduler
This also remove the capping of the ThreadPool, problem needs to be fixed in the pool itself.
2011-02-23 14:44:58 +00:00
Jérémie Laval df12cf48c6 Make TryExecuteTaskInline a bit smarter 2011-02-23 14:44:57 +00:00
Jérémie Laval 4e37530b60 Refactor common code block of TpScheduler and SyncContextScheduler in SchedulerProxy 2011-02-23 14:44:57 +00:00
Jérémie Laval 95513a6be4 Kill old IScheduler interface.
We still use the ParticipateUntil facility of IScheduler internally and provide a default implementation for pure TaskScheduler
2011-02-23 14:44:56 +00:00
Jérémie Laval 8415e77fbe When finding best worker number in Parallel loops use current TaskScheduler instead of default TaskScheduler 2011-02-23 14:44:56 +00:00
Jérémie Laval 3e593ba735 Adapt TpScheduler to the new API in TaskScheduler 2011-02-23 14:44:55 +00:00
Jérémie Laval ddd9443f26 Cache callback delegate in TpScheduler when passing Task to QueueUserWorkItem 2011-02-23 14:44:55 +00:00
Jérémie Laval d0c67f7e87 Don't create a new lambda everytime when queuing Task via ThreadPool QueueUserWorkItem 2011-02-23 14:44:54 +00:00
Jérémie Laval b2e391a309 Try to execute task inline when they are ready to run and we wait on them with no timeout 2011-02-23 14:44:53 +00:00
Jérémie Laval 3d4f602354 Threadpool Task scheduler 2011-02-23 14:44:53 +00:00
Jérémie Laval 2b62b097df Create PLinq query tasks attached to their eventual task parent by default 2011-02-23 14:44:52 +00:00
Jérémie Laval b816837188 When choosing the number of Task to create for a PLinq query, check if we are already in a running Task 2011-02-23 14:44:52 +00:00
Jérémie Laval c084efc79e Implement properly TaskScheduler's FromCurrentSynchronizationContext 2011-02-23 14:44:51 +00:00
Jérémie Laval 07791b1406 Adapt Parallel.For stealing to all processor flavors 2011-02-23 14:44:51 +00:00
Jérémie Laval 9ba41cadd2 Allow multiple invocation of Task Execute method to allow short-circuiting without breaking deque ordering 2011-02-23 14:28:43 +00:00
Miguel de Icaza ca02c72ecb Avoid warnings, should fix OpenSUSE builds 2011-02-22 19:30:48 -05:00
Andrew Jorgensen f5b2849d72 Version 2.10.1 2011-02-22 14:16:00 -07:00
Ankit Jain 8c4808fc36 [xbuild] Add new reserved properties $(MSBuildThisFile*).
Also, fixes bug #668955.

Add new reserved properties $(MSBuildThisFile*).
Unlike the $(MSBuildProjectFile), the *This* properties are evaluated
in the context where they were used. Eg. if such a property was
referenced in a PropertyGroup, then it would refer to the file
containing the that definition, and *not* the main project file.
It applies to items and tasks/targets also.

* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildChoose.cs:
* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildItemGroup.cs:
* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/BuildPropertyGroup.cs:
Add DefinedInFileName property.

* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs:
Add a stack to keep track the "current" file, which is used to set
the $(MSBuildThisFile*) properties. Update the properties on
Push/Pop.

* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/GroupingCollection.cs:
Push/Pop the "current" file, when evaluating a property/item/etc.

* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Target.cs:
Push/Pop the "current" file, when building. This ensures that the
references in the target definition get evaluated correctly.

* Microsoft.Build.Engine/Test/Microsoft.Build.BuildEngine/ProjectTest.cs:
Add corresponding test.
2011-02-23 01:38:40 +05:30
Rodrigo Kumpera ed23f897c4 Properly check arguments in List<T> ICollection.CopyTo.
* List.cs (ICollection.CopyTo): Properly check
	the array argument to match MS semantics.

	Fixes #672907
2011-02-22 18:51:20 +01:00
Ankit Jain b636b093d2 [xbuild] Use the env var $MSBuildExtensionsPath before trying other paths.
Change the order of the "search paths", so that the environment
variable can always override it.
Update the man page to reflect the change.
2011-02-22 21:39:00 +05:30
Zoltan Varga e433c33f9f Fix the passing of the mrgctx argument in case of a virtual->nonvirtual optimization. Fixes #672446. 2011-02-22 15:30:33 +01:00
Hib Eris 21528f97be Fix gsize for 64-bit Windows 2011-02-22 14:41:14 +01:00
Zoltan Varga a7c3c38901 Avoid returning TRUE from mono_domain_finalize () if it is interrupted by sdb. Fixes #673592. 2011-02-22 05:36:34 +01:00
Zoltan Varga 5766da53da Fix arm thunk creation in dynamic methods. Fixes #673828. 2011-02-22 00:51:50 +01:00
Marek Habersack 3e6f82d10c [transactions] When cloning a transaction make sure to copy all the stuff that matters.
The volatiles and durables lists must be copied even if they are empty. The calling code
might still be accessing them via the original transaction (as is the case with Orchard+NHibernate)
2011-02-21 23:38:23 +01:00
Marek Habersack 01e4a9bb55 [asp.net] Fix for bug #669807. Cache session item locks as the item might be cleared before the lock needs to be released. 2011-02-21 19:50:33 +01:00
Geoff Norton e09f898428 Implement proper TSD lookup for arm-darwin 2011-02-21 13:37:06 -05:00
Geoff Norton 1d3ed22ab2 OSX 10.6 properly respected signal handlers before invoking the crash reporter 2011-02-20 23:01:50 -05:00
Zoltan Varga abdc66ca35 Implement mono_memory_barrier () and OP_MEMORY_BARRIER for ARM. 2011-02-20 03:23:33 +01:00
Zoltan Varga affd549250 Make the var/mvar caches per-image, since the generic params they refer to can be freed on domain unload. Fixes part of #672939. 2011-02-20 01:54:34 +01:00
Zoltan Varga a98ce10d71 Revert "[Win64] Compilation fix for eglib in win64"
This reverts commit 97bc578e86.
2011-02-19 23:27:25 +01:00
Zoltan Varga 432ed84634 Reorganize the way jump_target_hash is stored in the JIT. Free entries in jump_target_hash which point inside a dynamic method when it is freed. Fixes #669815. 2011-02-19 22:24:06 +01:00
Geoff Norton b2eaffda65 Avoid leaking a mach_port every time we query the counters 2011-02-19 12:22:19 -05:00
Miguel de Icaza 78a1ca7417 Backport support for add support for new PerformanceCounter("Process", "% Processor Time", "<process id as string>" on OS X 2011-02-19 12:03:32 -05:00
Gonzalo Paniagua Javier 7372ca74ef [eglib] Move definition of GPid to eglib-config.h
This new patch moves the definition of GPid from glib.h to eglib-config.h and
	determines the the type of pid_t in configure.

	Pach from Hib Eris that fixes bug #670076.
2011-02-19 11:50:46 -05:00
Gonzalo Paniagua Javier 97bc578e86 [Win64] Compilation fix for eglib in win64
Compiling for 64 bit windows breaks on incorrect gsize.
	Patch by Hib Eris that fixes bug #673581.
2011-02-19 11:43:54 -05:00
Miguel de Icaza adc1bd510c [594642] System.Net.NetworkInformation.NetworkInterface.GetAllNetworkInterfaces fix for MacOS X 2011-02-19 11:06:00 -05:00
Gonzalo Paniagua Javier 5ef11410bd Fix the check for version and PublicKeyToken
When loading an assembly we were comparing Version(0,0,0,0) with null
	and a 0 length PKT with an actual one when those two cases are the
	default.
	Fixes bug #661461.
2011-02-19 10:14:12 -05:00
Rodrigo Kumpera 843a59e2ab Handle overrides on events when retrieving cattrs.
* MonoCustomAttrs.cs (GetBase): Special case events
	when retrieving the base event to lookup cattrs.

	* AttributeTest.cs: Add regression test.

	Fixes #662867
2011-02-18 23:38:28 +01:00
Mark Probst 9bd2159a5f [sgen] Fix some debug functions. 2011-02-18 23:18:09 +01:00
Zoltan Varga 0b63e96ade Set cfg->uses_rgctx_reg in another code path too on arm, to fix --regression generics.exe. 2011-02-18 23:09:51 +01:00
Zoltan Varga 17a13200f8 Work around a gcc bug on arm. 2011-02-18 23:06:32 +01:00
Rodrigo Kumpera b48e7b5988 Handle gsharing and marshal by ref.
* method-to-ir.c (mono_emit_method_call_full): Non virtual
	marshal by ref methods with gsharing context must always
	be called using indirect calls.

	Fixes #665893
2011-02-18 17:14:27 +01:00
Atsushi Eno ba4c090467 Fix infinite loop in DiscoveryMessageSequence equality comparison. 2011-02-18 16:32:57 +09:00
Atsushi Eno b9b1ae5876 Do not try to serialize null header item. 2011-02-18 16:23:58 +09:00
Atsushi Eno 223d09ec41 Fix wrong element name (AppSequenceType->AppSequence). 2011-02-18 16:14:08 +09:00
Atsushi Eno e72dcebf98 Almost eliminate wrong use of Constants.WsaNamespace.
They should be addressing-version-aware.
2011-02-18 16:11:16 +09:00
Atsushi Eno 980810dc82 EndpointAddressAugust2004 was not serialized correctly.
Well, Actually unified the implementation with 10.
2011-02-18 15:54:52 +09:00
Rodrigo Kumpera 6d7b16c0d2 Make sure we keep a root for the delegates when calling them.
* method-to-ir.c (mono_emit_method_call_full): Make sure
	we keep a root for delegates when calling them using the
	fast delegate dispatch.

	Fixes #667921
2011-02-17 21:59:44 +01:00
Marek Habersack d8d5da5c30 [asp.net,mvc3] Fix for bug #668655. Implemented a few more NameValueCollection method overloads. 2011-02-17 19:37:05 +01:00
Atsushi Eno 931c55c115 get out from NET_4_0. 2011-02-17 22:20:56 +09:00
Atsushi Eno dcd3787a52 Couple of corcompare fixes. 2011-02-17 21:09:50 +09:00
Atsushi Eno 995d298d00 Only use non-null values in ServiceAuthorizationBehavior. 2011-02-17 21:09:40 +09:00
Atsushi Eno 582c628f21 Fill a couple of missing ServiceAuthorizationElement implementation. 2011-02-17 21:09:29 +09:00
Atsushi Eno 10e94f0efa HTTP authentication in HttpListener had dropped during refactoring. Now it's back. 2011-02-17 21:09:19 +09:00
Geoff Norton f45ca2b65e Fix ARCH_STORE_REGS on arm to save r0->r12 properly 2011-02-16 16:10:31 -05:00
Geoff Norton c9231c0248 Remove dead code 2011-02-16 15:04:47 -05:00
Atsushi Eno b5491e25d9 MakXsdDataContractExporter refactoring to generally use SerializationMap.XmlName.
Fixed bug #670539.
2011-02-17 00:56:59 +09:00
Hib Eris ea0673de2b Decorate _image_base__ with __MINGW_LSYMBOL
This fix is needed in compiling for x86_x64.
2011-02-16 15:22:26 +01:00
Atsushi Eno f8d7872cc4 Don't reject serialization map for existing different (but same-purpose) type. 2011-02-16 18:50:02 +09:00
Atsushi Eno ead615dca5 To header seems mandatory in April2005, so fill it. 2011-02-16 18:19:14 +09:00
Atsushi Eno 4ed4702907 April2005 AppSequence needs default constructor for deserialization. 2011-02-16 18:19:03 +09:00
Atsushi Eno be750c099d xsi:type parsing is wrong in default namespace resolution.
Fixed case #3 in bug #652331.
2011-02-16 18:04:18 +09:00
Atsushi Eno 4b82e7b3b2 Operation interface methods also have ServiceKnownType attributes. 2011-02-16 17:07:10 +09:00
Atsushi Eno 1e17218a2d KnownTypeCollection; recursively registered type was not added to the collection while it is "registered" state. 2011-02-16 16:06:15 +09:00
Jérémie Laval 423f895412 Implement TaskFactory.FromAsync 2011-02-15 18:38:29 +00:00
Ankit Jain d6070f1383 [xbuild] Fix bug #671700, resource naming in presence of "Link".
AssignTargetPath.cs: If 'Link' metadata is present, then use that
as the target path.

Add relevant test.
2011-02-15 20:18:36 +05:30
Marek Safar f1e818a76f [671878] Fixes IKVM ordering of catch clauses 2011-02-15 14:33:14 +00:00
Atsushi Eno a28a9520b5 Async MessageContract pattern needs more sophisticated contract validity check.
It totally killed discovery.
2011-02-15 23:25:31 +09:00
Atsushi Eno 6907827b05 Message headers are now serialized and deserialized for MessageHeaderDescription. 2011-02-15 23:15:32 +09:00
Atsushi Eno 6ea68b9128 ServiceDescription.cs does not exist in moonlight, so move TypeExtension. 2011-02-15 22:38:20 +09:00
Atsushi Eno 7c37c423e1 MessageHeaderDescription were not filled in message contract. Reject wrong contracts. 2011-02-15 22:13:25 +09:00
Atsushi Eno 8854623440 implement some ServiceHostBase public methods that already existed internally. 2011-02-15 22:13:18 +09:00
Atsushi Eno 7b088dc2a4 When the callback contract type is the same as the contract, do not block replies. 2011-02-15 15:51:44 +09:00
Atsushi Eno e19f4be52c EndpointAddress could be empty on opening the factory. 2011-02-15 15:51:38 +09:00
Atsushi Eno 20b58344cc PeeDuplex ChannelFactory must be opened in prior to create channels. 2011-02-15 15:51:32 +09:00
Atsushi Eno c310cd6556 add private setter for message serialization.
Not sure if it is hack or required-to-do though.
2011-02-15 15:51:26 +09:00
Veerapuram Varadhan fc074bb4fa [bugfix]667855 - Fix handling of oracle raw data type appropriately. 2011-02-15 01:25:00 +05:30
Gonzalo Paniagua Javier a7bfba4549 [HttpListener] UserHostName includes the port. 2011-02-14 14:38:26 -05:00
Gonzalo Paniagua Javier a65b6c7523 [HttpWebRequest] EndGetResponse already does this. 2011-02-14 14:38:26 -05:00
Gonzalo Paniagua Javier 7730c00a02 [HttpWebRequest] Use the timeout in GetResponse()
The timeout was not being used in GetResponse.
	Fixes bug #603794.
2011-02-14 14:38:26 -05:00
Atsushi Eno 675dc5b693 support UdpTranspoerSettings.MulticastInterfaceId. This should fix bug #669328. 2011-02-15 01:57:02 +09:00
Veerapuram Varadhan 881d960b29 backport of r1012ab0b
Fixes 667236 - Handle numeric types appropriately
2011-02-14 21:18:04 +05:30
Miguel de Icaza 6c161687ea [670974] Use the underlying BaseStream to read bytes instead of trying to peek a character.
Peeking a character as it turns out is a really bad idea as it involves the encoder
to pull characters.   If the PeekChar happens to read a byte that is part of a
UTF8 string that needs more characters to process we would end up with the reported
crash.

Atsushi Enomoto tracked this down, and the fix is to use the binaryreader.BaseStream
to directly call into ReadByte and Read without ever probing with PeekChar ().   It
is not really possible to use BinaryReader.ReadByte since this one can throw on
end-of-buffer conditions instead of returning -1
2011-02-14 09:41:31 -05:00
Marek Safar 7acea3000f [671552] Use correct emit method for stobj type 2011-02-14 13:21:44 +00:00
Gonzalo Paniagua Javier a615812280 [HttpWebRequest] Avoid nullref on empty cookie header.
If the Set-Cookie header is empty, the cookie instance is not created.
	Fixes bug #670189.
2011-02-13 14:54:27 -05:00
Alexandre Mutel 7ec51b02e9 Fix sizeof(T) in non-gshared code. Fixes #580189. 2011-02-13 16:17:12 +01:00
Mark Probst 9b5ca2f366 Merge branch 'bugfix-main-thread-root' into mono-2-10 2011-02-13 16:10:37 +01:00
Zoltan Varga f4edc478f0 Add an assembly version to Mono.Debugger.Soft. Fixes #671536. 2011-02-13 16:06:57 +01:00
Gonzalo Paniagua Javier ba0fbbe133 [HttpListenre] Avoid multiple calls to Close()
HttpListenerResponse could be calling HttpConnection.Close() more than
	once.
2011-02-13 07:08:34 -05:00
Zoltan Varga 86fdd99f9e Fix reading of cattr arguments of type Type[]. Fixes #670331. 2011-02-13 04:24:58 +01:00
Gonzalo Paniagua Javier 6390cf3b64 [gzip] Allow partial flush
When Flush() is called explicitly, do a Z_PARTIAL_FLUSH to force gzip
	into giving us whatever is available. Less efficient, but compatible
	with MS.
2011-02-12 00:05:35 -05:00
Gonzalo Paniagua Javier fcdb18822c [Socket] Fix invalid cast
Fix invalid cast when canceling pending operations due to socket.Close.
2011-02-11 18:36:54 -05:00
Zoltan Varga 79fddfa11d Fix token generation for TypeBuilder's in another assembly. Fixes #671245. 2011-02-12 00:15:59 +01:00
Miguel de Icaza 32f616acfb [fix] changing Form.Enabled sometimes can change the list of OpenForms, fixes 671098 2011-02-11 17:34:23 -05:00
Zoltan Varga 52e0febfe6 Add Mono.XBuild.Utilities/MSBuildUtils.cs to the build. 2011-02-11 21:58:02 +01:00
Zoltan Varga 4246c386a0 Pretty print MonoString* too in xdb. 2011-02-11 21:54:44 +01:00
Sebastien Pouliot d4ed08b5b4 Continue X509Chain processing even if the local machine directory does not exists
* corlib/Mono.Security.X509/X509Store.cs:
* Mono.Security/Mono.Security.X509/X509Store.cs:
	Fix key pair persistence to load key pairs from the same location
	(machine or user) as the requested certificate. This avoids an
	internal exception (on missing local machine directory) that stop
	the evaluation of the certificate validity (i.e. no user store
	check)
* System/System.Security.Cryptography.X509Certificates/X509Chain.cs:
Ensure that a missing local machine directory does not result in a NRE
while loading CRL (which would fail the certificate being validated)
2011-02-11 13:41:33 -05:00
Hib Eris e43d097f7c Earlier undefine HAVE_GETPROCESSID when cross compiling 2011-02-11 15:42:29 +01:00
Rodrigo Kumpera 1066c2c1b5 Make maxStackSize behavior compatible with MS.
* Thread.cs (.ctor): Check if maxStackSize is negative
	and raise and AOORE. Silently use a saner minimum size
	of 128k as mono can't really run with much less than that.
2011-02-11 14:58:12 +01:00
Zoltan Varga efa462d684 Make the wait in the finalizer thread alertable to fix sdb on windows. Fixes #670619. 2011-02-11 05:55:06 +01:00
Zoltan Varga 6a77ef2687 Change some Sleep(0)'s to Sleep(1) in the soft-debugger code to avoid 100% cpu utilization on windows. 2011-02-11 01:34:43 +01:00
Gonzalo Paniagua Javier 1829c15ee9 [HttpWebRequest] Can't ignore erros here 2011-02-10 17:26:09 -05:00
Gonzalo Paniagua Javier c214cd9488 [HttpWebRequest] Error handling for POST/PUT
When we get an error from the server before writing an entire
	unbuffered response, the server might close the connection leading to
	write errors. Ignore those and return the actual HTTP status code from
	the original server error.
2011-02-10 17:26:09 -05:00
Ankit Jain d08d05e197 [xbuild] Update Utilities.FromMSBuildPath from monodevelop.
Updating FromMSBuildPath also fixes a bug on windows.

* Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Utilities.cs:
Move to..
* Microsoft.Build.Utilities/Mono.XBuild.Utilities/MSBuildUtils.cs:
.. this. Also, update FromMSBuildPath from monodevelop.
* Update Engine/* and Tasks/* to track the new api.
2011-02-11 02:57:58 +05:30
Andrew Jorgensen 0793c8ecae Mono.Debugger.Soft.dll is installed for 4.0 also. 2011-02-10 07:36:52 -07:00
Atsushi Eno 2031d77d6b Fix a couple of addressing namespace fixes (found in April2005 version). 2011-02-10 22:07:16 +09:00
Atsushi Eno 916479ff8a Fix wrong async completion handling in UDP channel receive.
After AsyncWaitHandle.Set(), order of filling results and WaitOne() are
undefined.
2011-02-10 21:19:02 +09:00
Marek Habersack 1630b8ecb9 [asp.net] Fix for bug #669048. Fix up virtual precompiled app virtual paths with the virtual root of the current app 2011-02-09 22:02:36 +01:00
Rodrigo Kumpera 1316be56bb Handle assignment check of variant type and its gtd.
* clas.c (mono_class_is_variant_compatible): Return
	FALSE if checking a variant type and its gtd instead
	of crashing.

	Fixes #668506
2011-02-09 16:42:17 +01:00
Zoltan Varga e61f3b7278 Install Mono.Debugger.Soft in the 4.0 profile as well. 2011-02-09 16:25:02 +01:00
Atsushi Eno b6b34d1051 Recent ContractDescription fix uncovered wrong contracts in discovery. 2011-02-09 20:06:07 +09:00
Rodrigo Kumpera c5cbc7e8e2 Cleanup the reference queue on domain unload.
* gc.c (finalize_domain_objects): Clear reference
	queues on domain unload after running all finalizers.
2011-02-09 11:22:23 +01:00
Atsushi Eno 3aad1fb2cf Support ServiceKnownTypes. Fixed another case on bug #652331. 2011-02-09 15:44:19 +09:00
Zoltan Varga c3cd3eb877 Disable OP_INEG cfolding on 32 bit arches, as it breaks the LNEG decomposition. The previous special casing didn't work as the spill pass could insert a store between the ineg and the adc_imm. Fixes #670479. 2011-02-09 05:11:43 +01:00
Gonzalo Paniagua Javier 610f8d77c9 [SmtpClient] Don't send empty display name.
If there's no display name, don't send '""'.
	Fixes bug #670475.
2011-02-08 21:02:33 -05:00
Miguel de Icaza 18efb9a9e2 Update docs 2011-02-08 20:19:02 -05:00
Miguel de Icaza 11b3ead24e Add prototype to .h file 2011-02-08 20:18:55 -05:00
Lucas Meijer dfcd93df2a implement mono_set_assemblies_path for platforms that cannot set MONO_PATH environment variable. 2011-02-08 20:18:39 -05:00
Atsushi Eno ee701df195 Fix bug #661400 - fix complicated namespace resolution issue.
Namespaces in nested external schemas have to be validated against
immediately-containing schema. If there is a schema A with urn:x
targetNamespace imports a schema B with urn:y targetNamespace which
in turn includes another schema C, then C must be validated its namespace
against B, not A.
2011-02-08 20:18:32 -05:00
Marek Habersack 142676a516 [asp.net] Be more careful with errors collection when compilation fails. 2011-02-09 01:26:17 +01:00
Marek Habersack 02f2fe8204 [asp.net] Implemented CustomErrorsRedirectMode 2011-02-09 01:26:10 +01:00
Miguel de Icaza be6ba4038a Fix Enum.HasValue, previous version crashed with negative values 2011-02-08 15:52:38 -05:00
Marek Habersack 9d4e229c2e [cross-compilation] Added some flexibility regarding the location of development packages
The script now supports an extra cross-compilation directory in which you can unpack the
library and development packages necessary for the build to succeed (glib, zlib etc). Also
supported now is specifying the location at which Mono will be installed on Windows.
Replaced SVN and GIT-SVN version checks with git checks.
2011-02-08 20:47:15 +01:00
Rodrigo Kumpera 9177ddc384 Fix reference queue under boehm.
* gc.c (finalizer_thread): Clean reference queues
	after finalizers are called to give boehm a chance
	to resurrect it.
2011-02-08 18:30:09 +01:00
Hib Eris b9c4865b04 Fix build-mingw32.sh for CROSS_PKG_CONFIG_DIR without *.pc files 2011-02-08 14:56:26 +01:00
Hib Eris 83c2b73c8c No longer include glib binaries in build-mingw32.sh builds.
By default, Mono now uses an embedded glib implementation, so there
is no need to ship external glib libraries anymore.
2011-02-08 14:55:51 +01:00
Hib Eris 77b6d414b9 Let build-mingw32.sh script also work on dist tarballs 2011-02-08 14:55:10 +01:00
Hib Eris cb8913217e Use winternl.h instead of ddk (when available)
These changes are nescessary for compiling with a mingw-w64 compiler.
2011-02-08 14:45:12 +01:00
Hib Eris c45dd61269 Remove implementation details from public header io-layer.h
The macro HAVE_GETPROCESSID is defined in config.h and should not be
exposed in public headers.
2011-02-08 14:44:52 +01:00
Marek Safar 2990e2e271 [657099] Fix cloning of remapped blocks 2011-02-08 12:53:05 +00:00
Atsushi Eno 7e69d0aa77 Simple content restriction was not validated when it is in further reference.
Fixed bug #595947. It was complexType [base]-> complexType [base]-> simpleType.
2011-02-08 20:55:16 +09:00
Marek Safar cf0928b53e Fix remapping of cloned block parent when already in cloned context 2011-02-08 11:23:46 +00:00
Atsushi Eno b2525e0cb0 For complexType simpleContent restriction, fill attributes from base type.
Part of bugfix #595947.
2011-02-08 18:32:53 +09:00
Atsushi Eno 38fe929b9f There's a tricky namespace-mismatching deserialization in .NET implementation.
Fixed bug #666333.
2011-02-08 17:11:15 +09:00
Atsushi Eno f5ef8da8e5 Contract-based type must ensure that the base type is also contract-based.
Fixed bug #661987 on WCF side.

Conflicts:

	mcs/class/System.Runtime.Serialization/Test/System.Runtime.Serialization/XmlObjectSerializerTest.cs
2011-02-08 12:13:57 +09:00
Atsushi Eno 20453fcb9c Open and close client/service runtime channels in chains. Fixed bug #663278. 2011-02-08 12:08:10 +09:00
Atsushi Eno f3ddd9df63 handle IsTerminating. 2011-02-08 12:07:57 +09:00
Atsushi Eno 68ce0748e5 Duplex client has its own listener loop, so special care on reply is needed. 2011-02-08 12:07:45 +09:00
Atsushi Eno 34fad98bf0 Callback contract should be distinguished from others for DispatchOperation. 2011-02-08 12:07:33 +09:00
Atsushi Eno 176c92c21d Now operations are collected per corresponding ContractDescription.
This fixes naming of MessageDescription Action URI from its type.
2011-02-08 12:07:22 +09:00
Atsushi Eno a303481db4 Implement GetInheritedContracts(), towards bugfix #668089. 2011-02-08 12:07:11 +09:00
Atsushi Eno e2884a6c57 standard endpoint and protocol mapping support were lacking at client side.
Turned out that they had nothing to do with #668089..
2011-02-08 12:07:00 +09:00
Atsushi Eno be19163ffe Members in the base type in different namespace are serialized in base ns.
When the serializer serializes a Type B which is derived from A, it used to
serialize member M in A as in namespace_of_B, not in namespace_of_A.

This should fix bug #652331.
2011-02-08 12:06:50 +09:00
Atsushi Eno 44a9e7eef7 Manage opened proxy channels and close them when ChannelFactory is closed. 2011-02-08 12:06:39 +09:00
Atsushi Eno ab26a0788e Implemented a couple of async methods in InstanceContext as well as disposing. 2011-02-08 12:06:29 +09:00
Atsushi Eno 0870ad290d Avoid possible list modification error during close process. 2011-02-08 12:06:18 +09:00
Atsushi Eno c4c9b57b9d Make sure to close session once the client opened one. 2011-02-08 12:06:07 +09:00
Atsushi Eno 184d565783 Fix regression, avoid null key. 2011-02-08 12:05:55 +09:00
Atsushi Eno 84c27ca818 And rename source file name. 2011-02-08 12:05:44 +09:00
Atsushi Eno 561ec9f0e6 Rename InstanceBhavior, too ambiguous among IXxxBehavior interfaces. 2011-02-08 12:05:34 +09:00
Atsushi Eno cf586923d5 Sessions should not be keyed by MessageId but be done by channel SessionId. 2011-02-08 12:05:24 +09:00
Atsushi Eno be5559c59f Read body content if required. Fixed all issues in bug #656020.
Now it considers message content format and IsWrapped[Request|Response] to
retrieve XmlObjectSerializer.
2011-02-08 12:05:13 +09:00
Atsushi Eno 97a48b0eab Enable duplicate "UriMatched" error check, with couple of FIXMEs.
.NET is very unclear about those UriTemplate behavior. Too minor to mind.
2011-02-08 12:05:03 +09:00
Atsushi Eno fbc54c3de5 Fix template match logic to first check HTTP-method-matching ones.
Part of the fix for bug #656020.
2011-02-08 12:04:53 +09:00
Atsushi Eno e99c8b5a77 Serialize non-mapped message parameter as body content. Part of bug #656020 fix. 2011-02-08 12:04:43 +09:00
Marek Habersack 6eca3e53ed [crypto] Added missing 4.0 algorithm names 2011-02-08 00:34:33 +01:00
Hib Eris d1ef6f2e4b Do not distribute eglib-config.h
The file eglib-config.h is generated when running configure.
Distributing eglib-config.h in tarballs causes errors when building
out of the source tree.
2011-02-07 23:55:47 +01:00
Hib Eris 0ab1c82223 Use _vscprintf() for mingw-w64 compilers
The mingw-w64 compilers implement a vsnprintf() function that do not
conform to the C99 standard (just like MSVC).
2011-02-07 23:43:37 +01:00
Hib Eris dd8a1f2831 Include config.h in mono-profiler-aot.c
This change is nescessary for compiling with a mingw-w64 compiler.
2011-02-07 23:41:28 +01:00
Zoltan Varga 632a3c70c7 Cast the result of MONO_CONTEXT_GET_SP () to an int to fix the windows build. 2011-02-07 23:36:41 +01:00
Zoltan Varga 6b9347a35b Include sys/types.h for pid_t on mingw. Fixes #670076. 2011-02-07 23:33:11 +01:00
Zoltan Varga ccedbc64dc Use mono_method_get_vtable_slot () instead of accessing method->slot directly. Fixes #669808. 2011-02-07 16:11:47 +01:00
Zoltan Varga a962434e90 Fix the ia64 build. 2011-02-06 00:08:16 +01:00
Rodrigo Kumpera 129cfd47ee Fixes ldfnt to ldvtftn conversion.
* mini-trampolines.c (mono_delegate_trampoline): The ldftn
	to ldvtftn conversion must check if the method is abstract,
	otherwise it breaks delegate to base classes.

	Fixes #666008
2011-02-05 13:38:42 +01:00
Zoltan Varga 1c51463ed0 Print a normal stack trace even if a hard stack overflow happens in unmanaged code. 2011-02-04 12:55:47 +01:00
Zoltan Varga 719afa9b59 Print a normal stack trace on a hard stack overflow. 2011-02-03 23:04:47 +01:00
Zoltan Varga 8f45703547 Fix the handling of CompareExchange icalls in AOT, we were using the 'object' versions for everything, which broke with 64 bit types on 32 bit platforms. 2011-02-03 21:59:34 +01:00
Ankit Jain d47a028ed4 [webservices] Extensions can be unknown XmlElements also, fix.
* class/System.Web.Services/System.Web.Services.Description/BasicProfileChecker.cs:
Extensions can be XmlElement or ServiceDescriptionFormatExtension.
* class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs:
(AddExtensionNamespaces): Likewise. Also, ignore namespaces from
XmlElement, as we retain and write them out as-is.
(WriteExtension): Emit the XmlElement as-is.
* class/System.Web.Services/Test/System.Web.Services.Description/ServiceDescriptionTest.cs:
Update to write out the wsdl also.
2011-02-04 01:03:45 +05:30
Marek Habersack 568f9ab996 [asp.net] HttpRuntimeSection.RequestPathInvalidCharacters default value is different 2011-02-03 17:43:31 +01:00
Marek Habersack c7f2fda73d [xml] XmlReaderSettings.{DtdProcessing,MaxCharactersFromEntities,MaxCharactersInDocument} are present in 3.5+
With the exception of DtdProcessing, the properties are part of .NET 3.5+. DtdProcessing appeared in 4.0.
2011-02-03 17:43:02 +01:00
Marek Safar c139a0e52d Don't even try to import type when its context is wrong 2011-02-03 15:21:38 +00:00
Marek Safar 320645f312 Add handling of broken Convert callsite from Orchard Project 2011-02-03 15:21:13 +00:00
Marek Safar 8b1e1255e6 Fix importing of private types under dynamic context 2011-02-03 15:16:50 +00:00
Zoltan Varga a96d068321 Fix the passing of vtype arguments for methods which return floats in soft-float mode. Fixes #668905. 2011-02-03 16:06:25 +01:00
Marek Safar a5f9b5d9c6 Allow any expression to be used in where clause. Some custom linq implementations use non-predicate version of where 2011-02-03 13:55:28 +00:00
Marek Habersack fe7386298f [reflection] Default binder's AdjustArguments method treats ParamArray parameters which are already arrays properly
Such parameters are not adjusted as it would lead to an InvalidCastException whenever an attempt to set an array
index's value would be made.
2011-02-03 02:23:15 +01:00
Zoltan Varga db64c7f8f1 Add support for --debug=casts to Array:SetValue (). Fixes #668851. 2011-02-03 00:37:45 +01:00
Zoltan Varga 63f4b4cdd4 Fix a warning. 2011-02-03 00:36:41 +01:00
Rodrigo Kumpera 0efd1e04f6 Fix dynamic method cleanup at shutdown.
* gc.c (mono_gc_cleanup): Cleanup all reference
	queues after regular finalization.

	* reflection.c: The dynamic method ref queue is finalized
	by the runtime itself.

	* runtime.c: Ditto.
2011-02-02 20:28:30 +01:00
Miguel de Icaza b4e49b89b4 [csharp] Change the signature for print 2011-02-02 13:09:53 -05:00
Marek Safar bf12c6eb03 Implement support for implicit user conversion for DefaultParameterValue (very odd) 2011-02-02 17:25:22 +00:00
Ankit Jain 15514b1b26 [xbuild] Warn for unknown toolsVersion only on build.
Emit warning for unknown toolsversion only on a build, and
*not* everytime the project file is parsed.

* class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Project.cs
(GetToolsVersionToUse): Add a 'emitWarning' bool param.
(Build): Call GetToolsVersionToUse () to ensure that a warning is
emitted in case of a unknown tools version.
2011-02-02 18:26:43 +05:30
Rodrigo Kumpera 8dba556993 Align call instructions to make code patching SMP safe.
* mini-x86.c (emit_call): Align call instructions on
	3 mod 4 so the address is 4 bytes aligned and can't span
	two cache lines. This is required for proper SMP support
	as CAS is not atomic across cache lines.

	Fixes one of the crashes due to #667921.
2011-02-02 13:03:04 +01:00
Geoff Norton a40312f1c1 Avoid a stack overflow when deactivating a window 2011-02-01 23:54:06 -05:00
Lucas Meijer ca201f3478 make mono_print_thread_dump output to the visualstudio debugger window, for better debugger experience 2011-02-01 21:55:57 +01:00
Rodrigo Kumpera e7785a27ab Don't use finalization to cleanup dynamic methods.
* reflection.c: Use a reference queue to cleanup
	dynamic methods instead of finalization.

	* runtime.c: Shutdown the dynamic method queue
	before runtime cleanup begins.

	* DynamicMethod.cs: No longer finalizable.

	* icall-def.h: Remove unused dynamic method icall.

	Fixes #660422
2011-02-01 17:35:11 +01:00
Rodrigo Kumpera fd57b963ad Implement a reference queue API.
* gc.c: A reference queue allows one to queue
	callbcks for when objects are collected.
	It allows for safe cleanup of objects that can
	only be done when it is effectively collected.
	The major difference with regular finalization
	is that the collector makes sure the object
	was collected - and can't be resurrected.

	* gc-internal.h: Export entrypoints for the
	new API.
2011-02-01 17:35:11 +01:00
Zoltan Varga 88bfc71d89 Make caching in mono_marshal_get_virtual_stelemref () thread-safe. Fixes #668489. 2011-02-01 17:09:45 +01:00
Marek Safar efcd37f730 Fix empty cast conversion from dynamic type object type argument 2011-02-01 14:29:49 +00:00
Marek Habersack b27182bd5d [asp.net] FormsAuthenticationTicket.FromByteArray stops early if it is passed a null parameter 2011-02-01 09:21:13 +01:00
Marek Habersack e44310c079 [runtime] AddWatcher icall must look up the path in an IOMAP-aware way 2011-02-01 09:21:07 +01:00
Atsushi Eno 5d7723bc37 Members in the base type in different namespace are serialized in base ns.
When the serializer serializes a Type B which is derived from A, it used to
serialize member M in A as in namespace_of_B, not in namespace_of_A.

This should fix bug #652331.
2011-02-01 15:59:00 +09:00
Atsushi Eno 157111dbb5 quick build workaround. 2011-02-01 13:01:50 +09:00
Atsushi Eno 38bdb82f95 in NET_4_0, remove types that went into System.Xaml.dll. Change build order. 2011-02-01 11:05:11 +09:00
Bit Diff 0a8a210791 Fixes #527447 whereby it was not possible to pass additional arguments to mono-service2 (if your executable required command-line arguments of it's own). 2011-01-31 17:59:03 -05:00
Zoltan Varga ca0ededdc6 Fix stack walks on sparc. 2011-01-31 22:40:11 +01:00
Gonzalo Paniagua Javier 79633ee3d1 Handle wrapped ThreadAbortException
Third party ProcessRequest() like the one from Razor can wrap a
	ThreadAbortException originated from response.Redirect().
2011-01-31 16:36:16 -05:00
Jonathan Pryor 0577648c00 Fix the basic-profile build. 2011-01-31 15:16:05 -05:00
Jonathan Pryor 8cc7997a69 Fix the MonoDroid build.
Most System.TimeZoneInfo members weren't being included.
2011-01-31 14:05:19 -05:00
Gonzalo Paniagua Javier 1258d11fc3 Allow forcing HTTP protocol version
If the version is manually set, ignore the version from the service
	point when set.

	Fixes bug #668199.
2011-01-31 10:49:40 -05:00
Lluis Sanchez b5da420c28 Handle possible exceptions thrown by Socket.Close 2011-01-31 16:34:17 +01:00
Marek Habersack 879cb82456 [asp.net] Implemented 4.0 types System.Web.Security.{MachineKey,MachineKeyProtection} plus tests 2011-01-31 15:20:57 +01:00
Zoltan Varga 15aed192fb When using xdebug, allocate all code from the code manager of the root domain. Hopefully fixes #666152. 2011-01-31 14:02:29 +01:00
Marek Habersack 789c5a7f91 [asp.net] Ignore directories that don't exist instead of throwing. 2011-01-31 11:08:33 +01:00
Marek Habersack 684266d2b3 [runtime] Use IOAMP-aware method of looking for domain configuration file 2011-01-31 09:47:20 +01:00
Jo Shields c5302b7b52 Really fix sgen on PowerPC Linux. Assembler on Linux requires that register names are just bare numbers, unlike OSX, i.e. "r0" must be "0" on Linux. 2011-01-31 07:47:05 +01:00
Atsushi Eno fc0ec2635d Do not return DocumentFragment from AppendChild() etc. Fixed bug #666249. 2011-01-31 13:48:00 +09:00
Atsushi Eno 2d13b63f4e Fixed bug #666872; XElement.Changed and .Changing were not triggered. 2011-01-31 13:46:55 +09:00
Atsushi Eno b057032956 add public NetTcpSecurity .ctor() and close #667429. 2011-01-30 23:38:57 -05:00
Miguel de Icaza a11120ae36 [repl] Fix running specified scripts from command line, allow #! syntax, add print command
We were calling the Reset () method after we had initialized the driver
with the new command line arguments, clearing the list of files to execute
before we executed them.

Added support for #! in the csharp repl, and added the print() command to
the InteractiveBase

Add a better way of dealing with -e, without adding hacks to the core that wont work
in the future
2011-01-30 17:43:44 -05:00
Miguel de Icaza b56b8ad2c3 [repl] Add support for -e EXPRESSION to the csharp command 2011-01-30 12:06:10 -05:00
Miguel de Icaza 0b17f7feab Document csharp #! support 2011-01-30 11:41:09 -05:00
Miguel de Icaza abf855afe1 [repl] Fix running specified scripts from command line, allow #! syntax, add print command
We were calling the Reset () method after we had initialized the driver
with the new command line arguments, clearing the list of files to execute
before we executed them.

Added support for #! in the csharp repl, and added the print() command to
the InteractiveBase
2011-01-30 11:33:00 -05:00
Zoltan Varga af6065a810 Fix some quadratic behavior in the AOT compiler. 2011-01-30 09:13:51 +01:00
Zoltan Varga 9cffdf6cf4 Improve hashing of MONO_PATCH_INFO_TYPE_FROM_HANDLE. 2011-01-30 09:13:36 +01:00
Zoltan Varga 5a862ae52a Mark a newly added test as !FULLAOT. 2011-01-30 09:13:05 +01:00
Zoltan Varga 07b052d9c6 Don't crash when inlining static methods called using callvirt. Fixes #668170. 2011-01-30 07:00:30 +01:00
Zoltan Varga 70adac78be Clear the 'need_rgctx_tramp' flag when creating a synchronized wrapper. Fixes 2011-01-29 20:52:23 +01:00
Geoff Norton 51a4f125d1 Typo 2011-01-29 11:37:17 -05:00
Geoff Norton 8e4b73cb4a Avoid a crash when shutting down jit attached threads 2011-01-28 19:05:21 -05:00
Geoff Norton e0dd2115d6 Ensure we setup the vtable before accessing it 2011-01-28 01:08:57 -05:00
Zoltan Varga 54fe90cf1c Add an AtLeast version to sdb's VersionInfo class. 2011-01-28 06:28:55 +01:00
Geoff Norton abc793ffbd Bump SDB protocol so MonoDevelop can guard IL inspection of dynamic methods 2011-01-28 00:26:12 -05:00
Geoff Norton d23601d20b Dont leak loader errors in the aot compiler, as it could cause later methods to not get compiled erroneously 2011-01-27 23:23:27 -05:00
Gonzalo Paniagua Javier 2151a961f8 [HttpListener] Set each cookie in its own header
Send a Set-Cookie header per cookie instead of a Set-Cookie2 with
	multiple cookies.

	Fixes bug #667550.
2011-01-27 15:47:53 -05:00
Zoltan Varga b8bf630538 Fix AOT support for types in the EXPORTEDTYPE table. 2011-01-27 19:28:18 +01:00
Zoltan Varga 77f13bc288 Increase an aot buffer size again. 2011-01-27 17:25:07 +01:00
Marek Habersack dead19bc1e [asp.net] A bunch of fixes related to the default VirtualPathProvider (needed for Orchard)
* DefaultVirtualDirectory is now more careful when snipping off parts of the path passed to
  its constructor. Before removing the file part it checks whether the file indeed exists.
  Also sealed the class and made it use generic List instead of ArrayList
* HttpRequest does not normalize mapped paths when converting them to absolute ones. This is
  to avoid errors when path like "~/bin/../../file.txt" is passed to MapPath.
* VirtualPathUtility.ToAbsolute overload with normalize parameter really doesn't normalize
  the resulting path now.
2011-01-27 15:36:45 +01:00
Marek Habersack ef2c84591a [machine.config] Added the <system.transactions> section definition 2011-01-27 15:36:45 +01:00
Zoltan Varga 30f5e30bc4 Applied patch from Burkhard Linke <[email protected]>. Add support for newer boehm-gc versions. 2011-01-27 15:35:25 +01:00
Jérémie Laval cdd5b3f397 Leave db connection opened until requested to close it and add more unit tests 2011-01-27 13:18:19 +00:00
Zoltan Varga 4512ede1a0 Fix compilation of tests/assemblyresolve with newer mcs-es. 2011-01-27 11:06:35 +01:00
Marek Safar fb6c06445f [667261] Fixes overload resolution of an optional parameter followed by a params parameter of the same type 2011-01-27 09:06:10 +00:00
Zoltan Varga d2fddf5062 Fix dist issues in Mono.Debugger.Soft. 2011-01-27 07:16:44 +01:00
Gonzalo Paniagua Javier ae3683b3c2 Prevent abort
When cleaning up the sockets we no longer have access to Tls.
2011-01-26 23:09:50 -05:00
Zoltan Varga 36d4336429 Add AOT support for castclass_with_cache wrappers. 2011-01-27 01:44:47 +01:00
Kyle Ambroff 51a47770f2 version tolerant serialization fails with missing primitive members
Modifies ObjectReader so that when it encounters a primitive typed member in
an object stream which has no corresponding member in the app domain, it will
read the value anyway and throw it away. That way it can read the next block
from the stream.

Added a unit test which passes with the changes to ObjectReader.

Fixes bug #641821.
2011-01-26 18:07:42 -05:00
Kenneth Bell c0a4dd98cf Implement RawSecurityDescriptor.
* Marshals to/from SDDL and binary form.

 * Supports 'Common' ACEs and 'Object' ACEs
2011-01-26 17:58:57 -05:00
Kenneth Bell 27729c4b20 Implement SecurityIdentifier and improve NTAccount.
* Only translates between SecurityIdentifier and NTAccount for
    well-known accounts.

  * NTAccount changed to not upper-case values to match behaviour
    observed in Microsoft's .NET (see also unit tests)

  * Add unit tests for both classes
2011-01-26 17:46:28 -05:00
Antoine Cailliau c7f33c1904 Implements System.ComponentModel.DataAnnotations.RegularExpressionAttribute 2011-01-26 17:28:56 -05:00
Geoff Norton eb3626b925 Include operands when emitting the IL stream to sdb clients 2011-01-26 12:34:48 -05:00
Geoff Norton acba62755d Ensure we properly align the stack before resuming from breakpoint signal handlers 2011-01-26 12:13:52 -05:00
Andrew Jorgensen e62983964b Add 2.0 and 4.0 S.D.S.C 2011-01-26 09:48:47 -07:00
Geoff Norton 93966536b5 Dynamic methods are classes already here 2011-01-26 11:24:38 -05:00
Rodrigo Kumpera 9aa0d0ba0b Fix freeing of delegate wrappers.
* marshal.c (mono_marshal_get_delegate_invoke): If
	the target is a static method with first arg bound
	and it belongs to a different assembly than the delegate
	we might end up with a freed signature in the hashtable.

	Fix a moonlight crash.
2011-01-26 12:37:39 +01:00
Marek Safar e984af0443 Optimized constructor readonly access has to be inside same declarting type 2011-01-26 09:04:50 +00:00
Geoff Norton 97c46a7be6 MonoTouch doesnt support SRE, so we need to disable this code on MT 2011-01-25 23:04:33 -05:00
Zoltan Varga 7d5fce6c1b Add a 'suspend-on-unhandled' MONO_DEBUG option to help track down the random build failures on ia64. 2011-01-26 04:17:08 +01:00
Geoff Norton 3d19f5b624 Further .NET 4.0 ification of the mobile profile 2011-01-25 20:11:19 -05:00
Ankit Jain 16669c9944 [xbuild] Improve error messages for condition evaluation.
Also, add new ExpressionEvaluationException class.
Wrap Expression*Exceptions in InvalidProjectFileException with
info about the full condition being evaluated.
2011-01-26 05:03:16 +05:30
Ankit Jain a8f4de0f37 [xbuild] Support short-circuiting in conditions. 2011-01-26 05:03:14 +05:30
Ankit Jain ad8508c148 [xbuild] Correctly set CscToolExe if TargetFrameworkVersion is not set.
* tools/xbuild/xbuild/Microsoft.CSharp.targets: $(CscToolExe)
is set depending on the value of $(TargetFrameworkVersion).
Since, $(TargetFrameworkVersion)'s default value is set
by MS.Common.targets, set $(CscToolExe) *after* importing
MS.Common.targets .
2011-01-26 05:03:13 +05:30
Ankit Jain 081dc45b72 [xbuild] Fix bug #665637.
Pass $(WarningsNotAsErrors) to Csc task.
2011-01-26 05:03:11 +05:30
Ankit Jain b0f9fd65a1 [xbuild] Fix bug #665004. Honor /nologo option.
* tools/xbuild/Parameters.cs (DisplayVersion): Remove, not required.
2011-01-26 05:03:10 +05:30
Ankit Jain f995310582 [xbuild] Update Novell copyright. 2011-01-26 05:03:08 +05:30
Ankit Jain 5789f96b3c [xbuild] Error out, if no target is found in a project. 2011-01-26 05:03:07 +05:30
Jb Evain e413cf2327 [linq] Fix Reverse for IList implementors 2011-01-26 00:10:55 +01:00
Jb Evain bbd7f83168 [linq] Fix overflow check for Count 2011-01-26 00:10:41 +01:00
Jb Evain dcad2f1b22 [linq] fix Range extreme boundaries 2011-01-26 00:10:30 +01:00
Miguel de Icaza e9f180be6a Restoring some of the formal beauty of this text document as
we carefully restore the missing tabs that helped carefully
align the continuation characters in a list of assemblies.

As we align these newline separators, suddenly, a new form
emerges from the chaos, something that gives us the illusion
that this stream of bytes is indeed almost like a dawn of a
new day as we breathe the air in a valley overlooking a beautiful
mountain at the beginning of the spring.
2011-01-25 17:56:00 -05:00
Geoff Norton 8c3c6c4b54 Fix the mobile build 2011-01-25 14:16:11 -05:00
Mark Probst f97c2388cb Merge branch 'sgen-android' into mono-2-10
Conflicts:
	mono/metadata/sgen-gc.c
2011-01-25 16:35:16 +01:00
Marek Habersack 1e0d0e7c4c [corlib,crypto] RandomNumberGenerator implements IDisposable in 4.0 2011-01-25 15:49:24 +01:00
Marek Habersack f96a9873cc [system] SmtpClient implements IDisposable on 4.0 (a no-op for now) 2011-01-25 15:49:19 +01:00
Marek Habersack b10086345e [wcf] Install the System.Data.Services.Client properly. 2011-01-25 15:49:13 +01:00
Marek Safar 77a05371b4 Degrade wrong override member to virtual instead of non-virtual 2011-01-25 10:46:43 +00:00
Geoff Norton ff1caafd97 Add pfx to the mobile profile 2011-01-25 01:52:17 -05:00
Geoff Norton d1eb847ef2 Work around a full-aot issue for monotouch System.Json 2011-01-25 01:52:12 -05:00
Zoltan Varga 6e268ac849 Fix up CAS tests a bit. 2011-01-25 03:01:48 +01:00
Andrew Jorgensen 8f69b0e0e0 Add WebMatrix.Data to spec 2011-01-24 15:17:16 -07:00
Tomasz Kubacki d70c578fc4 [Mono.CSharp] Improve error reporting 2011-01-24 15:44:42 -05:00
Geoff Norton 7ee94c1ca3 Avoid leaking the vmmap allocated by the kernel for the thread_act_array_t 2011-01-24 12:07:24 -05:00
Geoff Norton 8db070aae1 Fix a mach port leak 2011-01-24 11:39:19 -05:00
Jérémie Laval bc326d8e73 Add unit test for Database 2011-01-24 15:06:00 +00:00
Jérémie Laval 7c3bd246b6 Add unit tests for DynamicRecord 2011-01-24 15:05:58 +00:00
Jérémie Laval 1f40d73cdf Just fixup comment 2011-01-24 15:05:58 +00:00
Jérémie Laval b364173319 Add GetLastInsertId 2011-01-24 15:05:55 +00:00
Jérémie Laval f1acca540b Foobar trigger connection 2011-01-24 15:05:54 +00:00
Jérémie Laval 98c4b8992d Add Close method 2011-01-24 15:05:53 +00:00
Jérémie Laval 591be8a33f Add ConnectionOpened event to Database 2011-01-24 15:05:53 +00:00
Jérémie Laval f5b9efc784 Fix up compilation of Database and DynamicRecord 2011-01-24 15:05:52 +00:00
Jérémie Laval d607d23767 Add Dispose calls to Database 2011-01-24 15:05:52 +00:00
Jérémie Laval 1b4eee0534 Add Database type 2011-01-24 15:05:51 +00:00
Jérémie Laval 784198d66a Complete base DynamicRecord API 2011-01-24 15:05:50 +00:00
Jérémie Laval 77908fc88a Stub DynamicRecord 2011-01-24 15:04:53 +00:00
Jérémie Laval 9bcbd52f03 Add WebMatrix.Data assembly skeleton 2011-01-24 15:01:20 +00:00
Jérémie Laval b57515aa5a Make sure a synchronous continuation get executed synchronously in all cases 2011-01-24 14:33:57 +00:00
Marek Habersack 2d2834e4bc [asp.net] Global.asax assembly must be passed as reference when compiling. BuildManager.GetType improvements.
When user has their own global application class (global.asax is present) the assembly produced from it must
be passed as reference to the compiler.
BuildManager.GetType now supports fully-qualified type names for 'typeName' and searches for the type in the
top-level assemblies, the global.asax assembly and in the assemblies specified in as references in web.config.

All of this fixes certain MVC3+Razor applications.
2011-01-24 15:30:53 +01:00
Marek Habersack a87db25252 [asp.net] Avoid passing duplicate assemblies on mcs command line. 2011-01-24 15:30:47 +01:00
Marek Safar 450b15885d [666476] Use correct parameter count when checking ambiguous params methods 2011-01-24 14:04:41 +00:00
Marek Safar 3fc9d42ca0 Use byte array as underlying storage for AttributeEncoder 2011-01-24 13:59:33 +00:00
Zoltan Varga e50fc47fd5 Dist finally_guard.cs. 2011-01-24 04:15:05 +01:00
Gonzalo Paniagua Javier 234a2d72e8 Fix Dispose() 2011-01-22 13:30:22 -05:00
Marek Habersack 38e5ecca9f [asp.net,routing] Fix for bug #651966. Regular expression constraints must be treated as absolute regexps. 2011-01-22 12:44:25 +01:00
Gonzalo Paniagua Javier 7dabffd212 [HttpListener] Fix incorrect 411 error
Don't send a 411 for unknown methods without content length.
	No need to assign input_stream until requested.

	Fixes bug #666251.
2011-01-21 23:53:51 -05:00
Zoltan Varga 9e14e62935 Fix an assert which happens when a call is made to Nullable.Unbox from gshared code in AOT. 2011-01-22 03:08:26 +01:00
Bassam Tabbara 54b00f3630 Fix for 666225 2011-01-21 21:00:49 -05:00
Miguel de Icaza 6e81152a98 [getline] Fix history search in the cmdline editor 2011-01-21 20:48:51 -05:00
Miguel de Icaza 6593ea7a5e [Mono.CSharp] Fix bug where overwriting variables cleared the wrong value
This fixes #641910
2011-01-21 20:19:38 -05:00
Miguel de Icaza 70feb6a2b3 [csharp] repl using statement fix + support for --fatal
Fixes #638585 which kept reporting the same error on the using statements over and over
Added support for the --fatal flag to the REPL
2011-01-21 19:56:41 -05:00
Zoltan Varga 93f8f61c8a Transition non perf-critical users of klass->has_finalize over to mono_class_has_finalizer (). 2011-01-21 22:32:00 +01:00
Zoltan Varga cef819966a Obsolete VirtualMachine.GetNextEvent () as it is impossible to determine when to resume after an event, since the debuggee suspends only once per event-set. 2011-01-21 21:54:31 +01:00
Zoltan Varga 8b52311dfd Initialize klass->has_finalizer lazily. This allows us to remove the find_method_in_metadata () optimization without a perf cost which is broken in the presence of overrides. Fixes #665769. 2011-01-21 21:54:12 +01:00
Andrew Jorgensen faac64a083 Oops, Microsoft.Web.Infrastructure, not System. 2011-01-21 12:54:13 -07:00
Andrew Jorgensen 0e29d1e39b add Microsoft.Web.Infrastructure 2011-01-21 10:44:36 -07:00
Sebastien Pouliot ef3bdc76c2 Allow RSACryptoServiceProvider.SignHash to work with SHA-2 family
* System.Security.Cryptography/CryptoConfig.cs: Add OID for RIPEMD160
* System.Security.Cryptography/RSACryptoServiceProvider.cs: Update
GetHashNameFromOID to include SHA2-family OIDs. Remove historical
comments about 1.x FX behavior.

* Test/System.Security.Cryptography/CryptoConfigTest.cs: Add test cases
wrt RIPEMD160 OID
* Test/System.Security.Cryptography/RSACryptoServiceProviderTest.cs: Add
test case for SignHash with all FX-provided hash implementations (all
working except RIPEMD160). Remove some NET_2_0/NET_1_1 defines.
* Test/System.Security.Cryptography/RSAPKCS1SignatureFormatterTest.cs:
Remove hacks that were needed for running the tests under FX 1.x. Remove
some NET_2_0/NET_1_1 defines.
2011-01-21 08:39:32 -05:00
Zoltan Varga ec98a692a1 Add NET 4.0 Assembly.UnsafeLoadFrom () method. 2011-01-21 07:27:30 +01:00
Zoltan Varga a1681e5ee3 Fix the previous aot fix. 2011-01-21 05:58:29 +01:00
Miguel de Icaza 962fedd1e6 Do not build the Socket passing on Mobile systems 2011-01-20 22:50:08 -05:00
Atsushi Eno 5920237751 backport JavaScriptObjectDeserializer encoding detection fix. 2011-01-21 12:13:52 +09:00
Gonzalo Paniagua Javier 788535030b [System.Web] Razor works now (modulo DB) 2011-01-20 21:59:47 -05:00
Zoltan Varga 48f3edb3cd Add a test for infinite generic recursion + AOT. 2011-01-21 02:07:57 +01:00
Zoltan Varga e235e72884 Only add imt items whose is_equal flag is set to the array passed to the full-aot imt thunk. 2011-01-21 02:06:47 +01:00
Zoltan Varga 3a1ae308b8 Avoid emitting .note.GNU-stack on arm. 2011-01-21 01:52:51 +01:00
Zoltan Varga f1c1e02c38 Detect inifinite generic recursion differently in the AOT compiler. 2011-01-21 01:50:35 +01:00
Marek Habersack 43937146ac [asp.net] Don't throw NREX when a cache item to be removed is null 2011-01-20 23:39:12 +01:00
Miguel de Icaza c618dfe519 [sockets] Implement DuplicateAndClose and Socket (SocketInformation) constructor for in-process socket passing (AppDomains) 2011-01-20 16:52:49 -05:00
Andrew Jorgensen 42afbbaaa4 remove conflict marker 2011-01-20 11:24:24 -07:00
Jb Evain 730898592e [bug] Prevent a GetMethodBody call on a dynamic method. Fixes 665788 2011-01-20 16:45:43 +01:00
Marek Habersack 0a63027390 [asp.net,mvc] Make unobtrustive request validation in MVC v3 possible
Validation is enabled early in the pipeline during request. ValidationUtility makes sure that validation is indeed enabled and
replaces the default form and query string collections with a lazy version which will validate values only when an existing key
is found and requested.
2011-01-20 14:38:46 +01:00
Marek Habersack 61aa41abb7 [asp.net] Do not throw NREX when firstError is null in ErrorMessage getter 2011-01-20 14:38:37 +01:00
Marek Habersack 66818bb2b6 [asp.net] ValidationUtility implementation 2011-01-20 14:38:21 +01:00
Marek Habersack 1d180c57e1 [asp.net] Introduced unvalidated versions of Form and QueryString properties for MVC3 2011-01-20 14:38:12 +01:00
Marek Habersack 5119b6ef08 [asp.net] Implemented dynamic HTTP module registration 2011-01-20 14:38:02 +01:00
Marek Habersack 14698a4fbf [asp.net] Implemented BuildManager.GetObjectFactory
This method is not used by Mono internally but is called by MVC v3.
2011-01-20 14:37:53 +01:00
Marek Habersack bbca7f5660 [asp.net] Added internal property InputValidationEnabled to report whether the user enabled validation for current request. 2011-01-20 14:37:42 +01:00
Marek Habersack a0c987053d [asp.net] System.Web and Microsoft.Web.Infrastructure are now friends 2011-01-20 14:37:33 +01:00
Marek Habersack 61f6558eae [asp.net] Added the Microsoft.Web.Infrastructure assembly 2011-01-20 14:37:17 +01:00
Marek Safar ba139553af [665333] Encode Length of Public Key correctly 2011-01-20 08:36:02 +00:00
Zoltan Varga 15ead88bf2 Properly align the stack in the arm generic trampoline. 2011-01-20 05:36:20 +01:00
Zoltan Varga 626711d3ac Add a TID field to ThreadMirror which returns the system thread id. 2011-01-20 02:14:22 +01:00
Andrew Jorgensen 51d92f3a6a Dist more files needed by MSVC build 2011-01-19 15:43:12 -07:00
Rodrigo Kumpera 3914fd479a Document precise marking 2011-01-19 15:02:25 +01:00
Rodrigo Kumpera a3d0d6916e Properly clear weak refs that don't track resurrection.
* sgen-gc.c (finish_gray_stack): We must clear
	weak refs that don't track resurrection before
	processing finalizable objects otherwise we'll
	copy/mark them and the weak ref won't be cleared
	until after finalization.

	Fixes #657408
2011-01-19 15:02:09 +01:00
Gonzalo Paniagua Javier 347ad09426 Happy new year. 2011-01-18 22:44:15 -05:00
Zoltan Varga 744c3e2c5b Make the stacks of aot image non-executable. 2011-01-18 18:12:47 +01:00
Marek Safar ca11993157 Checking skd path for is not enough, add check for mscorlib as well 2011-01-18 17:11:07 +00:00
Marek Safar 132f745176 Fallback to corlib location when sdk path cannot be found 2011-01-18 17:10:46 +00:00
Zoltan Varga 001ea99047 Disable some of the FastCopy fast paths since they are racy. 2011-01-18 17:17:42 +01:00
Zoltan Varga 74d5f80e4a Allow only primitive types/enums in RuntimeHelpers.InitializeArray (). 2011-01-18 16:42:22 +01:00
Marek Safar 8e600e2290 Remove devirtualization for Type members 2011-01-18 13:32:34 +00:00
Zoltan Varga fe6c36df0a Make runtime invoke wrappers use cdecl cconv on windows. 2011-01-17 23:18:17 +01:00
Zoltan Varga fe3cd893f7 OP_LCOMPARE_IM has type 'L', not 'I'. Fixes #664630.
This is the same as 6c02c15153, but only for ia64, to avoid destabilizing the
branch.
2011-01-17 22:46:43 +01:00
Rodrigo Kumpera 7dfbfce2c4 Don't check for brokeness when verifying contraints.
* verify.c (is_valid_generic_instantiation): Don't
	check if any argument is broken during constraint check
	as an instance should be valid, but not realizable, even
	if it has broken arguments.

	Fixes one of the issues with #664612
2011-01-17 20:05:16 +01:00
Marek Safar fd66549c35 Add new mcs -sdk option 2011-01-17 17:22:12 +00:00
Zoltan Varga 61b183faa3 Avoid another case of infinite recursion in AOT. 2011-01-17 16:15:10 +01:00
Jb Evain 029c168ffb Fix pdb2mdb when a pdb has a method with no seq points.
Patch by Thad Thompson <[email protected]>
2011-01-17 15:55:11 +01:00
Marek Safar 2ec8c50752 Update to the latest mcs version 2011-01-17 14:15:43 +00:00
Marek Safar 322bc4c9c2 Update IKVM.Reflection 2011-01-17 14:13:26 +00:00
Marek Habersack 8341dc023d [asp.net] (4.0) Validate the form data in Form getter 2011-01-17 14:03:09 +01:00
Zoltan Varga 52ac70bd71 Fix the previous marshalling change so it only applies to chars, not structures which contain char fields. 2011-01-17 00:09:39 +01:00
Zoltan Varga 3229ba977b Pass the string encoding to emit_struct_conv () so marshalling of char arrays works on big-ending machines like s390/ppc64. 2011-01-16 21:11:45 +01:00
Zoltan Varga 02c5d6df68 Make OP_CHECK_THIS do a byte load on arm, since the source argument might point to a vtype if a vtype method is inlined. 2011-01-14 22:29:29 +01:00
Marek Habersack 10ed451a10 [asp.net] Make StopRoutingHandler actually stop the routing instead of throwing an exception
Patch from Damir Simunic <[email protected]>, thanks!
2011-01-14 21:37:18 +01:00
Ankit Jain 31458593f0 [xbuild] Use the backing field directly to avoid evaluating again.
* Microsoft.Build.BuildEngine.Project.cs (InitializeProperties): Use
evaluatedProperties field instead of EvaluatedProperties property,
to avoid invoking a Reevaluate, since it is already in progress.
2011-01-14 04:11:23 +05:30
Ankit Jain 4a914ca1bf [xbuild] Fix bug #664349 .
* Microsoft.Build.BuildEngine/Project.cs (BuildInternal): Set needToReevaluate to
false, when reevaluating.
2011-01-14 04:11:18 +05:30
Ankit Jain 66a2165e37 [xbuild] Add $(TargetDir) property.
Add $(TargetDir) and set TargetPath only if its not set already.
2011-01-14 04:11:12 +05:30
Ankit Jain 035f96e4f8 [xbuild] Clear the built targets cache on project unload.
Remove the entries for a project from the built targets cache, on
project unload.

* Microsoft.Build.BuildEngine/Engine.cs (ClearBuiltTargetsForProject): New.
* Microsoft.Build.BuildEngine/Project.cs (BuiltTargetKeys): Remove.
(RemoveBuiltTargets): Use Engine.ClearBuiltTargetsForProject .
* Microsoft.Build.BuildEngine/Target.cs: Track api changes.
*
2011-01-14 04:11:00 +05:30
Ankit Jain 88b0d19f8b [xbuild] Copy metadata from Project items to target outputs.
Copy metadata from Project items to the corresponding target
outputs in MSBuild task.

Fix the corresponding test also.
2011-01-14 04:10:46 +05:30
Ankit Jain ca46b25e6a [xbuild] Ensure trailing slash on some properties.
Ensure trailing slash on $(BaseIntermediateOutputPath) and
$(IntermediateOutputPath).
2011-01-14 04:10:37 +05:30
Ankit Jain 6140b9ca09 [xbuild] ConsoleLogger - Correctly indent multi-line messages.
Split and correctly indent multi-line messages in ConsoleLogger.
2011-01-14 04:10:29 +05:30
Geoff Norton 5ed112e660 Fix the win32 build 2011-01-13 12:38:44 -07:00
Geoff Norton 318ddb4924 Fix win32 build 2011-01-13 12:38:34 -07:00
Andrew Jorgensen b073713bfa Add vcxproj files for msbuild 2011-01-13 12:37:39 -07:00
Marek Habersack 4085f52f2c [data-annotations] Added some missing 4.0 members 2011-01-13 20:23:36 +01:00
Marek Habersack 71d78c2ceb [asp.net] Implemented the 4.0 type, FileLevelMasterPageControlBuilder 2011-01-13 20:23:26 +01:00
Zoltan Varga 7d25fb2f5e Add null check to stelem_ref_check () jit icall. Fixes #664297. 2011-01-13 18:42:52 +01:00
Jérémie Laval 6418ad41d2 Make use of the wait changes in the internal TaskScheduler -> IScheduler proxy. 2011-01-13 17:19:13 +00:00
Jérémie Laval 6a8c4a6220 Rework internal wait mechanism in thread workers participation code 2011-01-13 17:18:58 +00:00
Andrew Jorgensen 97d18f0c32 2.10 2011-01-13 09:50:27 -07:00
Jb Evain 92b8771128 Remove custom ResolutionException now that Cecil is providing one 2011-01-13 16:09:42 +01:00
Jb Evain 4689cde2f6 Update cecil from upstream 2011-01-13 16:09:17 +01:00
Jérémie Laval 7132ff6bc1 Fix continuation not being scheduled because of too early and too greedy disposing. 2011-01-13 14:40:02 +00:00
Rodrigo Kumpera e159ffb746 Fix 2.0 remapping of System.Transations to 2.0 and not 3.5. 2011-01-13 11:40:42 +01:00
Rodrigo Kumpera 882fad8a8e Fix array assignability to one of its generic interfaces.
* verify.c: mono_class_is_assignable_from can't handle
	IList<GTD<T>> x GTD[] since GTD[] won't have the right
	iface slots set. This isn't a problem for the runtime
	since GTD[] will never happen as it's an unrealizable type.

	Fixes #663815
2011-01-12 18:32:48 +01:00
Rodrigo Kumpera 6c6008506f Handle more cases of gtd encoded as ginst over itself.
* verify.c (mono_type_is_valid_type_in_context_full):
	The trick of encoding the GTD as an instantiation over its
	own arguments is also valid for component types such as GTD[]
	GTD[,] and Foo<GTD>.
2011-01-12 18:32:35 +01:00
Atsushi Eno 403346372f Fix cygwin build. 2011-01-12 20:05:08 +09:00
Marek Safar 4ae2b5037d Update copyright years 2011-01-12 09:28:03 +00:00
Marek Safar a67eb7f224 Use base type parameters to extract params modifier of virtual method 2011-01-12 09:27:39 +00:00
Marek Safar d9619cbfa9 Install new ikvm based C# compiler as mcs 2011-01-12 09:26:46 +00:00
Marek Safar c098d0d842 [662222] Import dynamic attribute using attribute type reader 2011-01-12 09:26:20 +00:00
Christian Hergert b2823262ba Fix broken g_int_hash/g_int_equal semantics
Both g_int_hash and g_int_equal used the semantics that an
integer is stored directly in the pointer. This is incorrect
as the pointer actually points to a location containing an
integer.

For those wanting the previous (incorrect) implementation,
they should look at g_direct_hash and g_direct_equal.
2011-01-11 19:46:05 -05:00
Marek Habersack 42d8b111ec [asp.net] Fix for bug #662918. Do not create the HtmlTitle child control for HtmlHead if <title> wasn't used in the page code. 2011-01-11 23:23:58 +01:00
Zoltan Varga cfa37dc27d Disable system AOT when using the loaded llvm, as it seems to cause crashes on the x86 buildbot. 2011-01-11 20:56:15 +01:00
Zoltan Varga 2be48ab1fa Dump the AOT log upon a failure. 2011-01-11 20:44:22 +01:00
Geoff Norton cd6a73c07f Fix AOT on OSX/x86 2011-01-11 10:34:03 -05:00
Geoff Norton 4264916df5 Fixed loadedllvm on OSX
The default build of libmono-llvm.dylib includes libmono and all its dependencies,
but our statically compiled mono binary does as well.  OSX can actually load both
into its process space, and get confused as to which symbol it should call, leading
to non-deterministic crashes.  We'll remove all the mono dependencies, and use
-undefined suppress to mitigate this on OSX.
2011-01-11 00:55:52 -05:00
Jonathan Pryor 32b1aa404a [monodoc/osx] Look for docs in additional directories.
Fixes #663182.

OSX allows multiple framework versions to be installed side-by-side,
and the current version is available through
/Library/Frameworks/Mono.framework/Versions/Current.

However, documentation installed into /L/F/M.f/V/C/lib/monodoc/sources
is specific for that Mono version; upgrade Mono.framework, and the
documentation is "lost," not visible to the newly installed version.

To fix this, we're creating an *unversioned* directory to contain
documentation, which will thus be persistent across Mono.framework
upgrades: /Library/Frameworks/Mono.framework/External/monodoc

This will allow Mono.framework to be upgraded without "losing" the
documentation visible within monodoc.
2011-01-10 21:09:26 -05:00
Zoltan Varga 1302702ad5 Fix a regression introduced by db4299a1. 2011-01-11 01:12:47 +01:00
Ankit Jain 3fb44e93e2 [xbuild] Update man page, new search paths for extensions and .pc files. 2011-01-11 05:19:12 +05:30
17555 changed files with 790295 additions and 1415397 deletions

No files matched your search

+36 -120
View File
@@ -1,122 +1,38 @@
##############################################################################
# General
##############################################################################
# OS junk files
[Tt]humbs.db
*.DS_Store
# Visual Studio / MonoDevelop
*.[Oo]bj
*.exe
*.dll
*.pdb
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.lib
*.sbr
*.sdf
*.opensdf
*.resources
*.res
ipch/
obj/
[Bb]in
[Dd]ebug*/
[Rr]elease*/
Ankh.NoLoad
*.gpState
# Tooling
_ReSharper*/
*.resharper
[Tt]est[Rr]esult*
# NuGet packages
!.nuget/*
[Pp]ackages/*
![Pp]ackages/repositories.config
# Temporary Files
~.*
~$*
# Autotools-generated files
/Makefile
Makefile.in
aclocal.m4
autom4te.cache
/build/
config.cache
config.guess
config.h
config.h.in
config.log
config.status
config.sub
configure
configure.scan
depcomp
install-sh
libtool
ltmain.sh
missing
mkinstalldirs
releases
stamp-h
stamp-h1
stamp-h.in
/Makefile.in
/_tmpinst
/aclocal.m4
/autom4te.cache
/config.cache
/config.guess
/config.h
/config.h.in
/config.h.in
/config.log
/config.status
/config.sub
/configure
/libtool
/ltconfig
/ltmain.sh
/mono-*.tar.gz
/*.pc
/mono.spec
/mono-core.spec
/semantic.cache
/stamp-h
/stamp-h.in
/stamp-h1
/tmpinst-dir.stamp
/missing
/compile
/depcomp
/install-sh
/doltlibtool
/doltcompile
/libtool.m4
/ltoptions.m4
/ltsugar.m4
/lt~obsolete.m4
/ltversion.m4
*~
*.swp
*.o
.deps
# Libtool
libtool.m4
lt~obsolete.m4
ltoptions.m4
ltsugar.m4
ltversion.m4
# Dolt (libtool replacement)
doltlibtool
doltcompile
# pkg-config
*.pc
# Emacs
semantic.cache
# gtags
GPATH
GRTAGS
GSYMS
GTAGS
##############################################################################
# Mono-specific patterns
##############################################################################
.dirstamp
compile
mono.h
mono-*.tar.*
mono.spec
mono-core.spec
tmpinst-dir.stamp
-27
View File
@@ -1,27 +0,0 @@
[submodule "external/aspnetwebstack"]
path = external/aspnetwebstack
url = git://github.com/mono/aspnetwebstack.git
[submodule "external/Newtonsoft.Json"]
path = external/Newtonsoft.Json
url = git://github.com/mono/Newtonsoft.Json.git
[submodule "external/cecil"]
path = external/cecil
url = git://github.com/mono/cecil.git
[submodule "external/debian-snapshot"]
path = external/debian-snapshot
url = git://github.com/directhex/mono-snapshot.git
[submodule "external/entityframework"]
path = external/entityframework
url = git://github.com/mono/entityframework.git
[submodule "external/rx"]
path = external/rx
url = git://github.com/mono/rx.git
[submodule "external/ikvm"]
path = external/ikvm
url = git://github.com/mono/ikvm-fork.git
[submodule "external/Lucene.Net"]
path = external/Lucene.Net
url = git://github.com/mono/lucene.net.git
[submodule "external/ikdasm"]
path = external/ikdasm
url = git://github.com/mono/ikdasm.git
-49
View File
@@ -1,49 +0,0 @@
Guidelines
==========
When contributing to the Mono project, please follow the [Mono Coding
Guidelines][1]. We have been using a coding style for many years,
please make your patches conform to these guidelines.
[1] http://www.mono-project.com/Coding_Guidelines
Etiquette
=========
In general, we do not accept patches that merely shuffle code around,
split classes in multiple files, reindent the code or are the result
of running a refactoring tool on the source code. This is done for
three reasons: (a) we have our own coding guidelines; (b) Some modules
are imported from upstream sources and we want to respect their coding
guidelines and (c) it destroys valuable history that is often used to
investigate bugs, regressions and problems.
License
=======
The Mono project uses the MIT X11, GNU LGPL version 2 and the Apache
License 2.0. We also imported some Microsoft code licensed under the
open source Microsoft Public License.
Different parts of Mono use different licenses. The actual details of
which licenses are used for which parts are detailed on the LICENSE
file in this directory.
When contributing code, make sure that your contribution falls under
the appropriate license. For example, contributions to code licensed
under MIT X11 code, should be MIT X11 code.
The Runtime is a special case. The code is dual licensed by Xamarin
under both the GNU LGPL v2 license and is also available under
commercial terms. For the runtime, you should either sign an
agreement that grants Xamarin the rights to relicense your code under
other licenses other than the LGPL v2 or your contribution must be
made as an MIT X11 license which grants us the same rights, but
involves no paperwork.
Submitting Patches
==================
When Submitting patches to the dual-licensed portions, please specify
on the commit the license that the code is under.
-13
View File
@@ -1,16 +1,3 @@
2011-04-19 gettextize <[email protected]>
* m4/gettext.m4: New file, from gettext-0.18.1.
* m4/iconv.m4: New file, from gettext-0.18.1.
* m4/lib-ld.m4: New file, from gettext-0.18.1.
* m4/lib-link.m4: New file, from gettext-0.18.1.
* m4/lib-prefix.m4: New file, from gettext-0.18.1.
* m4/nls.m4: Upgrade to gettext-0.18.1.
* m4/po.m4: Upgrade to gettext-0.18.1.
* m4/progtest.m4: Upgrade to gettext-0.18.1.
* m4/Makefile.am (EXTRA_DIST): Add the new files.
* configure.in (AC_CONFIG_FILES): Add po/Makefile.in.
2010-08-05 Andrés G. Aragoneses <[email protected]>
* scripts/.gitignore: added mono-abi-info.
+14 -17
View File
@@ -2,14 +2,14 @@
Mono is made up of many pieces of code, all of them open source, but
different pieces of Mono use different licensing terms.
For comments, corrections and updates, please contact mono@xamarin.com
For comments, corrections and updates, please contact mono@novell.com
* Dual Licensing
Parts of Mono are dual licensed, they are available to the
public in GPL or LGPL forms, but we also offer those pieces
under commercial terms from Xamarin for the cases wher the GPL
and the LGPL are not suitable.
under commercial terms from Novell for when the GPL and the
LGPL are not suitable.
We have tried to pick the licenses that will maximize adoption
of Mono, so we tend to use the MIT X11 or LGPL liceses.
@@ -22,10 +22,7 @@ For comments, corrections and updates, please contact [email protected]
Contributions for other modules should be under the same license
terms as the rest of the module, or under MIT X11 terms.
For the actual license links in the Mono distribution see the
bottom of this file.
If you need further information, please contact [email protected]
If you need further information, please contact [email protected]
* The Modules
@@ -34,7 +31,7 @@ For comments, corrections and updates, please contact [email protected]
This code is dual licensed under the LGPL or commercial licenses.
The LGPL ensures that Mono can be used in most scenarios, but
gives Xamarin the flexibility to relicense the code for
gives Novell the flexibility to relicense the code for
embedded systems, static linking or commercial settings where
the LGPL can not be used.
@@ -42,28 +39,28 @@ For comments, corrections and updates, please contact [email protected]
embedded system where the end user is not able to upgrade the
Mono VM or Moonlight installation or distribution that is part
of your product (Section 6 and 7), you would have to obtain a
commercial license from Xamarin (consider software burned into
commercial license from Novell (consider software burned into
a ROM, systems where end users would not be able to upgrade,
an embedded console, a game console that imposes limitations
on the distribution and access to the code, a phone platform
that prevents end users from upgrading Moonlight).
Contact mono@xamarin.com for details on obtaining the Mono
Contact mono@novell.com for details on obtaining the Mono
runtime under other terms.
** mono/support: MonoPosixHelper and support code
This code is dual licensed under the LGPL or commercial licenses, with
the same guidelines as mono/mono code.
The ZLib files are included under a "new BSD"-style license.
** mono/eglib: Mono's X11 glib implementation
This is a minimal subset of glib that is to be licensed under
the terms of the MIT X11, this means that this code can be
used for any purposes by anyone.
** mono/metadata/sgen*: Mono's Copying Collector
This new garbage collector is licensed under the terms of
the MIT X11 license, in hopes that the GC could be reused
by third party projects, follows the same spirit than the
Boehm GC.
** mono/arch/*/XXX-codegen.h
This are C macros that are useful when generating native
+31 -50
View File
@@ -1,45 +1,34 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .
MONOTOUCH_SUBDIRS = $(libgc_dir) eglib/src mono
MOONLIGHT_SUBDIRS = $(libgc_dir) eglib/src mono
if CROSS_COMPILING
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
DIST_SUBDIRS = po libgc eglib mono ikvm-native data runtime scripts man samples tools msvc docs
else
if ONLY_MONOTOUCH
SUBDIRS = $(MONOTOUCH_SUBDIRS) runtime
else
if ONLY_XAMMAC
SUBDIRS = $(libgc_dir) eglib/src mono runtime
if ONLY_MOONLIGHT
SUBDIRS = $(MOONLIGHT_SUBDIRS) runtime
else
SUBDIRS = po $(libgc_dir) eglib mono $(ikvm_native_dir) support data runtime scripts man samples msvc $(docs_dir)
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = m4 po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
DIST_SUBDIRS = po libgc eglib mono ikvm-native support data runtime scripts man samples tools msvc docs
endif
endif
endif
all: update_submodules
SUBMODULE_ERROR='Could not recursively update all git submodules. You may experience compilation problems if some submodules are out of date'
update_submodules:
@$(srcdir)/scripts/update_submodules
.PHONY: update_submodules
EXTRA_DIST= \
README.md \
LICENSE \
autogen.sh \
build-mingw32.sh \
mkinstalldirs \
mono-uninstalled.pc.in \
winconfig.h \
mono-core.spec \
external
nls.m4 \
po.m4 \
progtest.m4 \
winconfig.h
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
@@ -48,9 +37,7 @@ GIT_DIR ?= $(srcdir)/.git
dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) distdir=$$d dist-recursive
rm -rf `find $(top_distdir)/external -path '*\.git' -and -type d`
# Disable this for now because it is very slow and causes wrench to timeout:
# test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
test ! -d $(GIT_DIR) || ./scripts/commits-to-changelog.py --root=$(distdir) last-commit-with-compulsory-changelog-entry
pkgconfigdir = $(libdir)/pkgconfig
noinst_DATA = mono-uninstalled.pc
@@ -60,7 +47,7 @@ DISTCLEANFILES= mono-uninstalled.pc
mcslib = $(mcs_topdir)/class/lib
monolite = $(mcslib)/monolite
mono_corlib_version = $(shell sed -n "s/\#define MONO_CORLIB_VERSION //p" $(srcdir)/mono/metadata/appdomain.c)
monolite_url = http://storage.bos.xamarin.com/mono-dist-master/latest/monolite-$(mono_corlib_version)-latest.tar.gz
monolite_url = http://mono.ximian.com/daily/monolite-$(mono_corlib_version)-latest.tar.gz
.PHONY: get-monolite-latest
get-monolite-latest:
-rm -fr $(mcslib)/monolite-*
@@ -92,28 +79,28 @@ mcs-do-compiler-tests:
bootstrap-world: compiler-tests
$(MAKE) install
if INSTALL_MONOTOUCH
monotouch-do-build: config.h
@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
if MOONLIGHT
moon-do-build: config.h
@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
case "x$$subdir" in \
xmono ) target="monotouch-do-build";; \
xmono ) target="moon-do-build";; \
* ) target="all";; \
esac; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-build)
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-build)
monotouch-do-clean:
@list='$(MONOTOUCH_SUBDIRS)'; for subdir in $$list; do \
moon-do-clean:
@list='$(MOONLIGHT_SUBDIRS)'; for subdir in $$list; do \
case "x$$subdir" in \
xmono ) target="monotouch-do-clean";; \
xmono ) target="moon-do-clean";; \
* ) target="clean";; \
esac; \
echo "Making $$target in $$subdir"; \
(cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \
done;
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) monotouch-do-clean)
(cd runtime && $(MAKE) $(AM_MAKEFLAGS) moon-do-clean)
endif
@@ -134,10 +121,12 @@ win32getdeps:
win32setup:
makensis /DMILESTONE=$(VERSION) /DSOURCE_INSTALL_DIR=$(SOURCE_INSTALL_DIR) /DBUILDNUM=$(BUILDNUM) monowiz.win32.nsi
patch-quiet:
find mono -name Makefile -exec scripts/patch-quiet.sh {} \;
find libgc -name Makefile -exec scripts/patch-quiet.sh {} \;
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)
@@ -146,23 +135,15 @@ package-inputs:
echo '<root>' >> msvc/scripts/order.xml
for i in `cat msvc/scripts/order`; do \
set `echo $$i | sed -e 's/:/ /' -e 's/.input//'`; \
cat msvc/scripts/inputs/$$2.input | sed -e 's/\\\\/\\/g' -e 's/\\/\\\\/g' | \
cat msvc/scripts/inputs/$$2.input | \
(echo " <project dir=\"$$1\" library=\"$$2\">"; \
read boot; echo " <boot>$$boot</boot>"; \
read mcs; echo " <mcs>$$mcs</mcs>"; \
read flags; echo " <flags>$$flags</flags>"; \
read output; echo " <output>$$output</output>"; \
read built; echo " <built_sources>`echo $$built | sed 's/\\\/\\\\/g'`</built_sources>"; \
read built; echo " <built_sources>$$built</built_sources>"; \
read libou; echo " <library_output>$$libou</library_output>"; \
read fx_ver; echo " <fx_version>$$fx_ver</fx_version>"; \
read profile; echo " <profile>$$profile</profile>"; \
read resp; echo " <response>$$resp</response>"; \
echo " </project>") >> msvc/scripts/order.xml; \
echo " </project>") >> msvc/scripts/order.xml; \
done
echo "</root>" >> msvc/scripts/order.xml
# Update llvm version in configure.in to the output of $LLVM_DIR/bin/llvm-config --version
update-llvm-version:
if test "x$$LLVM_DIR" = "x"; then echo "Set the make variable LLVM_DIR to the directory containing the LLVM installation."; exit 1; fi
REV=`$(LLVM_DIR)/bin/llvm-config --version` && sed -e "s,expected_llvm_version=.*,expected_llvm_version=\"$$REV\"," < configure.in > tmp && mv tmp configure.in && echo "Version set to $$REV."
+588
View File
@@ -0,0 +1,588 @@
This is Mono.
1. Installation
2. Using Mono
3. Directory Roadmap
1. Compilation and Installation
===============================
a. Build Requirements
---------------------
On Itanium, you must obtain libunwind:
http://www.hpl.hp.com/research/linux/libunwind/download.php4
On Solaris, make sure that you used GNU tar to unpack this package, as
Solaris tar will not unpack this correctly, and you will get strange errors.
On Solaris, make sure that you use the GNU toolchain to build the software.
Optional dependencies:
* libgdiplus
If you want to get support for System.Drawing, you will need to get
Libgdiplus. This library in turn requires glib and pkg-config:
* pkg-config
Available from: http://www.freedesktop.org/Software/pkgconfig
* glib 2.4
Available from: http://www.gtk.org/
* libzlib
This library and the development headers are required for compression
file support in the 2.0 profile.
b. Building the Software
------------------------
If you obtained this package as an officially released tarball,
this is very simple, use configure and make:
./configure --prefix=/usr/local
make
make install
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
S/390x, AMD64, ARM and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
mono and mcs:
tar xzf mcs-XXXX.tar.gz
tar xzf mono-XXXX.tar.gz
mv mono-XXX mono
mv mcs-XXX mcs
cd mono
./autogen.sh --prefix=/usr/local
make
The Mono build system is silent for most compilation commands.
To enable a more verbose compile (for example, to pinpoint
problems in your makefiles or your system) pass the V=1 flag to make, like this:
make V=1
c. Building the software from GIT
---------------------------------
If you are building the software from GIT, make sure that you
have up-to-date mcs and mono sources:
If you are an anonymous user:
git clone git://github.com/mono/mono.git
If you are a Mono contributors with read/write privileges:
git clone [email protected]:mono/mono.git
Then, go into the mono directory, and configure:
cd mono
./autogen.sh --prefix=/usr/local
make
For people with non-standard installations of the auto* utils and of
pkg-config (common on misconfigured OSX and windows boxes), you could get
an error like this:
./configure: line 19176: syntax error near unexpected token `PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
This means that you need to set the ACLOCAL_FLAGS environment var
when invoking autogen.sh, like this:
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/loca
where $acprefix is the prefix where aclocal has been installed.
This will automatically go into the mcs/ tree and build the
binaries there.
This assumes that you have a working mono installation, and that
there's a C# compiler named 'mcs', and a corresponding IL
runtime called 'mono'. You can use two make variables
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
can say
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, an obvious choice
is to install the latest released packages of 'mono' for your
distribution and running autogen.sh; make; make install in the
mono module directory.
You can also try a slightly more risky approach: this may not work,
so start from the released tarball as detailed above.
This works by first getting the latest version of the 'monolite'
distribution, which contains just enough to run the 'mcs'
compiler. You do this with:
# Run the following line after ./autogen.sh
make get-monolite-latest
This will download and automatically gunzip and untar the
tarball, and place the files appropriately so that you can then
just run:
make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe
And that will use the files downloaded by 'make get-monolite-latest.
Testing and Installation
------------------------
You can run (part of) the mono and mcs testsuites with the command:
make check
All tests should pass.
If you want more extensive tests, including those that test the
class libraries, you need to re-run 'configure' with the
'--enable-nunit-tests' flag, and try
make -k check
Expect to find a few testsuite failures. As a sanity check, you
can compare the failures you got with
http://go-mono.com/tests/displayTestResults.php
You can now install mono with:
make install
You can verify your installation by using the mono-test-install
script, it can diagnose some common problems with Mono's install.
Failure to follow these steps may result in a broken installation.
d. Configuration Options
------------------------
The following are the configuration options that someone
building Mono might want to use:
--with-sgen=yes,no
Generational GC support: Used to enable or disable the
compilation of a Mono runtime with the SGen garbage collector.
On platforms that support it, after building Mono, you
will have both a mono binary and a mono-sgen binary.
Mono uses Boehm, while mono-sgen uses the Simple
Generational GC.
--with-gc=[boehm, included, sgen, none]
Selects the default Boehm garbage collector engine to
use, the default is the "included" value.
included:
This is the default value, and its
the most feature complete, it will allow Mono
to use typed allocations and support the
debugger.
It is essentially a slightly modified Boehm GC
boehm:
This is used to use a system-install Boehm GC,
it is useful to test new features available in
Boehm GC, but we do not recommend that people
use this, as it disables a few features.
none:
Disables the inclusion of a garbage
collector.
--with-tls=__thread,pthread
Controls how Mono should access thread local storage,
pthread forces Mono to use the pthread APIs, while
__thread uses compiler-optimized access to it.
Although __thread is faster, it requires support from
the compiler, kernel and libc. Old Linux systems do
not support with __thread.
This value is typically pre-configured and there is no
need to set it, unless you are trying to debug a
problem.
--with-sigaltstack=yes,no
Experimental: Use at your own risk, it is known to
cause problems with garbage collection and is hard to
reproduce those bugs.
This controls whether Mono will install a special
signal handler to handle stack overflows. If set to
"yes", it will turn stack overflows into the
StackOverflowException. Otherwise when a stack
overflow happens, your program will receive a
segmentation fault.
The configure script will try to detect if your
operating system supports this. Some older Linux
systems do not support this feature, or you might want
to override the auto-detection.
--with-static_mono=yes,no
This controls whether `mono' should link against a
static library (libmono.a) or a shared library
(libmono.so).
This defaults to yes, and will improve the performance
of the `mono' program.
This only affects the `mono' binary, the shared
library libmono.so will always be produced for
developers that want to embed the runtime in their
application.
--with-xen-opt=yes,no
The default value for this is `yes', and it makes Mono
generate code which might be slightly slower on
average systems, but the resulting executable will run
faster under the Xen virtualization system.
--with-large-heap=yes,no
Enable support for GC heaps larger than 3GB.
This value is set to `no' by default.
--enable-small-config=yes,no
Enable some tweaks to reduce memory usage and disk footprint at
the expense of some capabilities. Typically this means that the
number of threads that can be created is limited (256), that the
maxmimum heap size is also reduced (256 MB) and other such limitations
that still make mono useful, but more suitable to embedded devices
(like mobile phones).
This value is set to `no' by default.
--with-ikvm-native=yes,no
Controls whether the IKVM JNI interface library is
built or not. This is used if you are planning on
using the IKVM Java Virtual machine with Mono.
This defaults to `yes'.
--with-profile4=yes,no
Whether you want to build the 4.x profile libraries
and runtime.
It defaults to `yes'.
--with-moonlight=yes,no
Whether you want to generate the Silverlight/Moonlight
libraries and toolchain in addition to the default
(1.1 and 2.0 APIs).
This will produce the `smcs' compiler which will reference
the Silverlight modified assemblies (mscorlib.dll,
System.dll, System.Code.dll and System.Xml.Core.dll) and turn
on the LINQ extensions for the compiler.
--with-moon-gc=boehm,sgen
Select the GC to use for Moonlight.
boehm:
Selects the Boehm Garbage Collector, with the same flags
as the regular Mono build. This is the default.
sgen:
Selects the new SGen Garbage Collector, which provides
Generational GC support, using the same flags as the
mono-sgen build.
This defaults to `boehm'.
--with-libgdiplus=installed,sibling,<path>
This is used to configure where should Mono look for
libgdiplus when running the System.Drawing tests.
It defaults to `installed', which means that the
library is available to Mono through the regular
system setup.
`sibling' can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
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
components that you might not want to include. This
is only useful for developers embedding Mono that
require a subset of Mono functionality.
The list is a comma-separated list of components that
should be removed, these are:
aot:
Disables support for the Ahead of Time
compilation.
attach:
Support for the Mono.Management assembly and the
VMAttach API (allowing code to be injected into
a target VM)
com:
Disables COM support.
debug:
Drop debugging support.
decimal:
Disables support for System.Decimal.
full_messages:
By default Mono comes with a full table
of messages for error codes. This feature
turns off uncommon error messages and reduces
the runtime size.
generics:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
jit:
Removes the JIT engine from the build, this reduces
the executable size, and requires that all code
executed by the virtual machine be compiled with
Full AOT before execution.
large_code:
Disables support for large assemblies.
logging:
Disables support for debug logging.
pinvoke:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
portability:
Removes support for MONO_IOMAP, the environment
variables for simplifying porting applications that
are case-insensitive and that mix the Unix and Windows path separators.
profiler:
Disables support for the default profiler.
reflection_emit:
Drop System.Reflection.Emit support
reflection_emit_save:
Drop support for saving dynamically created
assemblies (AssemblyBuilderAccess.Save) in
System.Reflection.Emit.
shadow_copy:
Disables support for AppDomain's shadow copies
(you can disable this if you do not plan on
using appdomains).
simd:
Disables support for the Mono.SIMD intrinsics
library.
ssa:
Disables compilation for the SSA optimization
framework, and the various SSA-based
optimizations.
--enable-llvm
--enable-loadedllvm
This enables the use of LLVM as a code generation engine
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 the http://www.mono-project.com/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
against,
The --enable-loadedllvm variant will make the llvm backend
into a runtime-loadable module instead of linking it directly
into the main mono binary.
--enable-big-arrays
This enables the use arrays whose indexes are larger
than Int32.MaxValue.
By default Mono has the same limitation as .NET on
Win32 and Win64 and limits array indexes to 32-bit
values (even on 64-bit systems).
In certain scenarios where large arrays are required,
you can pass this flag and Mono will be built to
support 64-bit arrays.
This is not the default as it breaks the C embedding
ABI that we have exposed through the Mono development
cycle.
--enable-parallel-mark
Use this option to enable the garbage collector to use
multiple CPUs to do its work. This helps performance
on multi-CPU machines as the work is divided across CPUS.
This option is not currently the default as we have
not done much testing with Mono.
--enable-dtrace
On Solaris and MacOS X builds a version of the Mono
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
--disable-dev-random
Mono uses /dev/random to obtain good random data for
any source that requires random numbers. If your
system does not support this, you might want to
disable it.
There are a number of runtime options to control this
also, see the man page.
--enable-nacl
This configures the Mono compiler to generate code
suitable to be used by Google's Native Client:
http://code.google.com/p/nativeclient/
Currently this is used with Mono's AOT engine as
Native Client does not support JIT engines yet.
2. Using Mono
=============
Once you have installed the software, you can run a few programs:
* runtime engine
mono program.exe
* C# compiler
mcs program.cs
* CIL Disassembler
monodis program.exe
See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
for further details.
3. Directory Roadmap
====================
docs/
Technical documents about the Mono runtime.
data/
Configuration files installed as part of the Mono runtime.
mono/
The core of the Mono Runtime.
metadata/
The object system and metadata reader.
mini/
The Just in Time Compiler.
dis/
CIL executable Disassembler
cli/
Common code for the JIT and the interpreter.
io-layer/
The I/O layer and system abstraction for
emulating the .NET IO model.
cil/
Common Intermediate Representation, XML
definition of the CIL bytecodes.
interp/
Interpreter for CLI executables (obsolete).
arch/
Architecture specific portions.
man/
Manual pages for the various Mono commands and programs.
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.
runtime/
A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
../olive/
If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
-546
View File
@@ -1,546 +0,0 @@
Mono is a software platform designed to allow developers to easily create cross platform applications.
Mono is an open source implementation of Microsoft's .NET Framework based on the ECMA standards for C# and the Common Language Runtime.
1. [Installation](#compilation-and-installation)
2. [Using Mono](#using-mono)
3. [Directory Roadmap](#directory-roadmap)
4. [Contributing to Mono] (#contributing-to-mono)
5. [Git submodules maintenance](#git-submodules-maintenance)
6. [Reporting bugs](#reporting-bugs)
Compilation and Installation
============================
a. Build Requirements
---------------------
* On Itanium, you must obtain libunwind: http://www.hpl.hp.com/research/linux/libunwind/download.php4
* On Solaris
1. Make sure that you used GNU tar to unpack this package, as
Solaris tar will not unpack this correctly, and you will get strange errors.
2. Make sure that you use the GNU toolchain to build the software.
3. Optional dependencies
* libgdiplus - Required for System.Drawing. This library in turn requires glib and pkg-config
* pkg-config - Available at: http://www.freedesktop.org/Software/pkgconfig
* glib 2.4 - Available at: http://www.gtk.org/
* libzlib - This library and the development headers are required for compression
file support in the 2.0 profile.
b. Building the Software
------------------------
If you obtained this package as an officially released tarball,
this is very simple, use configure and make:
`./configure --prefix=/usr/local ; make ; make install`
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390,
S/390x, AMD64, ARM and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
mono and mcs:
tar xzf mcs-XXXX.tar.gz
tar xzf mono-XXXX.tar.gz
mv mono-XXX mono
mv mcs-XXX mcs
cd mono
./autogen.sh --prefix=/usr/local
make
The Mono build system is silent for most compilation commands.
To enable a more verbose compile (for example, to pinpoint
problems in your makefiles or your system) pass the V=1 flag to make, like this:
` make V=1`
c. Building the software from GIT
---------------------------------
If you are building the software from GIT, make sure that you
have up-to-date mcs and mono sources:
* If you are an anonymous user: `git clone git://github.com/mono/mono.git`
* If you are a Mono contributor with read/write privileges: `git clone [email protected]:mono/mono.git`
Then, go into the mono directory, and configure:
cd mono
./autogen.sh --prefix=/usr/local
make
For people with non-standard installations of the auto* utils and of
pkg-config (common on misconfigured OSX and windows boxes), you could get
an error like this:
./configure: line 19176: syntax error near unexpected token 'PKG_CHECK_MODULES(BASE_DEPENDENCIES,' ...
This means that you need to set the ACLOCAL_FLAGS environment variable
when invoking autogen.sh, like this:
ACLOCAL_FLAGS="-I $acprefix/share/aclocal" ./autogen.sh --prefix=/usr/local
where $acprefix is the prefix where aclocal has been installed.
This will automatically go into the mcs/ tree and build the
binaries there.
This assumes that you have a working mono installation, and that
there's a C# compiler named 'mcs', and a corresponding IL
runtime called 'mono'. You can use two make variables
EXTERNAL_MCS and EXTERNAL_RUNTIME to override these. e.g., you
can say:
make EXTERNAL_MCS=/foo/bar/mcs EXTERNAL_RUNTIME=/somewhere/else/mono
If you don't have a working Mono installation
---------------------------------------------
If you don't have a working Mono installation, an obvious choice
is to install the latest released packages of 'mono' for your
distribution and running `autogen.sh; make; make install` in the
mono module directory.
You can also try a slightly more risky approach: this may not work,
so start from the released tarball as detailed above.
This works by first getting the latest version of the 'monolite'
distribution, which contains just enough to run the 'mcs'
compiler. You do this with:
# Run the following line after ./autogen.sh
make get-monolite-latest
This will download and automatically gunzip and untar the
tarball, and place the files appropriately so that you can then
just run: `make EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/gmcs.exe`
That will use the files downloaded by 'make get-monolite-latest.
Testing and Installation
------------------------
You can run *(part of)* the mono and mcs test suites with the command: `make check`.
All tests should pass.
If you want more *extensive* tests, including those that test the
class libraries, you need to re-run 'configure' with the
'--enable-nunit-tests' flag, and try: `make -k check`
Expect to find a few test suite failures. As a sanity check, you
can compare the failures you got with
https://wrench.mono-project.com/Wrench/
You can now install mono with: `make install`
You can verify your installation by using the mono-test-install
script, it can diagnose some common problems with Mono's install.
Failure to follow these steps may result in a broken installation.
d. Configuration Options
------------------------
The following are the configuration options that someone
building Mono might want to use:
* `--with-sgen=yes,no` - Generational GC support: Used to enable or disable the
compilation of a Mono runtime with the SGen garbage collector.
* On platforms that support it, after building Mono, you will have
both a mono binary and a mono-sgen binary. Mono uses Boehm, while
mono-sgen uses the Simple Generational GC.
* `--with-gc=[boehm, included, sgen, none]` - Selects the default Boehm garbage
collector engine to use.
* *included*: (*slighty modified Boehm GC*)
This is the default value, and its
the most feature complete, it will allow Mono
to use typed allocations and support the
debugger.
* *boehm*:
This is used to use a system-install Boehm GC,
it is useful to test new features available in
Boehm GC, but we do not recommend that people
use this, as it disables a few features.
* *none*:
Disables the inclusion of a garbage collector.
* This defaults to `included`.
* `--with-tls=__thread,pthread`
* Controls how Mono should access thread local storage,
pthread forces Mono to use the pthread APIs, while
__thread uses compiler-optimized access to it.
* Although __thread is faster, it requires support from
the compiler, kernel and libc. Old Linux systems do
not support with __thread.
* This value is typically pre-configured and there is no
need to set it, unless you are trying to debug a problem.
* `--with-sigaltstack=yes,no`
* **Experimental**: Use at your own risk, it is known to
cause problems with garbage collection and is hard to
reproduce those bugs.
* This controls whether Mono will install a special
signal handler to handle stack overflows. If set to
`yes`, it will turn stack overflows into the
StackOverflowException. Otherwise when a stack
overflow happens, your program will receive a
segmentation fault.
* The configure script will try to detect if your
operating system supports this. Some older Linux
systems do not support this feature, or you might want
to override the auto-detection.
* `--with-static_mono=yes,no`
* This controls whether `mono` should link against a
static library (libmono.a) or a shared library
(libmono.so).
* This defaults to `yes`, and will improve the performance
of the `mono` program.
* This only affects the `mono' binary, the shared
library libmono.so will always be produced for
developers that want to embed the runtime in their
application.
* `--with-xen-opt=yes,no` - Optimize code for Xen virtualization.
* It makes Mono generate code which might be slightly
slower on average systems, but the resulting executable will run
faster under the Xen virtualization system.
* This defaults to `yes`.
* `--with-large-heap=yes,no` - Enable support for GC heaps larger than 3GB.
* This defaults to `no`.
* `--enable-small-config=yes,no` - Enable some tweaks to reduce memory usage
and disk footprint at the expense of some capabilities.
* Typically this means that the number of threads that can be created
is limited (256), that the maximum heap size is also reduced (256 MB)
and other such limitations that still make mono useful, but more suitable
to embedded devices (like mobile phones).
* This defaults to `no`.
* `--with-ikvm-native=yes,no` - Controls whether the IKVM JNI interface library is
built or not.
* This is used if you are planning on
using the IKVM Java Virtual machine with Mono.
* This defaults to `yes`.
* `--with-profile4=yes,no` - Whether you want to build the 4.x profile libraries
and runtime.
* This defaults to `yes`.
* `--with-moonlight=yes,no`
* Whether you want to generate the Silverlight/Moonlight
libraries and toolchain in addition to the default
(1.1 and 2.0 APIs).
* This will produce the `smcs` compiler which will reference
the Silverlight modified assemblies (mscorlib.dll,
System.dll, System.Code.dll and System.Xml.Core.dll) and turn
on the LINQ extensions for the compiler.
* `--with-moon-gc=boehm,sgen` - Select the GC to use for Moonlight.
* *boehm*:
Selects the Boehm Garbage Collector, with the same flags
as the regular Mono build. This is the default.
* *sgen*:
Selects the new SGen Garbage Collector, which provides
Generational GC support, using the same flags as the
mono-sgen build.
* This defaults to `boehm`.
* `--with-libgdiplus=installed,sibling,<path>` - Configure where Mono
searches for libgdiplus when running System.Drawing tests.
* It defaults to `installed`, which means that the
library is available to Mono through the regular
system setup.
* `sibling' can be used to specify that a libgdiplus
that resides as a sibling of this directory (mono)
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
components that you might not want to include. This
is only useful for developers embedding Mono that
require a subset of Mono functionality.
* The list is a comma-separated list of components that
should be removed, these are:
* `aot`:
Disables support for the Ahead of Time compilation.
* `attach`:
Support for the Mono.Management assembly and the
VMAttach API (allowing code to be injected into
a target VM)
* `com`:
Disables COM support.
* `debug`:
Drop debugging support.
* `decimal`:
Disables support for System.Decimal.
* `full_messages`:
By default Mono comes with a full table
of messages for error codes. This feature
turns off uncommon error messages and reduces
the runtime size.
* `generics`:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
* `jit`:
Removes the JIT engine from the build, this reduces
the executable size, and requires that all code
executed by the virtual machine be compiled with
Full AOT before execution.
* `large_code`:
Disables support for large assemblies.
* `logging`:
Disables support for debug logging.
* `pinvoke`:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
* `portability`:
Removes support for MONO_IOMAP, the environment
variables for simplifying porting applications that
are case-insensitive and that mix the Unix and Windows path separators.
* `profiler`:
Disables support for the default profiler.
* `reflection_emit`:
Drop System.Reflection.Emit support
* `reflection_emit_save`:
Drop support for saving dynamically created
assemblies (AssemblyBuilderAccess.Save) in
System.Reflection.Emit.
* `shadow_copy`:
Disables support for AppDomain's shadow copies
(you can disable this if you do not plan on
using appdomains).
* `simd`:
Disables support for the Mono.SIMD intrinsics
library.
* `ssa`:
Disables compilation for the SSA optimization
framework, and the various SSA-based optimizations.
* `--enable-llvm`
* `--enable-loadedllvm`
* This enables the use of LLVM as a code generation engine
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 the http://www.mono-project.com/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
against.
* The --enable-loadedllvm variant will make the LLVM backend
into a runtime-loadable module instead of linking it directly
into the main mono binary.
* `--enable-big-arrays` - Enable use of arrays with indexes larger
than Int32.MaxValue.
* By default Mono has the same limitation as .NET on
Win32 and Win64 and limits array indexes to 32-bit
values (even on 64-bit systems).
* In certain scenarios where large arrays are required,
you can pass this flag and Mono will be built to
support 64-bit arrays.
* This is not the default as it breaks the C embedding
ABI that we have exposed through the Mono development
cycle.
* `--enable-parallel-mark`
* Use this option to enable the garbage collector to use
multiple CPUs to do its work. This helps performance
on multi-CPU machines as the work is divided across CPUS.
* This option is not currently the default as we have
not done much testing with Mono.
* `--enable-dtrace`
* On Solaris and MacOS X builds a version of the Mono
runtime that contains DTrace probes and can
participate in the system profiling using DTrace.
* `--disable-dev-random`
* Mono uses /dev/random to obtain good random data for
any source that requires random numbers. If your
system does not support this, you might want to
disable it.
* There are a number of runtime options to control this
also, see the man page.
* `--enable-nacl`
* This configures the Mono compiler to generate code
suitable to be used by Google's Native Client:
http://code.google.com/p/nativeclient/
* Currently this is used with Mono's AOT engine as
Native Client does not support JIT engines yet.
Using Mono
==========
Once you have installed the software, you can run a few programs:
* `mono program.exe` runtime engine
* `mcs program.cs` C# compiler
* `monodis program.exe` CIL Disassembler
See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
for further details.
Directory Roadmap
=================
* `docs/` - Technical documents about the Mono runtime.
* `data/` - Configuration files installed as part of the Mono runtime.
* `mono/` - The core of the Mono Runtime.
* `metadata/` - The object system and metadata reader.
* `mini/` - The Just in Time Compiler.
* `dis/` - CIL executable Disassembler
* `cli/` - Common code for the JIT and the interpreter.
* `io-layer/` - The I/O layer and system abstraction for
emulating the .NET IO model.
* `cil/` - Common Intermediate Representation, XML
definition of the CIL bytecodes.
* `interp/` - Interpreter for CLI executables (obsolete).
* `arch/` - Architecture specific portions.
* `man/` - Manual pages for the various Mono commands and programs.
* `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.
* `runtime/` - A directory that contains the Makefiles that link the
mono/ and mcs/ build systems.
* `../olive/`
* If the directory ../olive is present (as an
independent checkout) from the Mono module, that
directory is automatically configured to share the
same prefix than this module gets.
Contributing to Mono
====================
Before submitting changes to Mono, please review the contribution guidelines at http://mono-project.com/Contributing. Please pay particular attention to the [Important Rules](http://mono-project.com/Contributing#Important_Rules) section.
Git submodules maintenance
==========================
Read documentation at http://mono-project.com/Git_Submodule_Maintenance
Maintainer
==========
Mono is maintained by miguel@xamarin.com
Reporting bugs
==============
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 on how to make a good bug
report:
http://mono-project.com/Bugs#How_to_make_a_good_bug_report
+2 -3
View File
@@ -23,13 +23,13 @@ if test x$GCC != xyes; then
fi
case $host in
i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*|x86_64-apple-darwin*)
|amd64-*-freebsd*|i?86-*-freebsd*|ia64-*-freebsd*|arm*-*-linux*|sparc*-*-linux*|mips*-*-linux*)
pic_options='-fPIC'
;;
?86-pc-cygwin*|i?86-pc-cygwin*)
pic_options='-DDLL_EXPORT'
;;
i?86-apple-darwin*|arm-apple-darwin*)
i?86-apple-darwin*)
pic_options='-fno-common'
;;
*)
@@ -158,7 +158,6 @@ modeok=false
tagok=false
for arg in "$[]@"; do
case "$arg" in
--silent) ;;
--mode=compile) modeok=true ;;
--tag=CC|--tag=CXX) tagok=true ;;
--quiet) ;;
+5 -30
View File
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
# Ripped off from GNOME macros version
@@ -102,33 +102,8 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
fi
fi
#
# Plug in the extension module
#
has_ext_mod=false
ext_mod_args=''
for PARAM; do
if [[ $PARAM =~ "--enable-extension-module" ]] ; then
has_ext_mod=true
if [[ $PARAM =~ "=" ]] ; then
ext_mod_args=`echo $PARAM | cut -d= -f2`
fi
fi
done
if test x$has_ext_mod = xtrue; then
pushd ../mono-extensions/scripts
sh ./prepare-repo.sh $ext_mod_args || exit 1
popd
else
cat mono/mini/Makefile.am.in > mono/mini/Makefile.am
cat mono/metadata/Makefile.am.in > mono/metadata/Makefile.am
fi
echo "Running aclocal -I m4 -I . $ACLOCAL_FLAGS ..."
aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
echo "Running aclocal -I . $ACLOCAL_FLAGS ..."
aclocal -I . $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"
@@ -138,13 +113,13 @@ aclocal -Wnone -I m4 -I . $ACLOCAL_FLAGS || {
exit 1
}
if grep "^AC_CONFIG_HEADERS" configure.in >/dev/null; then
if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
echo "Running automake --gnu $am_opt ..."
automake --add-missing --gnu -Wno-portability -Wno-obsolete $am_opt ||
automake --add-missing --gnu -Wno-portability $am_opt ||
{ echo "**Error**: automake failed."; exit 1; }
echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
+3 -3
View File
@@ -4,7 +4,7 @@ MINGW=i386-mingw32msvc
CROSS_DIR=/opt/cross/$MINGW
EXTRA_CROSS_DIR=
INSTALL_DESTDIR="$CURDIR/mono-win32"
PROFILES="default net_2_0 net_3_5 net_4_0 net_4_5 moonlight"
PROFILES="default net_2_0 net_3_5 net_4_0 moonlight"
TEMPORARY_PKG_CONFIG_DIR=/tmp/$RANDOM-pkg-config-$RANDOM
ORIGINAL_PATH="$PATH"
@@ -57,11 +57,11 @@ function setup ()
CROSS_DLL_DIR="$CROSS_DIR/bin"
PATH=$CROSS_BIN_DIR:$PATH
MONO_VERSION=`grep AC_INIT configure.in | cut -d ',' -f 2|tr -d '\[ \]'`
MONO_VERSION=`grep AM_INIT_AUTOMAKE configure.in | cut -d ',' -f 2|tr -d '\)'`
if [ -d ./.git ]; then
MONO_GIT_COMMIT="`git log -1 --format=format:%t`"
MONO_GIT_BRANCH="`git branch|grep '\*'|cut -d ' ' -f 2|tr -d '\)'|tr -d '\('`"
MONO_GIT_BRANCH="`git branch|grep '\*'|cut -d ' ' -f 2`"
MONO_RELEASE="$MONO_VERSION-$MONO_GIT_BRANCH-$MONO_GIT_COMMIT"
else
MONO_RELEASE="$MONO_VERSION"
-672
View File
@@ -1,672 +0,0 @@
#! /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
+278 -982
View File
File diff suppressed because it is too large. Load diff
-2
View File
@@ -3,5 +3,3 @@
/config
/.cvsignore
/*.pc
/gdb/mono-sgen-gdb.py
/mono-sgen-gdb.py
+6 -11
View File
@@ -1,7 +1,7 @@
SUBDIRS = net_2_0
if INSTALL_4_0
SUBDIRS += net_4_0 net_4_5
SUBDIRS += net_4_0
endif
monodir = $(sysconfdir)/mono
@@ -12,8 +12,7 @@ EXTRA_DIST = \
mono.pc.in mono-2.pc.in monosgen-2.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in wcf.pc.in monodoc.pc.in \
mono-nunit.pc.in mono-cairo.pc.in mono-options.pc.in cecil.pc.in \
mono-lineeditor.pc.in system.web.extensions_1.0.pc.in system.web.extensions.design_1.0.pc.in\
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in system.web.mvc3.pc.in aspnetwebstack.pc.in \
reactive.pc.in xbuild12.pc \
dtrace-prelink.sh mono.web.pc.in system.web.mvc.pc.in system.web.mvc2.pc.in \
net_1_1/machine.config \
gdb/mono-gdb.py \
gdb/gdb-python.diff
@@ -29,25 +28,21 @@ endif
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mono-2.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc $(SGENPCFILE)
else
pkgconfig_DATA= mono.pc mono-2.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc xbuild12.pc $(SGENPCFILE)
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc $(SGENPCFILE)
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc
endif
DISTCLEANFILES= mono-2.pc mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc monodoc.pc mono-lineeditor.pc system.web.extensions_1.0.pc \
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc system.web.mvc3.pc aspnetwebstack.pc reactive.pc $(SGENPCFILE) mono-sgen-gdb.py
system.web.extensions.design_1.0.pc mono.web.pc system.web.mvc.pc system.web.mvc2.pc $(SGENPCFILE)
mono_DATA = config \
browscap.ini
gdbdir = $(bindir)
mono-sgen-gdb.py: gdb/mono-gdb.py
cp $< $@
gdb_DATA = gdb/mono-gdb.py mono-sgen-gdb.py
gdb_DATA = gdb/mono-gdb.py
-4
View File
@@ -1,4 +0,0 @@
Name: AspNetWebStack
Description: References Microsoft ASP.NET Web Stack
Version: @VERSION@
Libs: -r:@prefix@/lib/mono/gac/System.Web.Razor/2.0.0.0__31bf3856ad364e35/System.Web.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.Http/4.0.0.0__31bf3856ad364e35/System.Web.Http.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Razor/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Razor.dll -r:@prefix@/lib/mono/gac/System.Web.WebPages.Deployment/2.0.0.0__31bf3856ad364e35/System.Web.WebPages.Deployment.dll
+1 -1
View File
@@ -1,5 +1,5 @@
assemblies_dir=@prefix@/lib/mono
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.9.5.0__0738eb9f132ed756/Mono.Cecil.dll
Libraries=${assemblies_dir}/gac/Mono.Cecil/0.9.4.0__0738eb9f132ed756/Mono.Cecil.dll
Name: Mono Internal -- Do not use.
Description: Mono Internal Libraries -- Do not use
-5
View File
@@ -17,7 +17,6 @@
<dllmap dll="sqlite3" target="@SQLITE3@" os="!windows"/>
<dllmap dll="libX11" target="@X11@" os="!windows" />
<dllmap dll="libcairo-2.dll" target="libcairo.so.2" os="!windows"/>
<dllmap dll="libcairo-2.dll" target="libcairo.2.dylib" os="osx"/>
<dllmap dll="libcups" target="libcups.so.2" os="!windows"/>
<dllmap dll="libcups" target="libcups.dylib" os="osx"/>
<dllmap dll="i:kernel32.dll">
@@ -26,8 +25,4 @@
<dllentry dll="__Internal" name="MoveMemory" target="mono_win32_compat_MoveMemory"/>
<dllentry dll="__Internal" name="ZeroMemory" target="mono_win32_compat_ZeroMemory"/>
</dllmap>
<dllmap dll="gdiplus" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
<dllmap dll="gdiplus.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
<dllmap dll="gdi32" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
<dllmap dll="gdi32.dll" target="@prefix@/lib/libgdiplus@libsuffix@" os="!windows"/>
</configuration>
+1 -1
View File
@@ -2,4 +2,4 @@
Name: Standard libraries in a .NET setup
Description: References all the standard .NET libraries for compilation
Version: @VERSION@
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll -r:System.Xml.Linq.dll
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.VisualC.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll
+20 -21
View File
@@ -15,7 +15,6 @@
# When attaching to a mono process, make sure you are in the same directory.
#
from __future__ import print_function
import os
class StringPrinter:
@@ -36,7 +35,7 @@ class StringPrinter:
while i < len:
val = (chars.cast(gdb.lookup_type ("gint64")) + (i * 2)).cast(gdb.lookup_type ("gunichar2").pointer ()).dereference ()
if val >= 256:
c = "\u%X".format (val)
c = "\u%X" % val
else:
c = chr (val)
res.append (c)
@@ -53,7 +52,7 @@ def stringify_class_name(ns, name):
if ns == "":
return name
else:
return "%s.%s".format (ns, name)
return "%s.%s" % (ns, name)
class ArrayPrinter:
"Print a C# array"
@@ -66,7 +65,7 @@ class ArrayPrinter:
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "%s [%d]".format (stringify_class_name (self.class_ns, self.class_name [0:len (self.class_name) - 2]), int (length))
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
class ObjectPrinter:
"Print a C# object"
@@ -96,7 +95,7 @@ class ObjectPrinter:
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("%s".format (field.name))))
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
@@ -109,11 +108,11 @@ class ObjectPrinter:
class_name = obj ['vtable'].dereference ()['klass'].dereference ()['name'].string ()
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
return {}.__iter__ ()
def to_string(self):
@@ -129,16 +128,16 @@ class ObjectPrinter:
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct %s.%s".format (class_ns, class_name))
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
return class_name
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
# FIXME: This can happen because we don't have liveness information
return self.val.cast (gdb.lookup_type ("guint64"))
@@ -154,9 +153,9 @@ class MonoMethodPrinter:
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s:%s ()\"".format (class_name, val ["name"].string ())
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
class MonoClassPrinter:
"Print a MonoClass structure"
@@ -169,9 +168,9 @@ class MonoClassPrinter:
return "0x0"
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s\"".format (class_name)
return "\"%s\"" % (class_name)
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
def lookup_pretty_printer(val):
t = str (val.type)
@@ -217,9 +216,9 @@ class MonoSupport(object):
new_size = os.stat ("xdb.s").st_size
if new_size > self.s_size:
sofile = "xdb.so"
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o".format (sofile))
gdb.execute ("shell as -o xdb.o xdb.s && ld -shared -o %s xdb.o" % sofile)
# FIXME: This prints messages which couldn't be turned off
gdb.execute ("add-symbol-file %s 0".format (sofile))
gdb.execute ("add-symbol-file %s 0" % sofile)
self.s_size = new_size
class RunHook (gdb.Command):
@@ -230,7 +229,7 @@ class RunHook (gdb.Command):
def invoke(self, arg, from_tty):
mono_support.run_hook ()
print ("Mono support loaded.")
print "Mono support loaded."
mono_support = MonoSupport ()
@@ -245,4 +244,4 @@ exec_file = gdb.current_objfile ().filename
if os.stat (exec_file).st_size != os.lstat (exec_file).st_size:
exec_file = os.readlink (exec_file)
exec_dir = os.path.dirname (exec_file)
gdb.execute ("source %s/%s-gdbinit".format (exec_dir, os.path.basename (exec_file)))
gdb.execute ("source %s/%s-gdbinit" % (exec_dir, os.path.basename (exec_file)))
+2 -2
View File
@@ -3,8 +3,8 @@
import sys
gdb.execute ("file %s".format (sys.argv [0]))
gdb.execute ("r --break *:* %s".format (" ".join (sys.argv [1:len (sys.argv)])))
gdb.execute ("file %s" % sys.argv [0])
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
while True:
try:
+29 -51
View File
@@ -10,7 +10,6 @@
# - run mono under gdb, or attach to a mono process started with --debug=gdb using gdb.
#
from __future__ import print_function
import os
class StringPrinter:
@@ -31,7 +30,7 @@ class StringPrinter:
while i < len:
val = (chars.cast(gdb.lookup_type ("gint64")) + (i * 2)).cast(gdb.lookup_type ("gunichar2").pointer ()).dereference ()
if val >= 256:
c = "\u%X".format (val)
c = "\u%X" % val
else:
c = chr (val)
res.append (c)
@@ -48,7 +47,7 @@ def stringify_class_name(ns, name):
if ns == "":
return name
else:
return "%s.%s".format (ns, name)
return "%s.%s" % (ns, name)
class ArrayPrinter:
"Print a C# array"
@@ -61,7 +60,7 @@ class ArrayPrinter:
def to_string(self):
obj = self.val.cast (gdb.lookup_type ("MonoArray").pointer ()).dereference ()
length = obj ['max_length']
return "%s [%d]".format (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
return "%s [%d]" % (stringify_class_name (self.class_ns, self.class_name [0:len(self.class_name) - 2]), int(length))
class ObjectPrinter:
"Print a C# object"
@@ -91,7 +90,7 @@ class ObjectPrinter:
return (field.name, self.obj [field.name])
except:
# Superclass
return (field.name, self.obj.cast (gdb.lookup_type ("%s".format (field.name))))
return (field.name, self.obj.cast (gdb.lookup_type ("%s" % (field.name))))
def children(self):
# FIXME: It would be easier if gdb.Value would support iteration itself
@@ -105,13 +104,13 @@ class ObjectPrinter:
if class_name [-2:len(class_name)] == "[]":
return {}.__iter__ ()
try:
gdb_type = gdb.lookup_type ("struct %s_%s".format (class_ns.replace (".", "_"), class_name))
gdb_type = gdb.lookup_type ("struct %s_%s" % (class_ns.replace (".", "_"), class_name))
return self._iterator(obj.cast (gdb_type))
except:
return {}.__iter__ ()
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
return {}.__iter__ ()
def to_string(self):
@@ -127,16 +126,16 @@ class ObjectPrinter:
return ArrayPrinter (self.val,class_ns,class_name).to_string ()
if class_ns != "":
try:
gdb_type = gdb.lookup_type ("struct %s.%s".format (class_ns, class_name))
gdb_type = gdb.lookup_type ("struct %s.%s" % (class_ns, class_name))
except:
# Maybe there is no debug info for that type
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
#return obj.cast (gdb_type)
return "%s.%s".format (class_ns, class_name)
return "%s.%s" % (class_ns, class_name)
return class_name
except:
print (sys.exc_info ()[0])
print (sys.exc_info ()[1])
print sys.exc_info ()[0]
print sys.exc_info ()[1]
# FIXME: This can happen because we don't have liveness information
return self.val.cast (gdb.lookup_type ("guint64"))
@@ -152,9 +151,9 @@ class MonoMethodPrinter:
val = self.val.dereference ()
klass = val ["klass"].dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
return "\"%s:%s ()\"".format (class_name, val ["name"].string ())
return "\"%s:%s ()\"" % (class_name, val ["name"].string ())
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_method_full_name (%s, 1)".format (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
#return "\"%s\"" % (gdb.parse_and_eval ("mono_method_full_name (%s, 1)" % (str (int (self.val.cast (gdb.lookup_type ("guint64")))))).string ())
class MonoClassPrinter:
"Print a MonoClass structure"
@@ -167,21 +166,19 @@ class MonoClassPrinter:
return "0x0"
klass = self.val.dereference ()
class_name = stringify_class_name (klass ["name_space"].string (), klass ["name"].string ())
if klass ["generic_class"].cast (gdb.lookup_type ("guint64")) != 0:
class_name = "%s<%s>".format (class_name, str (klass ["generic_class"]["context"]["class_inst"]))
if add_quotes:
return "\"%s\"".format (class_name)
return "\"%s\"" % (class_name)
else:
return class_name
# This returns more info but requires calling into the inferior
#return "\"%s\"".format (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)".format (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
#return "\"%s\"" % (gdb.parse_and_eval ("mono_type_full_name (&((MonoClass*)%s)->byval_arg)" % (str (int ((self.val).cast (gdb.lookup_type ("guint64")))))))
def to_string(self):
try:
return self.to_string_inner (True)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
#print sys.exc_info ()[0]
#print sys.exc_info ()[1]
return str(self.val.cast (gdb.lookup_type ("gpointer")))
class MonoGenericInstPrinter:
@@ -191,14 +188,12 @@ class MonoGenericInstPrinter:
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "0x0"
inst = self.val.dereference ()
inst_len = inst ["type_argc"]
inst_args = inst ["type_argv"]
inst_str = ""
for i in range(0, inst_len):
print (inst_args)
print inst_args
type_printer = MonoTypePrinter (inst_args [i])
if i > 0:
inst_str = inst_str + ", "
@@ -222,14 +217,14 @@ class MonoGenericClassPrinter:
method_inst_str = ""
if int(method_inst.cast (gdb.lookup_type ("guint64"))) != 0:
method_inst_str = str(method_inst)
return "%s, [%s], [%s]>".format (container_str, class_inst_str, method_inst_str)
return "%s, [%s], [%s]>" % (container_str, class_inst_str, method_inst_str)
def to_string(self):
try:
return self.to_string_inner ()
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
#print sys.exc_info ()[0]
#print sys.exc_info ()[1]
return str(self.val.cast (gdb.lookup_type ("gpointer")))
class MonoTypePrinter:
@@ -252,12 +247,12 @@ class MonoTypePrinter:
info = str(t ["data"]["generic_class"])
if info != "":
return "{%s, %s}".format (kind, info)
return "{%s, %s}" % (kind, info)
else:
return "{%s}".format (kind)
return "{%s}" % (kind)
except:
#print (sys.exc_info ()[0])
#print (sys.exc_info ()[1])
#print sys.exc_info ()[0]
#print sys.exc_info ()[1]
return str(self.val.cast (gdb.lookup_type ("gpointer")))
def to_string(self):
@@ -278,27 +273,12 @@ class MonoMethodRgctxPrinter:
inst_args = inst ["type_argv"]
inst_str = ""
for i in range(0, inst_len):
print (inst_args)
print inst_args
type_printer = MonoTypePrinter (inst_args [i])
if i > 0:
inst_str = inst_str + ", "
inst_str = inst_str + type_printer.to_string ()
return "MRGCTX[%s, [%s]]".format (klass_printer.to_string(), inst_str)
class MonoVTablePrinter:
"Print a MonoVTable structure"
def __init__(self, val):
self.val = val
def to_string(self):
if int(self.val.cast (gdb.lookup_type ("guint64"))) == 0:
return "0x0"
vtable = self.val.dereference ()
klass = vtable ["klass"]
klass_printer = MonoClassPrinter (klass)
return "vtable(%s)".format (klass_printer.to_string ())
return "MRGCTX[%s, [%s]]" % (klass_printer.to_string(), inst_str)
def lookup_pretty_printer(val):
t = str (val.type)
@@ -322,8 +302,6 @@ def lookup_pretty_printer(val):
return MonoGenericClassPrinter (val)
if t == "MonoMethodRuntimeGenericContext *":
return MonoMethodRgctxPrinter (val)
if t == "MonoVTable *":
return MonoVTablePrinter (val)
return None
def register_csharp_printers(obj):
@@ -349,6 +327,6 @@ XdbCommand ()
gdb.execute ("set environment MONO_XDEBUG gdb")
print ("Mono support loaded.")
print "Mono support loaded."
+2 -2
View File
@@ -3,8 +3,8 @@
import sys
gdb.execute ("file %s".format (sys.argv [0]))
gdb.execute ("r --break *:* %s".format (" ".join (sys.argv [1:len (sys.argv)])))
gdb.execute ("file %s" % sys.argv [0])
gdb.execute ("r --break *:* %s" % " ".join (sys.argv[1:len(sys.argv)]))
while True:
try:
+9 -51
View File
@@ -102,35 +102,15 @@ Global locks:
Adding global locks is not to be taken lightly.
The current lock hierarchy:
loader lock (global)
domain lock (complex)
domain jit lock (complex)
marshal lock
loader lock
domain lock
domain jit lock
simple locks
Examples:
You can take the loader lock without holding a domain lock.
You can take the domain load while holding the loader lock
You cannot take the loader lock if only the domain lock is held.
You cannot take a domain lock if the loader lock is held.
You cannot take a domain lock while holding the lock to another domain.
TODO:
We have a few known ok violation. We need a way to whitelist them.
Known ok issues:
ERROR: tried to acquire lock DomainLock at mono_domain_code_reserve_align while holding DomainLock at mono_class_create_runtime_vtable: Hierarchy violation.
This is triggered when building the vtable of a non-root domain and fetching a vtable trampoline for an offset that has not been built. We'll take the root
domain lock while holding the other one.
This is ok since we never allow locking to have in the other direction, IOW, the root-domain lock is one level down from the other domain-locks.
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_class_from_name
WARNING: tried to acquire lock ImageDataLock at mono_image_init_name_cache while holding ImageDataLock at mono_image_add_to_name_cache
Both of those happen when filling up the name_cache, as it needs to alloc image memory.
This one is fixable by spliting mono_image_init_name_cache into a locked and an unlocked variants and calling them appropriatedly.
*/
public enum Lock {
@@ -140,9 +120,6 @@ public enum Lock {
DomainLock,
DomainAssembliesLock,
DomainJitCodeHashLock,
IcallLock,
AssemblyBindingLock,
MarshalLock,
}
public class SimLock
@@ -162,7 +139,6 @@ public class SimLock
case Lock.DomainLock:
return 1;
case Lock.DomainJitCodeHashLock:
case Lock.MarshalLock:
return 2;
default:
return 3;
@@ -181,10 +157,6 @@ public class SimLock
get { return kind == Lock.LoaderLock; }
}
public bool IsResursiveLock {
get { return kind == Lock.LoaderLock || kind == Lock.DomainLock; }
}
/*locked is already owned by the thread, 'this' is the new one*/
bool Compare (SimThread thread, SimLock locked, out bool isWarning, out string msg)
{
@@ -304,11 +276,6 @@ public class Trace {
"mono_loader_unlock",
"mono_image_lock",
"mono_image_unlock",
"mono_icall_lock",
"mono_icall_unlock",
"add_record",
"mono_locks_lock_acquired",
"mono_locks_lock_released",
};
public Trace (string[] fields) {
@@ -359,10 +326,6 @@ public class Symbol : IComparable<Symbol>
public int CompareTo(Symbol other) {
return offset - other.offset;
}
public void AdjustSize (Symbol next) {
size = next.offset - this.offset;
}
}
public interface SymbolTable {
@@ -389,26 +352,21 @@ public class OsxSymbolTable : SymbolTable
string line;
while ((line = proc.StandardOutput.ReadLine ()) != null) {
string[] fields = line.Split(new char[] {' ', '\t'}, StringSplitOptions.RemoveEmptyEntries);
if (fields.Length < 7)
if (fields.Length < 4)
continue;
if (!fields [3].Equals ("FUN"))
if (!(fields [1].Equals ("g") || fields [1].Equals ("d")))
continue;
if (!fields [2].Equals ("*UND*"))
continue;
int offset = fields [0].ParseHex ();
string name = fields [6];
if (name.StartsWith ("_"))
name = name.Substring (1);
string name = fields [3];
if (offset != 0)
list.Add (new Symbol (offset, 0, name));
}
table = new Symbol [list.Count];
list.CopyTo (table, 0);
Array.Sort (table);
for (int i = 1; i < table.Length; ++i) {
table [i - 1].AdjustSize (table [i]);
}
}
public string Translate (int offset) {
+1 -1
View File
@@ -6,4 +6,4 @@ includedir=${prefix}/include
Name: Mono.Cairo
Description: Cairo bindings for Mono
Version: @VERSION@
Libs: -r:Mono.Cairo
Libs: -r:${prefix}/lib/mono/2.0/Mono.Cairo.dll
+1 -1
View File
@@ -4,4 +4,4 @@ Sources=${assemblies_dir}/Options.cs
Name: Mono.Options
Description: Command Line Parsing Library
Version: 0.2.3
Version: 0.2.2
-59
View File
@@ -18,65 +18,6 @@ provider mono {
/* Garbage Collector (GC) */
probe gc__begin (int generation);
probe gc__end (int generation);
probe gc__requested (int generation, uintptr_t requested_size, int wait_to_finish);
probe gc__checkpoint__1 (int generation);
probe gc__checkpoint__2 (int generation);
probe gc__checkpoint__3 (int generation);
probe gc__checkpoint__4 (int generation);
probe gc__checkpoint__5 (int generation);
probe gc__checkpoint__6 (int generation);
probe gc__checkpoint__7 (int generation);
probe gc__checkpoint__8 (int generation);
probe gc__checkpoint__9 (int generation);
probe gc__concurrent__start__begin (int generation);
probe gc__concurrent__start__end (int generation, long long num_major_objects_marked);
probe gc__concurrent__update__finish__begin (int generation, long long num_major_objects_marked);
probe gc__concurrent__update__end (int generation, long long num_major_objects_marked);
probe gc__concurrent__finish__end (int generation, long long num_major_objects_marked);
probe gc__sweep__begin (int generation, int full_sweep);
probe gc__sweep__end (int generation, int full_sweep);
probe gc__world__stop__begin ();
probe gc__world__stop__end ();
probe gc__world__restart__begin (int generation);
probe gc__world__restart__end (int generation);
probe gc__heap__alloc (uintptr_t addr, uintptr_t len);
probe gc__heap__free (uintptr_t addr, uintptr_t len);
probe gc__locked ();
probe gc__unlocked ();
probe gc__nursery__tlab__alloc (uintptr_t addr, uintptr_t len);
probe gc__nursery__obj__alloc (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__large (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__pinned (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__degraded (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__major__obj__alloc__mature (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
/* Can be nursery->nursery, nursery->major or major->major */
probe gc__obj__moved (uintptr_t dest, uintptr_t src, int dest_gen, int src_gen, uintptr_t size, char *ns_name, char *class_name);
probe gc__nursery__swept (uintptr_t addr, uintptr_t len);
probe gc__major__swept (uintptr_t addr, uintptr_t len);
probe gc__obj__pinned (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name, int generation);
probe gc__finalize__enqueue (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name, int generation, int is_critical);
probe gc__finalize__invoke (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__weak__update (uintptr_t ref_addr, uintptr_t old_addr, uintptr_t new_addr, uintptr_t size, char *ns_name, char *class_name, int track);
probe gc__global__remset__add (uintptr_t ref_addr, uintptr_t obj_addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__obj__cemented (uintptr_t addr, uintptr_t size, char *ns_name, char *class_name);
probe gc__internal__alloc (uintptr_t addr, uintptr_t size, int type);
probe gc__internal__dealloc (uintptr_t add, uintptr_t size, int type);
};
#pragma D attributes Evolving/Evolving/Common provider mono provider
-4
View File
@@ -214,16 +214,12 @@
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</cryptoNameMapping>
<oidMap>
<oidEntry OID="1.2.840.113549.2.2" name="MD2" />
<oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
File renamed without changes.
File renamed without changes.
File renamed without changes.
+2 -2
View File
@@ -1,6 +1,6 @@
monodir = $(sysconfdir)/mono/2.0/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
EXTRA_DIST = Compat.browser
mono_DATA = ../../Browsers/Compat.browser
mono_DATA = Compat.browser
-4
View File
@@ -197,16 +197,12 @@
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</cryptoNameMapping>
<oidMap>
<oidEntry OID="1.2.840.113549.2.2" name="MD2" />
<oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -1,6 +0,0 @@
monodir = $(sysconfdir)/mono/4.0/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
mono_DATA = ../../Browsers/Compat.browser
+1 -1
View File
@@ -1,4 +1,4 @@
SUBDIRS = Browsers
SUBDIRS =
monodir = $(sysconfdir)/mono/4.0
-4
View File
@@ -214,16 +214,12 @@
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</cryptoNameMapping>
<oidMap>
<oidEntry OID="1.2.840.113549.2.2" name="MD2" />
<oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-2
View File
@@ -1,2 +0,0 @@
/Makefile
/Makefile.in
-6
View File
@@ -1,6 +0,0 @@
monodir = $(sysconfdir)/mono/4.5/Browsers
EXTRA_DIST = ../../Browsers/Compat.browser
mono_DATA = ../../Browsers/Compat.browser
File diff suppressed because it is too large. Load diff
-13
View File
@@ -1,13 +0,0 @@
SUBDIRS = Browsers
monodir = $(sysconfdir)/mono/4.5
EXTRA_DIST = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx \
settings.map
mono_DATA = machine.config \
web.config \
DefaultWsdlHelpGenerator.aspx \
settings.map
-310
View File
@@ -1,310 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="configProtectedData" type="System.Configuration.ProtectedConfigurationSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="appSettings" type="System.Configuration.AppSettingsSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="connectionStrings" type="System.Configuration.ConnectionStringsSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="mscorlib" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<section name="runtime" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false"/>
<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.DiagnosticsConfigurationHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="system.windows.forms" type="System.Windows.Forms.WindowsFormsSection, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="windows" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowLocation="false" />
<section name="strongNames" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<sectionGroup name="system.web" type="System.Web.Configuration.SystemWebSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="anonymousIdentification" type="System.Web.Configuration.AnonymousIdentificationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authentication" type="System.Web.Configuration.AuthenticationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="authorization" type="System.Web.Configuration.AuthorizationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="browserCaps" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="clientTarget" type="System.Web.Configuration.ClientTargetSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="compilation" type="System.Web.Configuration.CompilationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="customErrors" type="System.Web.Configuration.CustomErrorsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="deployment" type="System.Web.Configuration.DeploymentSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineOnly" />
<section name="globalization" type="System.Web.Configuration.GlobalizationSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="healthMonitoring" type="System.Web.Configuration.HealthMonitoringSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="hostingEnvironment" type="System.Web.Configuration.HostingEnvironmentSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication" />
<section name="httpCookies" type="System.Web.Configuration.HttpCookiesSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpHandlers" type="System.Web.Configuration.HttpHandlersSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpModules" type="System.Web.Configuration.HttpModulesSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpRuntime" type="System.Web.Configuration.HttpRuntimeSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="identity" type="System.Web.Configuration.IdentitySection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="machineKey" type="System.Web.Configuration.MachineKeySection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="membership" type="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="mobileControls" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="deviceFilters" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="pages" type="System.Web.Configuration.PagesSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="processModel" type="System.Web.Configuration.ProcessModelSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineOnly" allowLocation="false" />
<section name="profile" type="System.Web.Configuration.ProfileSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="roleManager" type="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="securityPolicy" type="System.Web.Configuration.SecurityPolicySection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication" />
<section name="sessionPageState" type="System.Web.Configuration.SessionPageStateSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="sessionState" type="System.Web.Configuration.SessionStateSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="siteMap" type="System.Web.Configuration.SiteMapSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="trace" type="System.Web.Configuration.TraceSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="trust" type="System.Web.Configuration.TrustSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication" />
<section name="urlMappings" type="System.Web.Configuration.UrlMappingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="webControls" type="System.Web.Configuration.WebControlsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="webParts" type="System.Web.Configuration.WebPartsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="webServices" type="System.Web.Services.Configuration.WebServicesSection, System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="xhtmlConformance" type="System.Web.Configuration.XhtmlConformanceSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<sectionGroup name="caching" type="System.Web.Configuration.SystemWebCachingSectionGroup, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="cache" type="System.Web.Configuration.CacheSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="outputCache" type="System.Web.Configuration.OutputCacheSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="outputCacheSettings" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="sqlCacheDependency" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
<section name="monoSettings" type="System.Web.Configuration.MonoSettingsSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</sectionGroup>
<sectionGroup name="system.web.extensions" type="System.Web.Configuration.SystemWebExtensionsSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<sectionGroup name="scripting" type="System.Web.Configuration.ScriptingSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<section name="scriptResourceHandler" type="System.Web.Configuration.ScriptingScriptResourceHandlerSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<sectionGroup name="webServices" type="System.Web.Configuration.ScriptingWebServicesSectionGroup, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35">
<section name="jsonSerialization" type="System.Web.Configuration.ScriptingJsonSerializationSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="Everywhere"/>
<section name="profileService" type="System.Web.Configuration.ScriptingProfileServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<section name="authenticationService" type="System.Web.Configuration.ScriptingAuthenticationServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
<section name="roleService" type="System.Web.Configuration.ScriptingRoleServiceSection, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" requirePermission="false" allowDefinition="MachineToApplication"/>
</sectionGroup>
</sectionGroup>
</sectionGroup>
<sectionGroup name="system.net" type="System.Net.Configuration.NetSectionGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="authenticationModules" type="System.Net.Configuration.AuthenticationModulesSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="connectionManagement" type="System.Net.Configuration.ConnectionManagementSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="defaultProxy" type="System.Net.Configuration.DefaultProxySection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<sectionGroup name="mailSettings" type="System.Net.Configuration.MailSettingsSectionGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="smtp" type="System.Net.Configuration.SmtpSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="requestCaching" type="System.Net.Configuration.RequestCachingSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="settings" type="System.Net.Configuration.SettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="webRequestModules" type="System.Net.Configuration.WebRequestModulesSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="system.drawing" type="System.Configuration.NameValueSectionHandler, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<sectionGroup name="system.serviceModel" type="System.ServiceModel.Configuration.ServiceModelSectionGroup, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="behaviors" type="System.ServiceModel.Configuration.BehaviorsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="bindings" type="System.ServiceModel.Configuration.BindingsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="client" type="System.ServiceModel.Configuration.ClientSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="commonBehaviors" type="System.ServiceModel.Configuration.CommonBehaviorsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="diagnostics" type="System.ServiceModel.Configuration.DiagnosticSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="extensions" type="System.ServiceModel.Configuration.ExtensionsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="serviceHostingEnvironment" type="System.ServiceModel.Configuration.ServiceHostingEnvironmentSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="services" type="System.ServiceModel.Configuration.ServicesSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="standardEndpoints" type="System.ServiceModel.Configuration.StandardEndpointsSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<section name="routing" type="System.ServiceModel.Routing.Configuration.RoutingSection, System.ServiceModel.Routing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<section name="protocolMapping" type="System.ServiceModel.Configuration.ProtocolMappingSection, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
</sectionGroup>
<sectionGroup name="system.transactions" type="System.Transactions.Configuration.TransactionsSectionGroup, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null">
<section name="defaultSettings" type="System.Transactions.Configuration.DefaultSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null"/>
<section name="machineSettings" type="System.Transactions.Configuration.MachineSettingsSection, System.Transactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, Custom=null" allowDefinition="MachineOnly" allowExeDefinition="MachineOnly"/>
</sectionGroup>
<section name="system.webServer" type="System.Configuration.IgnoreSection, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="uri" type="System.Configuration.UriSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<sectionGroup name="system.runtime.caching" type="System.Runtime.Caching.Configuration.CachingSectionGroup, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<section name="memoryCache" type="System.Runtime.Caching.Configuration.MemoryCacheSection, System.Runtime.Caching, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
</configSections>
<connectionStrings>
<add name="LocalSqlServer" connectionString="data source=.\SQLEXPRESS;Integrated Security=SSPI;AttachDBFilename=|DataDirectory|aspnetdb.mdf;User Instance=true" providerName="System.Data.SqlClient"/>
<add name="LocalSqliteServer" connectionString="Data Source=|DataDirectory|/aspnetdb.sqlite;version=3" providerName="Mono.Data.Sqlite"/>
</connectionStrings>
<configProtectedData defaultProvider="RsaProtectedConfigurationProvider">
<providers>
<add name="RsaProtectedConfigurationProvider" type="System.Configuration.RsaProtectedConfigurationProvider, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
description="" keyContainerName="MonoFrameworkConfigurationKey" cspProviderName="" useMachineContainer="true" useOAEP="false" />
<add name="DataProtectionConfigurationProvider" type="System.Configuration.DpapiProtectedConfigurationProvider, System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
description="" useMachineProtection="true" keyEntropy="" />
</providers>
</configProtectedData>
<system.net>
<authenticationModules>
<add type="System.Net.BasicClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.DigestClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.NtlmClient, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</authenticationModules>
<webRequestModules>
<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.FtpRequestCreator, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</webRequestModules>
<settings>
<ipv6 enabled="false"/>
</settings>
</system.net>
<system.runtime.remoting>
<application>
<channels>
<channel ref="http client" displayName="http client (delay loaded)" delayLoadAsClientChannel="true" />
<channel ref="tcp client" displayName="tcp client (delay loaded)" delayLoadAsClientChannel="true" />
<channel ref="ipc client" displayName="ipc client (delay loaded)" delayLoadAsClientChannel="true" />
</channels>
</application>
<channels>
<channel id="http" type="System.Runtime.Remoting.Channels.Http.HttpChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http client" type="System.Runtime.Remoting.Channels.Http.HttpClientChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http server" type="System.Runtime.Remoting.Channels.Http.HttpServerChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp" type="System.Runtime.Remoting.Channels.Tcp.TcpChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp client" type="System.Runtime.Remoting.Channels.Tcp.TcpClientChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp server" type="System.Runtime.Remoting.Channels.Tcp.TcpServerChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="ipc" type="System.Runtime.Remoting.Channels.Ipc.IpcChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="ipc client" type="System.Runtime.Remoting.Channels.Ipc.IpcClientChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="ipc server" type="System.Runtime.Remoting.Channels.Ipc.IpcServerChannel, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</channels>
<channelSinkProviders>
<clientProviders>
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapClientFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryClientFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</clientProviders>
<serverProviders>
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapServerFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryServerFormatterSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<provider id="wsdl" type="System.Runtime.Remoting.MetadataServices.SdlChannelSinkProvider, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</serverProviders>
</channelSinkProviders>
</system.runtime.remoting>
<appSettings>
<!--<add key="yourkey" value="your value" /> -->
<!--<remove key="a key defined higher in the hierarchy" /> -->
<!--<clear/> Removes all defined settings -->
</appSettings>
<system.diagnostics>
<trace autoflush="false" indentsize="4" />
</system.diagnostics>
<system.drawing>
</system.drawing>
<system.data>
<DbProviderFactories>
<add name="Mono Sqlite Data Provider" invariant="Mono.Data.SqliteClient"
description="Mono Framework Data Provider for SQLite (old version)"
type="Mono.Data.SqliteClient.SqliteFactory, Mono.Data.SqliteClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
<add name="Mono Sqlite Provider" invariant="Mono.Data.Sqlite"
description="Mono Framework Data Provider for SQLite (new version)"
type="Mono.Data.Sqlite.SqliteFactory, Mono.Data.Sqlite, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
<add name="Odbc Data Provider" invariant="System.Data.Odbc"
description=".Net Framework Data Provider for Odbc"
type="System.Data.Odbc.OdbcFactory, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="OleDb Data Provider" invariant="System.Data.OleDb"
description=".Net Framework Data Provider for OleDb"
type="System.Data.OleDb.OleDbFactory, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="OracleClient Data Provider" invariant="System.Data.OracleClient"
description=".Net Framework Data Provider for Oracle"
type="System.Data.OracleClient.OracleClientFactory, System.Data.OracleClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="SqlClient Data Provider" invariant="System.Data.SqlClient"
description=".Net Framework Data Provider for SqlServer"
type="System.Data.SqlClient.SqlClientFactory, System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/>
<add name="Sybase Data Provider" invariant="Mono.Data.SybaseClient"
description=".Net Framework Data Provider for Sybase"
type="Mono.Data.SybaseClient.SybaseClientFactory, Mono.Data.SybaseClient, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
</DbProviderFactories>
</system.data>
<mscorlib>
<cryptographySettings>
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD4="Mono.Security.Cryptography.MD4Managed, Mono.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
<nameEntry name="MD4" class="monoMD4" />
</cryptoNameMapping>
<oidMap>
<oidEntry OID="1.2.840.113549.2.2" name="MD2" />
<oidEntry OID="1.2.840.113549.2.2" name="Mono.Security.Cryptography.MD2Managed" />
<oidEntry OID="1.2.840.113549.2.4" name="MD4" />
<oidEntry OID="1.2.840.113549.2.4" name="Mono.Security.Cryptography.MD4Managed" />
</oidMap>
</cryptographySettings>
</mscorlib>
<strongNames>
<pubTokenMapping>
<!-- ECMA key -->
<map Token="b77a5c561934e089" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Microsoft (final) key -->
<map Token="b03f5f7f11d50a3a" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Microsoft (Web Service Enhancement) key -->
<map Token="31bf3856ad364e35" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- IBM (DB2 Data Provider) key -->
<map Token="7c307b91aa13d208" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- Silverlight 2.0 key -->
<map Token="7cec85d7bea7798e" PublicKey="002400000480000094000000060200000024000052534131000400000100010079159977d2d03a8e6bea7a2e74e8d1afcc93e8851974952bb480a12c9134474d04062447c37e0e68c080536fcf3c3fbe2ff9c979ce998475e506e8ce82dd5b0f350dc10e93bf2eeecf874b24770c5081dbea7447fddafa277b22de47d6ffea449674a4f9fccf84d15069089380284dbdd35f46cdff12a1bd78e4ef0065d016df" />
<!-- XNA Framework key -->
<map Token="6d5c3888ef60e27d" PublicKey="0024000004800000940000000602000000240000525341310004000001000100f9a2641bac9847900d92a33d652ccc4e8b529360f908e7af53e57008b2a9a1938c32a160d47f795a23590557608d2c8d0c0e8846a052d070f9298281b8185343dbe5b479bd52de256f73c2a943e1a8a42065b5c918622dc14b1c0151dbd94d9a4543e7cd03e536b1b1d2d6d99af535d227ab9bdac76af9312a21d457bdf817e6" />
</pubTokenMapping>
</strongNames>
<system.web>
<webServices>
<protocols>
<add name="HttpSoap"/>
<add name="HttpSoap12"/>
<add name="HttpPost"/>
<add name="HttpGet"/>
<add name="Documentation"/>
</protocols>
<conformanceWarnings>
<add name="BasicProfile1_1"/>
</conformanceWarnings>
<wsdlHelpGenerator href="DefaultWsdlHelpGenerator.aspx" />
</webServices>
<membership>
<providers>
<add name="AspNetSqlMembershipProvider" type="System.Web.Security.SqlMembershipProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" connectionStringName="LocalSqlServer" enablePasswordRetrieval="false" enablePasswordReset="true" requiresQuestionAndAnswer="true" applicationName="/" requiresUniqueEmail="false" passwordFormat="Hashed" maxInvalidPasswordAttempts="5" minRequiredPasswordLength="7" minRequiredNonalphanumericCharacters="1" passwordAttemptWindow="10" passwordStrengthRegularExpression=""/>
<!-- <add name="AspNetSqlMembershipProvider" type="Mainsoft.Web.Security.GenericMembershipProvider, Mainsoft.Web.Security" applicationName="/" connectionStringName="LocalSqlServer" /> -->
</providers>
</membership>
<roleManager>
<providers>
<add name="AspNetSqlRoleProvider" type="System.Web.Security.SqlRoleProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" applicationName="/" connectionStringName="LocalSqlServer" />
<!-- <add name="AspNetSqlRoleProvider" type="Mainsoft.Web.Security.GenericRoleProvider, Mainsoft.Web.Security" applicationName="/" connectionStringName="LocalSqlServer" /> -->
</providers>
</roleManager>
<profile>
<providers>
<add name="AspNetSqlProfileProvider" connectionStringName="LocalSqlServer" applicationName="/" type="System.Web.Profile.SqlProfileProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</providers>
</profile>
</system.web>
<system.serviceModel>
<extensions>
<behaviorExtensions>
<add name="enableWebScript" type="System.ServiceModel.Configuration.WebScriptEnablingElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webHttp" type="System.ServiceModel.Configuration.WebHttpElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</behaviorExtensions>
<bindingElementExtensions>
<add name="webMessageEncoding" type="System.ServiceModel.Configuration.WebMessageEncodingElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</bindingElementExtensions>
<bindingExtensions>
<add name="webHttpBinding" type="System.ServiceModel.Configuration.WebHttpBindingCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</bindingExtensions>
<endpointExtensions>
<add name="dynamicEndpoint" type="System.ServiceModel.Discovery.Configuration.DynamicEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="discoveryEndpoint" type="System.ServiceModel.Discovery.Configuration.DiscoveryEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="udpDiscoveryEndpoint" type="System.ServiceModel.Discovery.Configuration.UdpDiscoveryEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="announcementEndpoint" type="System.ServiceModel.Discovery.Configuration.AnnouncementEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="udpAnnouncementEndpoint" type="System.ServiceModel.Discovery.Configuration.UdpAnnouncementEndpointCollectionElement, System.ServiceModel.Discovery, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webHttpEndpoint" type="System.ServiceModel.Configuration.WebHttpEndpointCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add name="webScriptEndpoint" type="System.ServiceModel.Configuration.WebScriptEndpointCollectionElement, System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</endpointExtensions>
</extensions>
</system.serviceModel>
</configuration>
-48
View File
@@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8" ?>
<settingsMap>
<map sectionType="System.Web.Configuration.MembershipSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.MembershipSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
any expression understood by the mapper to designate the section region to modify.
-->
<what value="providers">
<!-- 'what' can contain any number of occurrences of any three elements:
replace - replace the designated region
add - add a new entry to the region
clear - clear the region
remove - remove the designatedregion
The attributes to any of the above are freeform and are not processed by the mapper manager. They are stored verbatim for the
mapper to peruse.
-->
<replace name="AspNetSqlMembershipProvider"
type="System.Web.Security.SqliteMembershipProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
connectionStringName="LocalSqliteServer" />
</what>
</map>
<map sectionType="System.Web.Configuration.RoleManagerSection, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
mapperType="Mono.Web.Util.RoleManagerSectionMapper, Mono.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"
platform="Unix">
<!-- The 'what' tag specifies which region of the section to modify. The 'value' attribute value is mapper-specific and is not defined here. It can be
any expression understood by the mapper to designate the section region to modify.
-->
<what value="providers">
<!-- 'what' can contain any number of occurrences of any three elements:
replace - replace the designated region
add - add a new entry to the region
clear - clear the region
remove - remove the designatedregion
The attributes to any of the above are freeform and are not processed by the mapper manager. They are stored verbatim for the
mapper to peruse.
-->
<replace name="AspNetSqlRoleProvider"
type="System.Web.Security.SqliteRoleProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
connectionStringName="LocalSqliteServer" />
</what>
</map>
</settingsMap>
-253
View File
@@ -1,253 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<system.codedom>
<compilers>
<compiler language="c#;cs;csharp" extension=".cs" warningLevel="4" type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" warningLevel="4" type="Microsoft.VisualBasic.VBCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<providerOption name="CompilerVersion" value="v4.0"/>
<providerOption name="OptionInfer" value="true"/>
<providerOption name="WarnAsError" value="false"/>
</compiler>
</compilers>
</system.codedom>
<system.web>
<monoSettings>
<compilersCompatibility>
<compiler language="c#;cs;csharp" extension=".cs" compilerOptions="/nowarn:0169"
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</compilersCompatibility>
</monoSettings>
<authorization>
<allow users="*" />
</authorization>
<httpHandlers>
<add path="trace.axd" verb="*" type="System.Web.Handlers.TraceHandler" validate="True" />
<add path="WebResource.axd" verb="GET" type="System.Web.Handlers.AssemblyResourceLoader" validate="True" />
<add verb="*" path="*_AppService.axd" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False" />
<add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
<add path="*.axd" verb="*" type="System.Web.HttpNotFoundHandler" validate="True" />
<add path="*.aspx" verb="*" type="System.Web.UI.PageHandlerFactory" validate="True" />
<add path="*.ashx" verb="*" type="System.Web.UI.SimpleHandlerFactory" validate="True" />
<add path="*.asmx" verb="*" type="System.Web.Script.Services.ScriptHandlerFactory, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False" />
<add path="*.rem" verb="*" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="False" />
<add path="*.soap" verb="*" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="False" />
<add path="*.asax" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ascx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.master" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.skin" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.browser" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sitemap" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.dll.config" verb="GET,HEAD" type="System.Web.StaticFileHandler" validate="True" />
<add path="*.exe.config" verb="GET,HEAD" type="System.Web.StaticFileHandler" validate="True" />
<add path="*.config" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.cs" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.csproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vbproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.webinfo" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.licx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.resx" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.resources" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.mdb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.vjsproj" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.java" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.jsl" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldb" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ad" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.dd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.cd" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.adprototype" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.lddprototype" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sdm" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.sdmDocument" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.mdf" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.ldf" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.exclude" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<add path="*.refresh" verb="*" type="System.Web.HttpForbiddenHandler" validate="True" />
<!--
<add path="*.svc" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
-->
<add verb="*" path="*.svc" type="System.ServiceModel.Channels.SvcHttpHandlerFactory, System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add path="*.rules" verb="*" type="System.Web.HttpForbiddenHandler" validate="True"/>
<!--
<add path="*.xoml" verb="*" type="System.ServiceModel.Activation.HttpHandler, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
<add path="*.xamlx" verb="*" type="System.Xaml.Hosting.XamlHttpHandlerFactory, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" validate="False"/>
-->
<add path="*" verb="GET,HEAD,POST" type="System.Web.DefaultHttpHandler" validate="True" />
<add path="*" verb="*" type="System.Web.HttpMethodNotAllowedHandler" validate="True" />
</httpHandlers>
<httpModules>
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule" />
<add name="Session" type="System.Web.SessionState.SessionStateModule" />
<!--
<add name="WindowsAuthentication" type="System.Web.Security.WindowsAuthenticationModule" />
-->
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule" />
<!--
<add name="PassportAuthentication" type="System.Web.Security.PassportAuthenticationModule" />
-->
<add name="RoleManager" type="System.Web.Security.RoleManagerModule" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule" />
<!--
<add name="FileAuthorization" type="System.Web.Security.FileAuthorizationModule" />
-->
<add name="AnonymousIdentification" type="System.Web.Security.AnonymousIdentificationModule" />
<add name="Profile" type="System.Web.Profile.ProfileModule" />
<!--
<add name="ErrorHandlerModule" type="System.Web.Mobile.ErrorHandlerModule, System.Web.Mobile, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="ServiceModel" type="System.ServiceModel.Activation.HttpModule, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
<add name="UrlRoutingModule-4.0" type="System.Web.Routing.UrlRoutingModule" />
<add name="ScriptModule-4.0" type="System.Web.Handlers.ScriptModule, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
</httpModules>
<authentication mode="Forms">
<forms name=".MONOAUTH" loginUrl="login.aspx" protection="All" timeout="30" path="/">
<credentials passwordFormat="Clear">
<!--<user name="gonzalo" password="gonz"/>-->
</credentials>
</forms>
</authentication>
<machineKey validationKey="AutoGenerate" decryptionKey="AutoGenerate" validation="SHA1" />
<globalization requestEncoding="utf-8"
responseEncoding="utf-8"
fileEncoding="utf-8"/>
<!--
culture="en-US"
uiculture="en-US" />
-->
<sessionState mode="InProc" />
<pages>
<namespaces>
<add namespace="System" />
<add namespace="System.Collections" />
<add namespace="System.Collections.Specialized" />
<add namespace="System.Configuration" />
<add namespace="System.Text" />
<add namespace="System.Text.RegularExpressions" />
<add namespace="System.Web" />
<add namespace="System.Web.Caching" />
<add namespace="System.Web.SessionState" />
<add namespace="System.Web.Security" />
<add namespace="System.Web.Profile" />
<add namespace="System.Web.UI" />
<add namespace="System.Web.UI.WebControls" />
<!-- <add namespace="System.Web.UI.WebControls.WebParts" /> -->
<add namespace="System.Web.UI.HtmlControls" />
</namespaces>
<controls>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.WebParts" assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add tagPrefix="asp" namespace="System.Web.UI" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls.Expressions" assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.DynamicData" assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add tagPrefix="asp" namespace="System.Web.UI.WebControls" assembly="System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</controls>
</pages>
<webControls clientScriptsLocation="/web_scripts" />
<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
<assemblies>
<!-- <add assembly="mscorlib" /> -->
<add assembly="Microsoft.CSharp, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Data, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Web.Services, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.Xml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add assembly="System.EnterpriseServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<!-- <add assembly="System.Web.Mobile, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> -->
<add assembly="System.IdentityModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Runtime.Serialization, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Xaml, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.ServiceModel, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<!-- <add assembly="System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.ServiceModel.Channels, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<add assembly="System.ServiceModel.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<!-- <add assembly="System.Activities, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.ServiceModel.Activities, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.WorkflowServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<!-- <add assembly="System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/> -->
<add assembly="System.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="System.Data.DataSetExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.Xml.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add assembly="System.ComponentModel.DataAnnotations, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add assembly="System.Web.DynamicData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<!-- <add assembly="System.Data.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -->
<!-- <add assembly="System.Web.Entity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"/> -->
<add assembly="System.Data.Linq, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<!-- <add assembly="System.Data.Entity.Design, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> -->
<add assembly="System.Web.ApplicationServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add assembly="*" /> <!-- Add assemblies in bin directory -->
</assemblies>
<expressionBuilders>
<add expressionPrefix="Resources"
type="System.Web.Compilation.ResourceExpressionBuilder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add expressionPrefix="ConnectionStrings"
type="System.Web.Compilation.ConnectionStringsExpressionBuilder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add expressionPrefix="AppSettings"
type="System.Web.Compilation.AppSettingsExpressionBuilder, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add expressionPrefix="RouteUrl" type="System.Web.Compilation.RouteUrlExpressionBuilder"/>
<!--
<add expressionPrefix="RouteValue" type="System.Web.Compilation.RouteValueExpressionBuilder"/>
-->
</expressionBuilders>
<buildProviders>
<add extension=".aspx" type="System.Web.Compilation.PageBuildProvider" />
<add extension=".ascx" type="System.Web.Compilation.UserControlBuildProvider" />
<add extension=".master" type="System.Web.Compilation.MasterPageBuildProvider" />
<add extension=".asmx" type="System.Web.Compilation.WebServiceBuildProvider" />
<add extension=".ashx" type="System.Web.Compilation.WebHandlerBuildProvider" />
<add extension=".soap" type="System.Web.Compilation.WebServiceBuildProvider" />
<add extension=".resx" type="System.Web.Compilation.ResXBuildProvider" />
<add extension=".resources" type="System.Web.Compilation.ResourcesBuildProvider" />
<add extension=".wsdl" type="System.Web.Compilation.WsdlBuildProvider" />
<add extension=".xsd" type="System.Web.Compilation.XsdBuildProvider" />
<add extension=".js" type="System.Web.Compilation.ForceCopyBuildProvider" />
<add extension=".lic" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<add extension=".licx" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<add extension=".exclude" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<add extension=".refresh" type="System.Web.Compilation.IgnoreFileBuildProvider" />
<!--
<add extension=".edmx" type="System.Data.Entity.Design.AspNet.EntityDesignerBuildProvider" />
<add extension=".xoml" type="System.ServiceModel.Activation.WorkflowServiceBuildProvider, System.WorkflowServices, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"/>
<add extension=".svc" type="System.ServiceModel.Activation.ServiceBuildProvider, System.ServiceModel.Activation, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
<add extension=".xamlx" type="System.Xaml.Hosting.XamlBuildProvider, System.Xaml.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" />
-->
</buildProviders>
</compilation>
<httpRuntime executionTimeout="110"
maxRequestLength="4096"
useFullyQualifiedRedirectUrl="false"
minFreeThreads="8"
minLocalRequestFreeThreads="4"
appRequestQueueLimit="5000" />
<clientTarget>
<add alias="ie5" userAgent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 4.0)" />
<add alias="ie4" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
<add alias="uplevel" userAgent="Mozilla/4.0 (compatible; MSIE 4.0; Windows NT 4.0)" />
<add alias="downlevel" userAgent="Unknown" />
</clientTarget>
<siteMap>
<providers>
<add name="AspNetXmlSiteMapProvider"
description="Default site map provider that reads in .sitemap xml files."
type="System.Web.XmlSiteMapProvider, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"
siteMapFile="Web.sitemap" />
</providers>
</siteMap>
</system.web>
</configuration>
-4
View File
@@ -1,4 +0,0 @@
Name: Reactive Extensions
Description: Reactive Extensions
Version: @VERSION@
Libs: -r:@prefix@/lib/mono/4.5/System.Reactive.Interfaces.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Core.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Linq.dll -r:@prefix@/lib/mono/4.5/System.Reactive.PlatformServices.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Providers.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Debugger.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Experimental.dll -r:@prefix@/lib/mono/4.5/System.Reactive.Runtime.Remoting.dll
-4
View File
@@ -1,4 +0,0 @@
Name: System.Web.Mvc3
Description: System.Web.Mvc - ASP.NET MVC v3
Version: 3.0.0.0
Libs: -r:@prefix@/lib/mono/gac/System.Web.Mvc/3.0.0.0__31bf3856ad364e35/System.Web.Mvc.dll
-7
View File
@@ -1,7 +0,0 @@
bindir=${pcfiledir}/../mono/xbuild/12.0/bin
Name: XBuild 12.0
Description: XBuild/MSBuild 12.0
Version: 12.0
Libs: -r:${bindir}/Microsoft.Build.Engine.dll -r:${bindir}/Microsoft.Build.Framework.dll -r:${bindir}/Microsoft.Build.Tasks.v12.0.dll -r:${bindir}/Microsoft.Build.Utilities.v12.0.dll -r:${bindir}/Microsoft.Build.dll
+26 -25
View File
@@ -73,40 +73,41 @@ dist-hook:
cp HtmlAgilityPack/* $(distdir)/HtmlAgilityPack
clean-local:
-rm -Rf html
-rm -f deploy/* convert.exe* AgilityPack.dll*
-rm -f $(ASSEMBLED_DOCS)
TOOL_MAKE=$(MAKE) -f $(srcdir)/docs.make topdir=$(srcdir)/../mcs srcdir=$(srcdir)
-rm -Rf $(srcdir)/html
-rm -f $(srcdir)/deploy/* $(srcdir)/convert.exe* $(srcdir)/AgilityPack.dll*
-cd $(srcdir) && rm -f $(ASSEMBLED_DOCS)
monoapi.zip: monoapi.tree
monoapi.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/toc.xml $(srcdir)/deploy/.stamp
-mkdir deploy
cp -f $(srcdir)/api-style.css deploy
$(TOOL_MAKE) $@
@test -f $@ || { rm -f $(srcdir)/monoapi.tree && $(MAKE) monoapi.tree; }
monoapi.tree: docs.make Makefile.am toc.xml $(srcdir)/deploy/.stamp perms
cd $(srcdir) && cp -f api-style.css deploy
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.zip: mono-tools.tree
@test -f $@ || { rm -f $(srcdir)/mono-tools.tree && $(MAKE) mono-tools.tree; }
mono-tools.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp perms
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-tools.tree: $(srcdir)/docs.make Makefile.am deploy/.stamp
$(TOOL_MAKE) $@
mono-file-formats.zip: mono-file-formats.tree perms
@test -f $@ || { rm -f $(srcdir)/mono-file-formats.tree && $(MAKE) mono-file-formats.tree; }
mono-file-formats.tree: docs.make Makefile.am $(srcdir)/deploy/.stamp
cd $(srcdir) && $(MAKE) -f docs.make topdir=$(mcs_topdir_from_srcdir) $@
mono-file-formats.zip: mono-file-formats.tree
mono-file-formats.tree: $(srcdir)/docs.make $(srcdir)/Makefile.am $(srcdir)/deploy/.stamp
$(TOOL_MAKE) $@
deploy/.stamp: convert.exe Makefile.am
$(mkdir_p) html
$(srcdir)/deploy/.stamp: convert.exe Makefile.am perms
$(mkdir_p) $(srcdir)/html
runtimedir=`cd ../runtime && pwd`; export runtimedir; \
MONO_PATH=../mcs/class/lib/net_2_0 perl $(srcdir)/exdoc -h $(srcdir) -t . $(srcdir)/../mono/*/*.c
cd $(srcdir) && MONO_PATH=$(mcs_topdir_from_srcdir)/class/lib/net_2_0 perl ./exdoc -h . ../mono/*/*.c
touch $@
extract: deploy/.stamp
extract: $(srcdir)/deploy/.stamp
convert.exe: convert.cs AgilityPack.dll
$(TOOL_MAKE) PROFILE=net_2_0 convert.exe
convert.exe: convert.cs AgilityPack.dll perms
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) convert.exe
AgilityPack.dll:
$(TOOL_MAKE) PROFILE=net_2_0 AgilityPack.dll
AgilityPack.dll: perms
cd $(srcdir) && $(MAKE) PROFILE=net_2_0 -f docs.make topdir=$(mcs_topdir_from_srcdir) AgilityPack.dll
.PHONY: perms
perms:
-@test -w $(srcdir) || chmod a+w $(srcdir)
-1
View File
@@ -307,7 +307,6 @@ mono_gc_out_of_memory
mono_gc_wbarrier_arrayref_copy
mono_gc_wbarrier_generic_nostore
mono_gc_wbarrier_generic_store
mono_gc_wbarrier_generic_store_atomic
mono_gc_wbarrier_object_copy
mono_gc_wbarrier_set_arrayref
mono_gc_wbarrier_set_field
+5 -13
View File
@@ -1,8 +1,3 @@
#
# This makefile is here because it uses the configuration from the
# in-place built mono to run and compile a few C# tools
#
thisdir = docs
SUBDIRS =
include $(topdir)/build/rules.make
@@ -12,28 +7,25 @@ ASSEMBLED_DOCS = \
mono-tools.tree mono-tools.zip \
monoapi.tree monoapi.zip
convert.exe: $(srcdir)/convert.cs AgilityPack.dll
convert.exe: convert.cs AgilityPack.dll
$(CSCOMPILE) -out:$@ $< -r:AgilityPack.dll
AgilityPack.dll:
$(CSCOMPILE) -target:library -out:$@ $(srcdir)/HtmlAgilityPack/*.cs
$(CSCOMPILE) -target:library -out:$@ HtmlAgilityPack/*.cs
monoapi.zip: monoapi.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
monoapi.tree: $(srcdir)/toc.xml $(srcdir)/docs.make
monoapi.tree: toc.xml docs.make
$(MDOC) assemble -o monoapi -f hb $<
mono-tools.zip: mono-tools.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
mono-tools.tree: $(srcdir)/mono-tools.config $(srcdir)/docs.make
mono-tools.tree: mono-tools.config docs.make
$(MDOC) assemble -o mono-tools -f man $<
mono-file-formats.zip: mono-file-formats.tree
@test -f $@ || { rm -f $< && $(MAKE) $<; }
mono-file-formats.tree: $(srcdir)/mono-file-formats.config $(srcdir)/docs.make
mono-file-formats.tree: mono-file-formats.config docs.make
$(MDOC) assemble -o mono-file-formats -f man $<
.doc-stamp:
+3 -9
View File
@@ -1,23 +1,17 @@
#!/usr/bin/perl
if ($ARGV[0] eq "-h"){
$sourcedir = $ARGV[1];
$dir = $sourcedir;
$dir = $ARGV[1];
$html = 1;
shift @ARGV;
shift @ARGV;
}
if ($ARGV[0] eq "-t"){
$dir = $ARGV[1];
shift @ARGV;
}
if ($html){
opendir (D, "$sourcedir/sources/") || die "Can not open $dir";
opendir (D, "$dir/sources/") || die "Can not open $dir";
while ($n = readdir (D)){
if ($n =~ /mono-api-.*\.html$/){
open (IN, "$sourcedir/sources/$n") || die "Can not open $n";
open (IN, "$dir/sources/$n") || die "Can not open $n";
$files[$filecount] = $n;
while (<IN>){
@files_content[$filecount] .= $_;
-347
View File
@@ -1,347 +0,0 @@
0359470b9f7a2fdaa75e4de12c9f83e78135034f refs/heads/master
f49164bf7658855390b2c19574b170f8728a99ff refs/heads/mono-2-10
f08f8a27bfe3aafda4e430ee2365dec73c1070d7 refs/heads/mono-2-6
746176a37123eda06ee6f9bd70736ac68a78e1aa refs/heads/winforms-clipboard-refactor
3215bf8472af3b66a836af6319bb9410fd84e2ff refs/remotes/origin/C5
0359470b9f7a2fdaa75e4de12c9f83e78135034f refs/remotes/origin/HEAD
773a66abc5e63cc1d2f111daeaa2848891dc8f61 refs/remotes/origin/INITIAL_IMPORT
06e3a751fc70f8b0bb0253dcc634e75b25d67fdc refs/remotes/origin/MCS_0_28
ea23d77f5d686ad196de315b7f251999f409fc8e refs/remotes/origin/MONO_0_28
3b7a7ac0ddf1a952d62a85fbbf7f9864b6de37b4 refs/remotes/origin/Mainsoft.System.Data
7f0542b133e5f1eee15f337e0263c14406091a7e refs/remotes/origin/NUNIT
4e4824afab6cd0f9f0d71aa6baeddb7bee74f8c4 refs/remotes/origin/SAVANNAH_CVS
0fae05ddc83ee034344d50a6d4d618cfb10ee491 refs/remotes/origin/XIMIAN
7e9c74197c9275e89a6c3afc1cfdccfe4f4b9395 refs/remotes/origin/anonymous-methods
b7f7d992745ac1ad98451de3165d9219c5f9f9d0 refs/remotes/origin/anonymous-methods2
a3f972be9e1edf4ec9ae836ad5a6cf35519ec180 refs/remotes/origin/atsushi-200810
2972ef664b391dbdfa612c3ebd0ff55b8b75b5c7 refs/remotes/origin/cecil
dd0a3a7dd70d9f146f968a3114a481f14b2ea1a6 refs/remotes/origin/commit-to-changelog-tests
701861382d1f81fe4ca6f549128e5af5120ad34d refs/remotes/origin/dick/ia64-hpux
ae8eba8d480b8690a915bef3e4899bb98d17b875 refs/remotes/origin/dick/io-layer-files-backend
28e70d66a6d3d24f061e0ba049a8817ead44aeca refs/remotes/origin/dick/io-layer-no-daemon
9229d3a283f618a6a7fdadcfb9a1e66743a6ba2a refs/remotes/origin/jb/cl
121b690b280781fef910972ad6b825ec831ef3b1 refs/remotes/origin/jb/ml2
677178627ed6c3332bff5221d5019b56c5802a17 refs/remotes/origin/jb/reflection-corcompare
a7c74b39baed3961bc814e3508345404c5e03370 refs/remotes/origin/mainsoft/JSF
55afaffae7d224f35eacc1d9d505e662c4223897 refs/remotes/origin/mainsoft/cust_1_2.2
ee61dcd58e7960416c976a18ae025bc4b80713fa refs/remotes/origin/mainsoft/gh1.7
5144d4fd99a7230e317dac4af6b1d2f61d2800d6 refs/remotes/origin/mainsoft/gh2.2
adbed2a2b57bde136348a6b7cd465613b041ce69 refs/remotes/origin/mainsoft/gh2.2_customer2
d03df42d2f13c7e8b3790ff9b3e17975ffdb91af refs/remotes/origin/mainsoft/gh2.2_customer3
f219e12da4b39adcf08432833f3cd06b0b1343e1 refs/remotes/origin/mainsoft/gh2.2_customer4
050c809c8f9f0fa0099b3d5dcaf982a4d0c9cd54 refs/remotes/origin/mainsoft/gh2.2_customer5
7db3f555234c98b481cc7f46f6eb929787885ce8 refs/remotes/origin/mainsoft/gh2.5_customer2
e6b84059b9c42f02c8ac4ef0db12cb7eb88b1884 refs/remotes/origin/mainsoft/gh20
70dbb8d4c74bb6796023abb7aa68fbc678eaeb80 refs/remotes/origin/mainsoft/gh20_Customer2
242fec48e07877683a58350f10922c0f0184589f refs/remotes/origin/mainsoft/gh20_mcs_Customer1
6a59dd91941bb7c7aa026bd25bfec81d6eb1a2c8 refs/remotes/origin/mainsoft/gh20preview
4bb9f1004787e4b52fe4fdb430a5f194ee634073 refs/remotes/origin/mainsoft/gh20preview2
230e23e4f318414c51301127543c01c2005c05e4 refs/remotes/origin/mainsoft/gh3.0preview1
e63e087e0e70925e5d48d0ead2fe65394e5c582d refs/remotes/origin/mainsoft/solutions_2_2
7af82877276c7b88a44deb0e6f2072c50aa28c17 refs/remotes/origin/martin/anonymous-methods2
ba3d2d20235322022f8e875849dab960bfc21b6d refs/remotes/origin/martin/debugger-kahalo
48d03791a1c8abe1d596d879031206d993a83315 refs/remotes/origin/martin/debugger-plophos
0359470b9f7a2fdaa75e4de12c9f83e78135034f refs/remotes/origin/master
41ca39c136de914adeb30deba27ecbb987e05350 refs/remotes/origin/messaging-2008
1429f06a9e3baf56245ec2433dcdb77e76eba684 refs/remotes/origin/mono-1-0
e1eb581e8a9100a929827524d1d2f91bd5685739 refs/remotes/origin/mono-1-0-6
c064f9f178339e54686526a3dd8bfd0ae7b64006 refs/remotes/origin/mono-1-1-10
b28e8eb77161f75a676f160365a860455db15476 refs/remotes/origin/mono-1-1-11
ad29bc9c3105aad5031a2ec84f3c468844e7b49d refs/remotes/origin/mono-1-1-12
a4c46a87cfcea02ab73579c998ed4e67e858b3cf refs/remotes/origin/mono-1-1-13
3f85c6d6d4c066363ae9d6e4de1ae80b954b84eb refs/remotes/origin/mono-1-1-13-8
6a546f60cfc03dc0e4ae09c4463a40f2d5acd8d0 refs/remotes/origin/mono-1-1-14
6e9f255eec4cbd8c53623d52fa26877db451bc34 refs/remotes/origin/mono-1-1-15
812f508c35b2a7247b93e59447afca83452ebc38 refs/remotes/origin/mono-1-1-16
e69a3c507851f27ff9d47d99944ee381fbd8da3e refs/remotes/origin/mono-1-1-17
9fbea2d56a024540d07b680e3eeec3310ba71f86 refs/remotes/origin/mono-1-1-18
b27152cb9d5942cbe886629f6f127fe6d1941930 refs/remotes/origin/mono-1-1-4
d305ee9a95945be36cd4517ef440ce99833068a0 refs/remotes/origin/mono-1-1-5
14db55bb39fee489de084d070ae611dd3503336d refs/remotes/origin/mono-1-1-6
939994df00fc3e1372b9dc1243e261e2f6c6c133 refs/remotes/origin/mono-1-1-7
d5fb27af2b9c68ac7bbada72c342e5b4f3072ebe refs/remotes/origin/mono-1-1-8
4f71550049b0d43f7ae41359e6f38ffa29e1f3b3 refs/remotes/origin/mono-1-1-9
0f9718c237af839c290a4c494a34d78190b99dd5 refs/remotes/origin/mono-1-2
3bb68f1bddf41c5c387e28bbd0dba65df0cca0d3 refs/remotes/origin/mono-1-2-1
c20551c1942db667672b36a07856467caace2d92 refs/remotes/origin/mono-1-2-2
e68e73c7efe7a4e28028d3c0a8c43842caf6dc21 refs/remotes/origin/mono-1-2-3
3c2f76b3001523ae712dcba5b2311a196eb9399d refs/remotes/origin/mono-1-2-4
8bb489774f42a734947859a1742ee5710efd9b49 refs/remotes/origin/mono-1-2-5
7376efd124405d50e11524bed7e91bbcb6bfc91a refs/remotes/origin/mono-1-2-6
bb0cde85b1f31230be337328ebd83d412f6b9c90 refs/remotes/origin/mono-1-9
c115636e0f354c3217920614182a3dfec4337541 refs/remotes/origin/mono-1-9-1-1
a1f3cf39287ceaca189ae1b4c06ad1677c8988cf refs/remotes/origin/mono-2-0
7a0052ae2fa0b9ff2c0dc7b6053e0e7d7630d477 refs/remotes/origin/mono-2-10
852c512d416efb6ed34493571ee87abab7f72890 refs/remotes/origin/mono-2-2
b68a5046d67794cd702518f471c6facdbb2f3a2c refs/remotes/origin/mono-2-4
d161692a50d0164906d5c0ad6ee38db141b6f7b0 refs/remotes/origin/mono-2-4-0
d4aeca63be0e9200f726545d4f8fcacd6a1e2b3f refs/remotes/origin/mono-2-4-1
7cf6ebe0e0dc6e38851a07eaac14062b9a236a19 refs/remotes/origin/mono-2-4-2
906d87f3ff47bf9d1deb9f4db57e3900bd8659ee refs/remotes/origin/mono-2-4-3
f08f8a27bfe3aafda4e430ee2365dec73c1070d7 refs/remotes/origin/mono-2-6
756688b2b8a4988117a2c68cfdba17142284e729 refs/remotes/origin/mono-2-6-4
34096b448e97ec780b3788de2b3185691bc0b9ad refs/remotes/origin/mono-2-6-7
64f045b98659b3552ae2b46b6e4e56fc9dad76e2 refs/remotes/origin/mono-2-8
c7c906d69ac9e360ce3e7d517258b8eea2b962b2 refs/remotes/origin/monotouch-1-0
62121afbb28f0b62f100ec9a942d10c5e0f4814f refs/remotes/origin/monotouch-2-0
97c6f8c4c8d592360ec365777aedb15604ec53ca refs/remotes/origin/moon-2-99-0-1
91b722f1d4b469c10c46fad3396a876c4414c87b refs/remotes/origin/moon-2-99-0-2
79e05e9d6f8eca93467f104aed4fc19733e909a7 refs/remotes/origin/moon-2-99-0-3
ddacacca00cb69f829abf9b0fd52fd6b4076d2c4 refs/remotes/origin/moon-2-99-0-4
4309c0d96184c1675aef708f26a2a058b69e5eb8 refs/remotes/origin/moon-2-99-0-5
60905d3baaa5b6ba9763c3c8b01701bb01853773 refs/remotes/origin/moon-2-99-0-6
851c48f04a8019811231bc9bd6984b0779932dcd refs/remotes/origin/moon-2-99-0-7
a36dc89129d65c4b72e9291d0fce46e0e418196c refs/remotes/origin/moon-2-99-0-8
8fa5360efd91bc9e0bdd9399f6bd484b5ecfd16a refs/remotes/origin/moon-3-99-0-1
32b3b31f74ec411d02efba37d58433ade9fa6d98 refs/remotes/origin/moon-3-99-0-2
fa856a85b50d6adbac6b5d26b32bc608887551bc refs/remotes/origin/moon/1.9.0
348617482b380275d7057e547e806c9be05bdb72 refs/remotes/origin/moon/1.9.1
0d47d8081c828d4b032564a88046a99d0284e6fd refs/remotes/origin/moon/1.9.2
50275053ad48a673500d72dccedab51e5230ad0b refs/remotes/origin/moon/1.9.3
bd19dacb396738bad75ecc8aafc1d8fc0fd6d5cd refs/remotes/origin/moon/1.9.4
f77c706aeb62483bd50e1199f52e1dadd9c520dd refs/remotes/origin/moon/1.9.5
3a5a3cf1d3fd027974b9f8281c6a9c7a22b75029 refs/remotes/origin/moon/1.9.6
ee08a4d041bdb88f49a027ce1a4f7736751a32d5 refs/remotes/origin/moon/1.99.1
c7bb5af6fcf8d1e380a8ec440c4b535c912713e0 refs/remotes/origin/moon/1.99.2
82b4a5cf1336da4f3234e85754a8780c57bb566b refs/remotes/origin/moon/1.99.3
f0a462d9db712ffcad80365561307c06e3acef3f refs/remotes/origin/moon/1.99.4
43dff9dcbf68f1ede9a467c24361a8056440c16a refs/remotes/origin/moon/1.99.5
d4674914b900cba323c2cde86e185b57553fa224 refs/remotes/origin/moon/1.99.6
51bca79c227343ce3a839c4739590406032546f6 refs/remotes/origin/moon/1.99.7
e0eee654e3532610107089762f6c73e923b71036 refs/remotes/origin/moon/1.99.8
ce62f727587b0467218a77829b30d530ca7fb524 refs/remotes/origin/moon/1.99.9
aaa43cdb8ab054b33c23ba2a16475d4108acc1f4 refs/remotes/origin/moon/moon-2-0
a56625169c0ebfd4bdfe0636b04cf3f5c5c1e057 refs/remotes/origin/mwf-handle-branch
0546b514ee0115d7e4bc08d479b952aaa59e0591 refs/remotes/origin/post-1-1-7-4-locking-exp
091a1627fdf10e7e3a12d59138bb4036711d6bdd refs/remotes/origin/post-1-1-8-locking-exp
348617482b380275d7057e547e806c9be05bdb72 refs/remotes/origin/rhowell/1.9.1
bd19dacb396738bad75ecc8aafc1d8fc0fd6d5cd refs/remotes/origin/rhowell/1.9.4
b73887c83da66d0ba9402c9cfe94936a938361a2 refs/remotes/origin/sportsmodel-branch
db39bf49379457cda6efb712dc6b9d9f007e5c9c refs/remotes/origin/vargaz/mini-linear-il
acb9e21b28520b966f30b8575d61ca7ed952134b refs/remotes/origin/vargaz/mini-xp-local-regalloc
6dc86808d6e4e1811ef8746afbd67c1eefca4b44 refs/remotes/origin/wii
2435a146a292e5cbd17d775260e69f9ffe5bd961 refs/stash
3f313cb9ecff29967ddff9bf78004f49816e804d refs/tags/1-0-5
8ee804b1c9cc92fd7bea45adb1270f3d5bbcbdf5 refs/tags/1-1-3
2fb3bf579cca787c4bbe0c2bdccc17c8ac9a189c refs/tags/2.10
668fe4cb4bf709d52ab5660e9198ed2bbcc32289 refs/tags/2.10.1
a401067f098a6c3aa8b273e06e6ccbf14a589852 refs/tags/2.10.2
66187b25b69ab736c0ff93f0b3ebf35f660fb343 refs/tags/2.10.3
d34d67f35bc2a0a48af1c37ac6af4c926df7668c refs/tags/2.8
4f90aa334e08c3137db6e2267192c1c7a14ffb84 refs/tags/2.8-p3
dd287e742d072039b81f1e7351aab45621e60ed4 refs/tags/2.8-p5
b3911d9b59b06d5e39bfa30ea572fdb167c6d478 refs/tags/2.8-p6
15122fd0a5190afc168918bc8e840eb0d3296f38 refs/tags/2.8-rc1
662ad6ee1249ceb0b9873d02034d03fee429b616 refs/tags/2.8.1
47ae77b5608c6dc0e3e5497f857c450fba3a41cf refs/tags/2.8.2
3215bf8472af3b66a836af6319bb9410fd84e2ff refs/tags/C5_0_5
a4367a4aaaa4600954eb64dfd1cc4c433b5f0e3b refs/tags/GENERICS_BASE_MERGE_POINT
5df4e8d92d45ebd27fff80d1cb3317fc6177f1cb refs/tags/GMCS_MARTIN
69876c30ff2e33d15a79f94c8a5560c7066e4900 refs/tags/GMCS_MARTIN_2
b5e0d7eaf38a4e1ec031e91508c602c0e07c14ff refs/tags/MARTIN_PLAYGROUND_TAG
c47f6de70e6a9cfc31ded537d4610efa800302f2 refs/tags/MCS_0_10
6f9059cfb80914c1f48a93bc0efc08e6404c950e refs/tags/MCS_0_11
d7a0fa3525a4baf4da535c3f5c4a6afa61fc1af7 refs/tags/MCS_0_13
af150fc45b9f08337e3c5c517d1a9ae533844927 refs/tags/MCS_0_14
3baf6444e0ba460696c78ddf2e137517664d6d0f refs/tags/MCS_0_15
2060885a61b30e2557d9e938e681842a21be7fb2 refs/tags/MCS_0_16
8a70bb1d0e07b9bda44c4fab515414dd14d98d97 refs/tags/MCS_0_17
8f0db6b55168e6cdf83a94efd6a9c1e75ce4f141 refs/tags/MCS_0_18
1bce5f4a2aab71234fd0aa56f76c71467677281e refs/tags/MCS_0_19
f4d7c3d9ef6b3198ca3436b2a9f7aaa6adfada0b refs/tags/MCS_0_20
cfaea8bc95ea12af4694be8775172ca868ffbd46 refs/tags/MCS_0_21
62975301f29e09b9d989d86986aa43dcddab4338 refs/tags/MCS_0_22
cc6c8473d625470faf0a35975e743890e615484e refs/tags/MCS_0_23
9f09256d3c73b6906965b238779b9bff5b1a39a0 refs/tags/MCS_0_24
4a048a798ca68d31088227e8e9e324358bb9b5f7 refs/tags/MCS_0_25
2c2381e666b95479893c22cddc7e75099d15cb2a refs/tags/MCS_0_26
dd05ade67bd8b0a60a8ae6a5ce7501e9085b29bc refs/tags/MCS_0_27
6e43a5d927ef22ded84720ba9497b8f54f2ef8a4 refs/tags/MCS_0_29
77702ef90fa82d99e5c1f198b79ea8a988b46c79 refs/tags/MCS_0_30
5d657d7bc63e0bf93e6e4c463d71be239d1d6db4 refs/tags/MCS_0_31
b0784aa1318048429a5c94e704a7d3554f6ea2f7 refs/tags/MCS_0_4
d02373e837c4ab265cbbfc3c685670e04a162c25 refs/tags/MCS_0_6
c275f7585f42e64da71678dd2213c76cd2554f71 refs/tags/MCS_0_8
2ba6e3293b552a4be0947afd1d39d8450a4f8237 refs/tags/MCS_0_91
39c87c56fbaf6635cfe7a81285f4c0b8612f302f refs/tags/MCS_0_95
5f2542f7633db1be8a059fd1a1ee4201361d0fa8 refs/tags/MCS_0_96
3742db035a55aa33384cf90c49336ed3bc018c8c refs/tags/MCS_0_97
06d243aef744202bf37a0aa21de8c15bf427a85a refs/tags/MCS_1_0
251a5dabc98ac219c962f950dcef2489c90da2ad refs/tags/MCS_1_0_2
081f745091ca69547afa8c929862a2f5a533c206 refs/tags/MCS_1_0_3
c0ce58ee90ee63da82639d8cccd11f9b2b73d857 refs/tags/MCS_1_0_4
20f50bbc55de5f443511d3670d3b4f597d55e485 refs/tags/MCS_1_1_1
25d006bb42129274760a3bffba0c1289052c21c4 refs/tags/MCS_1_1_2
2f5e6232d1c49b739354a58a5bca5d150bcfdcc3 refs/tags/MCS_JULY_17
2c94e8b66e745c4b06312aafae63f85b8129d0b2 refs/tags/MONO_0_10
ca778a895886cd1f2f1e1dd354955b3e647e6fce refs/tags/MONO_0_11
4f02ecaa9dd5a59c7edce294d255efa58daf61d5 refs/tags/MONO_0_13
adb7ff32d1132ffae1c357388d78d61044931873 refs/tags/MONO_0_14
248504d80db5ae00ea6ab790c602db54db265bdb refs/tags/MONO_0_15
32e69fe2dd5f540b7afcc51260fdf80cd78ebc5d refs/tags/MONO_0_16
f64163bfd7a8049d46518c9ec4efeb5ce3fbb186 refs/tags/MONO_0_17
66332d9ef6f1bc809742c5d3f6410f28f33d717c refs/tags/MONO_0_18
8466b5c35a24c80437a4425608d63e96890c1ae1 refs/tags/MONO_0_19
52b84743694e5f3aa99a1175b151e4bf05d77843 refs/tags/MONO_0_20
46a6b24b434d1ffef5d880099e35872f89fe5a9d refs/tags/MONO_0_21
d32321a6f9da81443d439b33205911efb8229d47 refs/tags/MONO_0_22
8d12301369b39c5737b6eeba8ad47952ecf6482d refs/tags/MONO_0_23
23631f018af1aa50b3d2f7a26ac2ac02c10a9641 refs/tags/MONO_0_24
24ca06b662e3f2a6f7ea59941ea55bbc5e756eb6 refs/tags/MONO_0_25
0d77b961f51dbd9578cc4c0a71e00700d80331c7 refs/tags/MONO_0_26
3c95965b2e209ade91865de62f0a5c3477f83a6e refs/tags/MONO_0_27
395708bec98015ea736ec2c7140a638c72e02450 refs/tags/MONO_0_29
3a24638a9150b340a731bf94621d5abd4cb84211 refs/tags/MONO_0_3
34822afe22085dcdfa99db23ce024c95f39c5328 refs/tags/MONO_0_30
7f5304f8a86db6bdbd5acc97cbf3e94085bead41 refs/tags/MONO_0_31
08cc744ea34ddc11b5e66d62b5681963d3997365 refs/tags/MONO_0_4
ac6a0aff32ced61f3a858961fb0d27679bbd8504 refs/tags/MONO_0_5
9a80f7e7814c11e580621af662a60c5761bb112e refs/tags/MONO_0_6
5bafbfd3411626e5916657ff37179f11628dfdac refs/tags/MONO_0_7
dc0e724dcc70b038ed7d89a7d04baabe1fb9a6e9 refs/tags/MONO_0_8
885709d3bcac901227fac48c0efd63748b88afaa refs/tags/MONO_0_9
3cadc5c762015237c99861f093f8dc2f862133c2 refs/tags/MONO_0_91
a00b9074aa531be3c4a905da7a15786212f14f97 refs/tags/MONO_0_93
c055406f4431bf7695c29026845ac841eea3c1d9 refs/tags/MONO_0_94
920d6fe40d1df03aba5698e8bb1ccca5aa75b3d8 refs/tags/MONO_0_95
0cbb90c2046182f209495aa451ad4cba06bfcc06 refs/tags/MONO_0_96
ffa02af22854b2be49708684d2483a7c0624dda4 refs/tags/MONO_0_97
35e34e2d9dd04d14aea6358ff7ec55763f203fe8 refs/tags/MONO_0_99_2
6340550c2b181e5561266f61093bf581ca275314 refs/tags/MONO_1_0
72b6c41eebe173dfe7cb517deb05961f44dbfb8a refs/tags/MONO_1_0_1
1bae59437320c2cdbcda814b06f43993327ed5a5 refs/tags/MONO_1_0_2
13f4c1a27734a2815a42d3f8826dedfee4744fd1 refs/tags/MONO_1_0_3
408a59e440bbe3dd331ad8ebba505eabcef56157 refs/tags/MONO_1_0_4
8c2a6ff51b3864ee8cd7574d2c55da804fba188e refs/tags/MONO_1_1_1
679f766f0d8c4c56d6cbfe6348c84f6095b5304f refs/tags/MONO_1_1_2
0ed4ed7b6a21f51760f9a1d9a7b5eb4074e09fb2 refs/tags/MONO_BETA2
7f0542b133e5f1eee15f337e0263c14406091a7e refs/tags/NUNIT_1_11
4e4824afab6cd0f9f0d71aa6baeddb7bee74f8c4 refs/tags/RHYS_20020821
e2b6cbaf2793354590a7fe542afe811aa03d0a2e refs/tags/cecil-0.6
cc871f21d86765c372ffd71615de2a5252ce2832 refs/tags/last-commit-with-compulsory-changelog-entry
3f313cb9ecff29967ddff9bf78004f49816e804d refs/tags/mono-1-0-5
c064f9f178339e54686526a3dd8bfd0ae7b64006 refs/tags/mono-1-1-10-1
2dbb2f7a7d72a49b068c3d17aa7cb04aaeeac735 refs/tags/mono-1-1-12-1
0e6e9da90b12ca5c445a3b1eaeb7581dc792c016 refs/tags/mono-1-1-13-1
24906dde223bd634fe2b5ec231ba399eb01ed85e refs/tags/mono-1-1-13-2
933491861325258994290ac573f66db398b2151c refs/tags/mono-1-1-13-3
fbc561d17c6310b2d9c94c37e673956f64956d2b refs/tags/mono-1-1-13-4
5555a9e8dabb3bb9d94d18cb10236e331ff6652c refs/tags/mono-1-1-13-5
33ab4bee8e165e330c6abd3385bb09357afd892a refs/tags/mono-1-1-13-6
6b2f395ce41d181672c1032c0bada5013589aa9d refs/tags/mono-1-1-13-7
7d44efe136a8b624639e244b407694012767d8b2 refs/tags/mono-1-1-13-8-1
3f85c6d6d4c066363ae9d6e4de1ae80b954b84eb refs/tags/mono-1-1-13-8-2
680b340f6d3d64c649c03a35a3946a969c75b9c8 refs/tags/mono-1-1-16-1
3f259856c6b748da5e9db392231bc4cf02067625 refs/tags/mono-1-1-17-1
e69a3c507851f27ff9d47d99944ee381fbd8da3e refs/tags/mono-1-1-17-2
97263cd3ede795aa9214ef6f511a6986caa1d10a refs/tags/mono-1-1-18-1
8ee804b1c9cc92fd7bea45adb1270f3d5bbcbdf5 refs/tags/mono-1-1-3
14db55bb39fee489de084d070ae611dd3503336d refs/tags/mono-1-1-6-2
0e3bb5c75d0e2e46654b01bf9cf2c564fcf36186 refs/tags/mono-1-1-7-1
9fe352c95dea8ef63bc54837a902297643ad95cb refs/tags/mono-1-1-7-10
3212bc410d77569c636eee658215f6ef26727022 refs/tags/mono-1-1-7-11
3a154ae091c27cacef8da21bbcd802c6b20a5fdc refs/tags/mono-1-1-7-12
2dd8006e8e79bb0b6695e83e8b9f8c75614b73cd refs/tags/mono-1-1-7-13
da175f964d6ff43a290436b99dea5c4c874f7d77 refs/tags/mono-1-1-7-14
ce91af0332902c2227985cf72e5267dc93f0082f refs/tags/mono-1-1-7-2
8dd4410b0519704c213252c27e12bc2c3d2f5644 refs/tags/mono-1-1-7-3
669e1211f916836ed1151d494ef6363f477c6875 refs/tags/mono-1-1-7-4
cb211e4e89523e37865b46c53bab8c13667904a5 refs/tags/mono-1-1-7-5
212070688ad11ff8d6db9c79a7a354e73dce0169 refs/tags/mono-1-1-7-6
475bb6ed37428ae214db51de76144ddfc461eab2 refs/tags/mono-1-1-7-7
4163439d14083fe6c88ba52d66d32f1c199e134a refs/tags/mono-1-1-7-8
db8b68eb75dd8a1773ea380c5ab299ecb96a02e8 refs/tags/mono-1-1-7-9
9e4af11a75bbde3b9aa45a8c8dc2a9d28c327ca7 refs/tags/mono-1-1-8-1
97f8625d1092a3087d2561e6a8fd5fec9548ddf8 refs/tags/mono-1-1-8-2
c9228135a78dc90b0fada472767b7501c10a10a1 refs/tags/mono-1-1-8-3
b29c6d9321ae353d5587552c5fd8a3990ef25b8d refs/tags/mono-1-1-9-1
c20187f291f7ab63b0039cc6ea1d0aec666357bc refs/tags/mono-1-1-9-2
434ed78f2343b3c7a2ceb2431bf6e6f3fda96b9d refs/tags/mono-1-2-2-1
6b2181df333da3201aa21e7aac7af0092a95f155 refs/tags/mono-1-2-3-1
e27148fde898ecd8b315ed811d69174ca770f3fe refs/tags/mono-1-2-3-50
ef21dfa4f165958a8d6e643e67fc2fbdc6a4b193 refs/tags/mono-1-2-5-1
97512982957dd59e98473df4de5d023831076ac8 refs/tags/mono-1-2-5-2
b80cb128d794441da87095b62dda79fc977b43a2 refs/tags/mono-1-2-5-p4
3099f3ce8d009126b71e2856744953b706b153b3 refs/tags/mono-1-2-5-p5
59c864c22a7ba865e3d641048f143eef3d78e3bb refs/tags/mono-1-9-1
65cf8c16c5248ce0e3ca9321422e3f3d47e44054 refs/tags/mono-1-9-1-p2
2b3bfcb002d9e7dc8b5bb9e93d5416fa3a7f4a24 refs/tags/mono-1-9-p3
e1eb581e8a9100a929827524d1d2f91bd5685739 refs/tags/mono-1.0.6
269d024dc2796fbffd5b2603cfce01199ddfa354 refs/tags/mono-1.1.10
b28e8eb77161f75a676f160365a860455db15476 refs/tags/mono-1.1.11
f2631aa17b0296460a815794f4c2c1d6dccc1cd3 refs/tags/mono-1.1.12
97c08a345189de79332e75268f5ac806caa800f8 refs/tags/mono-1.1.13
0aea5e52ca5def84eb4bea45a32c46c38382ce54 refs/tags/mono-1.1.13.8
6a546f60cfc03dc0e4ae09c4463a40f2d5acd8d0 refs/tags/mono-1.1.14
6e9f255eec4cbd8c53623d52fa26877db451bc34 refs/tags/mono-1.1.15
fda57d1297a00855038778e4b3c55125cd5b6f6d refs/tags/mono-1.1.16
f0eb908832c00425cb56a563c4d2c2253aa99801 refs/tags/mono-1.1.17
d973adf739079a754013a7aabaf062c6e8362d58 refs/tags/mono-1.1.18
f0cc7b722514f9a66636fbdc2ba46d2ad09290da refs/tags/mono-1.1.4
d305ee9a95945be36cd4517ef440ce99833068a0 refs/tags/mono-1.1.5
4a93eca61ace3b72e9c7d3241e22894ac6527751 refs/tags/mono-1.1.6
999eedbde2286858dee3a28b3de17cf7c7ee6aa3 refs/tags/mono-1.1.7
38ba17f8fba52022c8be480c4d0b7790502fcf5d refs/tags/mono-1.1.8
0c12971f275e1e95d86fcdb69bb3a16782c96c00 refs/tags/mono-1.1.9
d0f800d5aae075fbaec91be79776b05fea6d8b2b refs/tags/mono-1.2
7e26594b5acf982ca712d81018e01192f3698934 refs/tags/mono-1.2.1
3482a0b686b1717a6a7639bdde43123fda150a37 refs/tags/mono-1.2.2
203611f08d6864575fd244f513e8c800fe04538e refs/tags/mono-1.2.3
69353f911160fe45163b3514df295ee5bca196e3 refs/tags/mono-1.2.4
e659f8968d2943e94136787d0256de16d8c21dcc refs/tags/mono-1.2.5
040ba14063f6b9933ac89835e71bd813ca140dc7 refs/tags/mono-1.2.6
e80fe9efc2b64aacf06657cc8951c9739513069d refs/tags/mono-1.9
fa2352e7bba168ce21f63ccdb59cce70e69b0b98 refs/tags/mono-1.9.1.1
ad1e78b37d014bb15d5396736d9db71bb37a902c refs/tags/mono-2-0-1
94c037f620e2f32ca4d0925785e77345bf9436b3 refs/tags/mono-2-0-1-rc1
57dbdb3e42c98860392c8eeccbcbdf3df50ee461 refs/tags/mono-2-0-p1
d7b1a66b945f37e7a62ce28a2cbb4618dbca842b refs/tags/mono-2-0-p2
28021d9e5cc4e8837fb8e060e222e93ed5b6963e refs/tags/mono-2-0-rc1
d33e20924be8193235f574a1da78e7d44b229f21 refs/tags/mono-2-0-rc2
245f79b651af761ca0929d77f14c06e77e56b5fa refs/tags/mono-2-0-rc3
c43c7090b668525e8d6730206883b76b1cd7e8c1 refs/tags/mono-2-2-p1
50619fe4f49cc9358be684132ea197993d3748b1 refs/tags/mono-2-2-p2
dc330f3d57eb21109243f16df6ba7001a68bb963 refs/tags/mono-2-2-p3
08038cbf3b982239d9ed74f6181576a7caf308b4 refs/tags/mono-2-2-rc1
abb08d231bb68b63beb4f34f4c4bab8f3a607092 refs/tags/mono-2-4-2-1
b79738dc7f734a78039567ea35f4e6a7d319a227 refs/tags/mono-2-4-2-2
f79a3230c2f0a8d80b36cdbe067c53e36374a017 refs/tags/mono-2-4-2-3
f64925baf83a71bfffa278c15da8baf6a7d851c2 refs/tags/mono-2-4-2-3-rc1
7337b45f49fadaff8f310b5d432240128b82786d refs/tags/mono-2-4-2-3-rc2
f79a3230c2f0a8d80b36cdbe067c53e36374a017 refs/tags/mono-2-4-2-3-rc3
ab03b83eb4ed48e7f3d667c279ae60335d5c850d refs/tags/mono-2-4-2-p1
8e9b735376ea0dc09c1b0234e0ce8941f0e8dab9 refs/tags/mono-2-4-2-p2
01bbe61085220e441170e93e38c87368cf6726f1 refs/tags/mono-2-4-2-rc1
8a7c716e20f2aeadbe827b5d532fe36f69e74568 refs/tags/mono-2-4-2-rc2
6bf1e1ea5f2d2586bafdd14f1fe538e080a6d5ba refs/tags/mono-2-4-3-1
dc279e74dc85301bb23db6de78d537cb0da9fe9e refs/tags/mono-2-4-p1
c2752833c4c451a9cff77175801370c359b5850e refs/tags/mono-2-6
3a989e7d01e337d2c77bb3218effe39f9ed90a02 refs/tags/mono-2-6-1
53acd8e07620008e5354170ff2ad479db5d200cb refs/tags/mono-2-6-3
3a79ccf17838b6b1d0806cb123428ee065d3d30f refs/tags/mono-2-6-7
43e34e922109adb8cbf6aaaf1dbc1dce3350f88f refs/tags/mono-2-6-p1
1c102ac0d51469c9c4dd245b82ff8a3cc485a67e refs/tags/mono-2-6-rc1
e117097e1f1f8a3cddaac9fb71d86661b6a10b22 refs/tags/mono-2.0
470791b186ea8326f205f17ce2eadac2ff86a564 refs/tags/mono-2.2
27589b59b90f81fb88ab69eee320449c8cf65780 refs/tags/mono-2.4
8a7c716e20f2aeadbe827b5d532fe36f69e74568 refs/tags/mono-2.4.2
1a9965fb222300fafa0eda42cf33c9ab8ff90faf refs/tags/mono-2.4.3
c2752833c4c451a9cff77175801370c359b5850e refs/tags/mono-2.6
680b5eb2d695de54fe4eb3210c07722ef60e5a4b refs/tags/mono-2.6.4
6623fc543d66d06121d7c7cfbe9f5bfa3ed8cf3d refs/tags/mono-android-1-0
7dcae3becc62fdbd1934b5c8b0e924bfe9e72921 refs/tags/monotouch-1-3
781cdd1e28a8060fb31c16817bdff2024002e304 refs/tags/monotouch-1-4
51a238609c4c196985d2fcc3c1edf10442ff94de refs/tags/monotouch-1.0
fa856a85b50d6adbac6b5d26b32bc608887551bc refs/tags/moon-1.9.0
348617482b380275d7057e547e806c9be05bdb72 refs/tags/moon-1.9.1
0d47d8081c828d4b032564a88046a99d0284e6fd refs/tags/moon-1.9.2
1163a482f7430930bee670cf4c6721ecf9880974 refs/tags/moon-1.99.1
c7bb5af6fcf8d1e380a8ec440c4b535c912713e0 refs/tags/moon-1.99.2
d4674914b900cba323c2cde86e185b57553fa224 refs/tags/moon-1.99.6
ee08a4d041bdb88f49a027ce1a4f7736751a32d5 refs/tags/moon/1.99.1.1
19f1c05c5471440bebaa4b29753c831c6c876312 refs/tags/moon/2.0
a17f894b666841189aeffb3d2a172c63c9f4f0b6 refs/tags/moon/2.1
a17f894b666841189aeffb3d2a172c63c9f4f0b6 refs/tags/moon/2.2
a17f894b666841189aeffb3d2a172c63c9f4f0b6 refs/tags/moon/moon-2-3
4147a93068116c5ff6b872fd7cf877af3d4ec04a refs/tags/sportsmodel-base
b07fca3e4eb4ce853b265956eb399f5649220559 refs/tags/type-reflector_0_2
-1
View File
@@ -307,7 +307,6 @@ mono_gc_out_of_memory
mono_gc_wbarrier_arrayref_copy
mono_gc_wbarrier_generic_nostore
mono_gc_wbarrier_generic_store
mono_gc_wbarrier_generic_store_atomic
mono_gc_wbarrier_object_copy
mono_gc_wbarrier_set_arrayref
mono_gc_wbarrier_set_field
-49
View File
@@ -1,49 +0,0 @@
With this change, we bundle Reactive Extensions from Microsoft.
Steps to do:
- Until we add submodule, check out Rx sources from http://rx.codeplex.com:
$ cd external
$ git clone git://github.com/atsushieno/rx.git
$ cd rx
$ git checkout rx-oss-v1.0
$ cd ../..
Note that the original repo at rx.codeplex.com will *fail* on Linux!
codeplex.codeplex.com/workitem/26133
Also note that rx.codeplex.com is huge and takes very long time to checkout.
- expand rx-mono-changes-3.tar.bz2
$ tar jxvf rx-mono-changes-3.tar.bz2
- Apply changes to mcs/class/Makefile:
$ cd mcs/class
$ patch -i add-rx-libs.patch -p3
$ cd ../..
Then it should be done.
Note that this does not include Mono.Reactive.Testing into the build yet -
this library depends on nunit.framework.dll but it wouldn't be built before
this assembly is built. This needs to be resolved.
** Current Status
- We don't have Microsoft.Reactive.Testing.dll. Instead, I created an
alternative Mono.Reactive.Testing.dll which *mostly* uses MS sources for
that assembly but uses NUnit.Framework instead.
To make it happen, I added a small script that automatically replaces
MSTest dependency parts with that for NUnit (replacer.sh under rx tree).
(We'll also have to rename namespaces and have more source changes, but
so far it is to get things runnable.)
- To check the build sanity, I imported unit tests (as explained above)
and it is supposed to run by "make run-test" in Mono.Reactive.Testing
directory (the tests were all in one place in MS tests, so I made it
in Mono.Reactive.Testing directory instead).
-19
View File
@@ -1,19 +0,0 @@
<h1>Decimal Support</h1>
<p>You can use the mono_decimal functions to access and
manipulate <tt>System.Decimal</tt> types from C.
<h4><a name="api:mono_decimal2double">mono_decimal2double</a></h4>
<h4><a name="api:mono_decimal2Int64">mono_decimal2Int64</a></h4>
<h4><a name="api:mono_decimal2string">mono_decimal2string</a></h4>
<h4><a name="api:mono_decimal2UInt64">mono_decimal2UInt64</a></h4>
<h4><a name="api:mono_decimalCompare">mono_decimalCompare</a></h4>
<h4><a name="api:mono_decimalDiv">mono_decimalDiv</a></h4>
<h4><a name="api:mono_decimalFloorAndTrunc">mono_decimalFloorAndTrunc</a></h4>
<h4><a name="api:mono_decimalIncr">mono_decimalIncr</a></h4>
<h4><a name="api:mono_decimalIntDiv">mono_decimalIntDiv</a></h4>
<h4><a name="api:mono_decimalMult">mono_decimalMult</a></h4>
<h4><a name="api:mono_decimalRound">mono_decimalRound</a></h4>
<h4><a name="api:mono_decimalSetExponent">mono_decimalSetExponent</a></h4>
<h4><a name="api:mono_double2decimal">mono_double2decimal</a></h4>
<h4><a name="api:mono_string2decimal">mono_string2decimal</a></h4>
+2 -1
View File
@@ -1,3 +1,4 @@
SSAPRE stands for "SSA based Partial Redundancy Elimination".
The algorithm is explained in this paper:
@@ -241,7 +242,7 @@ Otherwise, the implementation is complete.
Other interesting issues are:
- SSAPRE has the assumption that:
- each SSA variable is related to one "original" (not SSA) variable, and
- no more than one version of each original variable is live at the same time
- no more than one version of each originsl variable is live at the same time
in the CFG.
It would be better to relax these assumptions.
- SSAPRE operates on "syntactic" redundancies, not on "values".
+181 -181
View File
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:monodoc="http://www.go-mono.org/xml/monodoc">
<head><title>Mono API</title></head>
<body>
<object type="text/site properties">
<param name="Auto Generated" value="No"/>
</object>
<head/>
<body>
<object type="text/site properties">
<param name="Auto Generated" value="No"/>
</object>
<ul>
<li>
<object type="text/sitemap">
@@ -12,182 +12,182 @@
<param name="Local" value="DoesNotExist"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Assemblies"/>
<param name="Local" value="deploy/mono-api-assembly.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Images"/>
<param name="Local" value="deploy/mono-api-image.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Objects"/>
<param name="Local" value="deploy/mono-api-object.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Strings"/>
<param name="Local" value="deploy/mono-api-string.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Methods"/>
<param name="Local" value="deploy/mono-api-methods.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Classes"/>
<param name="Local" value="deploy/mono-api-class.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Code Generation"/>
<param name="Local" value="deploy/mono-api-codegen.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Decimal Representation"/>
<param name="Local" value="deploy/mono-api-decimal.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Application Domains"/>
<param name="Local" value="deploy/mono-api-domains.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Dynamic Code Generation"/>
<param name="Local" value="deploy/mono-api-dynamic-codegen.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Exceptions"/>
<param name="Local" value="deploy/mono-api-exc.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="GC Handles"/>
<param name="Local" value="deploy/mono-api-gchandle.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Garbage Collection"/>
<param name="Local" value="deploy/mono-api-gc.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Embedding Mono"/>
<param name="Local" value="deploy/mono-api-embedding.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Just in Time Compiler"/>
<param name="Local" value="deploy/mono-api-jit.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Marshalling"/>
<param name="Local" value="deploy/mono-api-marshal.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Metadata access"/>
<param name="Local" value="deploy/mono-api-metadata.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Profiler"/>
<param name="Local" value="deploy/mono-api-profiler.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Reflection"/>
<param name="Local" value="deploy/mono-api-reflection.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Threading API"/>
<param name="Local" value="deploy/mono-api-threads.html"/>
</object>
</li>
<!--
<li>
<object type="text/sitemap">
<param name="Name" value="Tracing"/>
<param name="Local" value="deploy/mono-api-trace.html"/>
</object>
</li>
-->
<li>
<object type="text/sitemap">
<param name="Name" value="JIT Counters"/>
<param name="Local" value="deploy/mono-api-counters.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Types"/>
<param name="Local" value="deploy/mono-api-type.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Common Types"/>
<param name="Local" value="deploy/mono-api-types.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Security API calls"/>
<param name="Local" value="deploy/mono-api-security.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Portable Windows Layer"/>
<param name="Local" value="deploy/mono-api-wapi.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Debugging API"/>
<param name="Local" value="deploy/mono-api-debug.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Utility Functions"/>
<param name="Local" value="deploy/mono-api-utils.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Unsorted"/>
<param name="Local" value="deploy/mono-api-unsorted.html"/>
</object>
</li>
<ul>
<li>
<object type="text/sitemap">
<param name="Name" value="Assemblies"/>
<param name="Local" value="deploy/mono-api-assembly.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Images"/>
<param name="Local" value="deploy/mono-api-image.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Objects"/>
<param name="Local" value="deploy/mono-api-object.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Strings"/>
<param name="Local" value="deploy/mono-api-string.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Methods"/>
<param name="Local" value="deploy/mono-api-methods.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Classes"/>
<param name="Local" value="deploy/mono-api-class.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Code Generation"/>
<param name="Local" value="deploy/mono-api-codegen.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Decimal Representation"/>
<param name="Local" value="deploy/mono-api-decimal.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Application Domains"/>
<param name="Local" value="deploy/mono-api-domains.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Dynamic Code Generation"/>
<param name="Local" value="deploy/mono-api-dynamic-codegen.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Exceptions"/>
<param name="Local" value="deploy/mono-api-exc.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="GC Handles"/>
<param name="Local" value="deploy/mono-api-gchandle.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Garbage Collection"/>
<param name="Local" value="deploy/mono-api-gc.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Embedding Mono"/>
<param name="Local" value="deploy/mono-api-embedding.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Just in Time Compiler"/>
<param name="Local" value="deploy/mono-api-jit.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Marshalling"/>
<param name="Local" value="deploy/mono-api-marshal.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Metadata access"/>
<param name="Local" value="deploy/mono-api-metadata.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Profiler"/>
<param name="Local" value="deploy/mono-api-profiler.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Reflection"/>
<param name="Local" value="deploy/mono-api-reflection.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Threading API"/>
<param name="Local" value="deploy/mono-api-threads.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Tracing"/>
<param name="Local" value="deploy/mono-api-trace.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="JIT Counters"/>
<param name="Local" value="deploy/mono-api-counters.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Types"/>
<param name="Local" value="deploy/mono-api-type.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Common Types"/>
<param name="Local" value="deploy/mono-api-types.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Security API calls"/>
<param name="Local" value="deploy/mono-api-security.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Portable Windows Layer"/>
<param name="Local" value="deploy/mono-api-wapi.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Debugging API"/>
<param name="Local" value="deploy/mono-api-debug.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Utility Functions"/>
<param name="Local" value="deploy/mono-api-utils.html"/>
</object>
</li>
<li>
<object type="text/sitemap">
<param name="Name" value="Unsorted"/>
<param name="Local" value="deploy/mono-api-unsorted.html"/>
</object>
</li>
</ul>
</ul>
</body>
</html>
+5 -6
View File
@@ -1,17 +1,16 @@
ACLOCAL_AMFLAGS = -I m4
if HOST_WIN32
SUBDIRS = m4 src
SUBDIRS = src
else
if PLATFORM_DARWIN
SUBDIRS = m4 src
SUBDIRS = src
else
if CROSS_COMPILING
SUBDIRS = m4 src
SUBDIRS = src
else
SUBDIRS = m4 src test
SUBDIRS = src test
endif
endif
endif
EXTRA_DIST = autogen.sh README NEWS AUTHORS ChangeLog winconfig.h
+1 -2
View File
@@ -29,7 +29,7 @@ i?86-*-linux*|x86_64-*-linux*|powerpc-*-linux*|powerpc64-*-linux* \
?86-pc-cygwin*|i?86-pc-cygwin*)
pic_options='-DDLL_EXPORT'
;;
i?86-apple-darwin*|arm-apple-darwin*)
i?86-apple-darwin*)
pic_options='-fno-common'
;;
*)
@@ -158,7 +158,6 @@ modeok=false
tagok=false
for arg in "$[]@"; do
case "$arg" in
--silent) ;;
--mode=compile) modeok=true ;;
--tag=CC|--tag=CXX) tagok=true ;;
--quiet) ;;
+4 -4
View File
@@ -102,8 +102,8 @@ if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
fi
fi
echo "Running aclocal -I m4 $ACLOCAL_FLAGS ..."
aclocal -I m4 $ACLOCAL_FLAGS || {
echo "Running aclocal $ACLOCAL_FLAGS ..."
aclocal $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"
@@ -113,7 +113,7 @@ aclocal -I m4 $ACLOCAL_FLAGS || {
exit 1
}
if grep "^AC_CONFIG_HEADERS" configure.ac >/dev/null; then
if grep "^AM_CONFIG_HEADER" configure.ac >/dev/null; then
echo "Running autoheader..."
autoheader || { echo "**Error**: autoheader failed."; exit 1; }
fi
@@ -125,7 +125,7 @@ echo "Running autoconf ..."
autoconf || { echo "**Error**: autoconf failed."; exit 1; }
conf_flags="--enable-maintainer-mode" #--enable-compile-warnings --enable-iso-c
conf_flags="--enable-maintainer-mode --enable-compile-warnings" #--enable-iso-c
if test x$NOCONFIGURE = x; then
echo Running $srcdir/configure $conf_flags "$@" ...
-672
View File
@@ -1,672 +0,0 @@
#! /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
+17 -67
View File
@@ -1,24 +1,15 @@
#
# 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_INIT(README)
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_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(eglib,0.3)
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
CFLAGS="$CFLAGS -O0"
GNUC_PRETTY=
GNUC_UNUSED=
BREAKPOINT="G_STMT_START { raise (SIGTRAP); } G_STMT_END"
@@ -49,7 +40,6 @@ 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*)
@@ -65,14 +55,6 @@ case $host in
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=':'
@@ -100,25 +82,6 @@ i*86-*-darwin*)
;;
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)
@@ -128,29 +91,19 @@ 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)
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)
#
# 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
AC_CHECK_FUNCS(strndup strlcpy getpwuid_r strtok_r rewinddir vasprintf)
AM_CONDITIONAL(NEED_VASPRINTF, test x$have_vasprintf = x )
AM_ICONV()
AC_CHECK_LIB(iconv, iconv_open, LIBS="$LIBS -liconv")
AC_CHECK_LIB(iconv, libiconv_open, LIBS="$LIBS -liconv")
AC_CHECK_LIB(iconv, iconv_open, ICONV_LIBS="-liconv")
AC_CHECK_LIB(iconv, libiconv_open, ICONV_LIBS="-liconv")
AC_SUBST(ICONV_LIBS)
LIBS="$LIBS $ICONV_LIBS"
AC_SEARCH_LIBS(sqrtf, m)
# nanosleep may not be part of libc, also search it in other libraries
@@ -192,8 +145,6 @@ if test $ac_cv_sizeof_void_p = $ac_cv_sizeof_int; then
GSIZE_FORMAT='"u"'
G_GUINT64_FORMAT='"llu"'
G_GINT64_FORMAT='"lld"'
G_GUINT32_FORMAT='"lu"'
G_GINT32_FORMAT='"ld"'
elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long; then
GPOINTER_TO_INT="((gint)(long) (ptr))"
GPOINTER_TO_UINT="((guint)(long) (ptr))"
@@ -203,8 +154,6 @@ elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long; then
GSIZE_FORMAT='"lu"'
G_GUINT64_FORMAT='"lu"'
G_GINT64_FORMAT='"ld"'
G_GUINT32_FORMAT='"u"'
G_GINT32_FORMAT='"d"'
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))"
@@ -214,8 +163,6 @@ elif test $ac_cv_sizeof_void_p = $ac_cv_sizeof_long_long; then
GSIZE_FORMAT='"I64u"'
G_GUINT64_FORMAT='"I64u"'
G_GINT64_FORMAT='"I64i"'
G_GUINT32_FORMAT='"I32u"'
G_GINT32_FORMAT='"I32i"'
else
AC_MSG_ERROR([unsupported pointer size])
fi
@@ -248,6 +195,7 @@ if test "x$PKG_CONFIG" != "xno"; then
fi
AM_CONDITIONAL(HAVE_GLIB, $have_glib)
AC_ARG_ENABLE(quiet-build, [ --enable-quiet-build Enable quiet runtime build (on by default)], enable_quiet_build=$enableval, enable_quiet_build=yes)
AC_SUBST(GPOINTER_TO_INT)
AC_SUBST(GPOINTER_TO_UINT)
AC_SUBST(GINT_TO_POINTER)
@@ -256,12 +204,14 @@ 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)
if test x$enable_quiet_build = xyes; then
AC_CONFIG_COMMANDS([quiet], [for i in `find src test -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do if test -f $i; then $srcdir/../scripts/patch-quiet.sh $i; fi; done], [shell=$SHELL])
AC_CONFIG_COMMANDS([quiet-libtool], [sed -e 's/$echo "copying selected/$show "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool; sed -e 's/$ECHO "copying selected/# "copying selected/g' < libtool > libtool.tmp && mv libtool.tmp libtool && chmod a+x libtool])
fi
AC_OUTPUT([
Makefile
m4/Makefile
src/Makefile
src/eglib-config.h
test/Makefile
-7
View File
@@ -1,7 +0,0 @@
Makefile
Makefile.in
libtool.m4
ltoptions.m4
ltsugar.m4
ltversion.m4
lt~obsolete.m4
-1
View File
@@ -1 +0,0 @@
EXTRA_DIST = $(wildcard *.m4)
-214
View File
@@ -1,214 +0,0 @@
# 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
])
-110
View File
@@ -1,110 +0,0 @@
# 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
])
-774
View File
@@ -1,774 +0,0 @@
# 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])
])
-224
View File
@@ -1,224 +0,0 @@
# 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"
])
+3 -9
View File
@@ -31,11 +31,9 @@ libeglib_la_SOURCES = \
gbytearray.c \
gerror.c \
ghashtable.c \
giconv.c \
gmem.c \
gmodule.h \
goutput.c \
gqsort.c \
gstr.c \
gslist.c \
gstring.c \
@@ -59,17 +57,13 @@ libeglib_la_CFLAGS = -g -Wall -D_FORTIFY_SOURCE=2
libeglib_static_la_SOURCES=$(libeglib_la_SOURCES)
libeglib_static_la_CFLAGS = $(libeglib_la_CFLAGS)
AM_CPPFLAGS = -I$(srcdir)
INCLUDES = -I$(srcdir)
if HOST_WIN32
libeglib_la_LIBADD = -lm $(LIBICONV) -lpsapi
else
if PLATFORM_ANDROID
libeglib_la_LIBADD = -llog
endif
libeglib_la_LIBADD = -lm $(ICONV_LIBS) -lpsapi
endif
libeglib_static_la_LIBADD = $(libeglib_la_LIBADD) $(LIBICONV)
libeglib_static_la_LIBADD = $(libeglib_la_LIBADD)
libeglib_static_la_LDFLAGS = -static
MAINTAINERCLEANFILES = Makefile.in
+3 -2
View File
@@ -29,14 +29,15 @@ typedef signed @GSIZE@ gssize;
#define G_GSIZE_FORMAT @GSIZE_FORMAT@
#define G_GUINT64_FORMAT @G_GUINT64_FORMAT@
#define G_GINT64_FORMAT @G_GINT64_FORMAT@
#define G_GUINT32_FORMAT @G_GUINT32_FORMAT@
#define G_GINT32_FORMAT @G_GINT32_FORMAT@
#if @G_HAVE_ISO_VARARGS@ == 1
#define G_HAVE_ISO_VARARGS
#endif
#if defined (__native_client__)
#define sem_trywait(x) sem_wait(x)
#define sem_timedwait(x,y) sem_wait(x)
#define getdtablesize() (32768)
#undef G_BREAKPOINT
#define G_BREAKPOINT()
#endif
+3 -3
View File
@@ -33,15 +33,12 @@ typedef int pid_t;
#define GINT_TO_POINTER(v) ((gpointer)(intptr_t) (v))
#define GUINT_TO_POINTER(v) ((gpointer)(intptr_t) (v))
/* VS 2010 and later have stdint.h */
#if defined(_MSC_VER) && _MSC_VER < 1600
#define INT32_MAX 2147483647
#define INT32_MIN (~ INT32_MAX)
#define INT64_MAX 9223372036854775807i64
#define INT64_MIN (~INT64_MAX)
#define UINT32_MAX 0xffffffffU
#define UINT64_MAX 0xffffffffffffffffULL
#endif
#define STDOUT_FILENO (int)(intptr_t)stdout
#define STDERR_FILENO (int)(intptr_t)stderr
@@ -65,6 +62,8 @@ typedef int pid_t;
#undef G_HAVE_STRNDUP
#define G_HAVE_GETOPT_H 1
int vasprintf(char **ret, const char *fmt, va_list ap);
/* 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
@@ -73,4 +72,5 @@ typedef int pid_t;
#endif
typedef void * GPid;
#endif
+2 -42
View File
@@ -5,16 +5,11 @@
#define g_array_new monoeg_g_array_new
#define g_array_remove_index monoeg_g_array_remove_index
#define g_array_remove_index_fast monoeg_g_array_remove_index_fast
#define g_array_set_size monoeg_g_array_set_size
#define g_array_sized_new monoeg_g_array_sized_new
#define g_ascii_strdown monoeg_g_ascii_strdown
#define g_ascii_strncasecmp monoeg_g_ascii_strncasecmp
#define g_ascii_tolower monoeg_g_ascii_tolower
#define g_ascii_xdigit_value monoeg_g_ascii_xdigit_value
#define g_build_path monoeg_g_build_path
#define g_byte_array_append monoeg_g_byte_array_append
#define g_byte_array_free monoeg_g_byte_array_free
#define g_byte_array_new monoeg_g_byte_array_new
#define g_clear_error monoeg_g_clear_error
#define g_convert monoeg_g_convert
#define g_convert_error_quark monoeg_g_convert_error_quark
@@ -22,16 +17,13 @@
#define g_dir_open monoeg_g_dir_open
#define g_dir_read_name monoeg_g_dir_read_name
#define g_dir_rewind monoeg_g_dir_rewind
#define g_mkdir_with_parents monoeg_g_mkdir_with_parents
#define g_direct_equal monoeg_g_direct_equal
#define g_direct_hash monoeg_g_direct_hash
#define g_error_free monoeg_g_error_free
#define g_error_new monoeg_g_error_new
#define g_error_vnew monoeg_g_error_vnew
#define g_file_error_quark monoeg_g_file_error_quark
#define g_file_error_from_errno monoeg_g_file_error_from_errno
#define g_file_get_contents monoeg_g_file_get_contents
#define g_file_set_contents monoeg_g_file_set_contents
#define g_file_open_tmp monoeg_g_file_open_tmp
#define g_file_test monoeg_g_file_test
#define g_filename_from_uri monoeg_g_filename_from_uri
@@ -53,23 +45,17 @@
#define g_hash_table_foreach monoeg_g_hash_table_foreach
#define g_hash_table_foreach_remove monoeg_g_hash_table_foreach_remove
#define g_hash_table_foreach_steal monoeg_g_hash_table_foreach_steal
#define g_hash_table_get_keys monoeg_g_hash_table_get_keys
#define g_hash_table_get_values monoeg_g_hash_table_get_values
#define g_hash_table_insert_replace monoeg_g_hash_table_insert_replace
#define g_hash_table_lookup monoeg_g_hash_table_lookup
#define g_hash_table_lookup_extended monoeg_g_hash_table_lookup_extended
#define g_hash_table_new monoeg_g_hash_table_new
#define g_hash_table_new_full monoeg_g_hash_table_new_full
#define g_hash_table_remove monoeg_g_hash_table_remove
#define g_hash_table_steal monoeg_g_hash_table_steal
#define g_hash_table_size monoeg_g_hash_table_size
#define g_hash_table_print_stats monoeg_g_hash_table_print_stats
#define g_hash_table_remove_all monoeg_g_hash_table_remove_all
#define g_hash_table_iter_init monoeg_g_hash_table_iter_init
#define g_hash_table_iter_next monoeg_g_hash_table_iter_next
#define g_iconv monoeg_g_iconv
#define g_iconv_close monoeg_g_iconv_close
#define g_iconv_open monoeg_g_iconv_open
#define g_int_equal monoeg_g_int_equal
#define g_int_hash monoeg_g_int_hash
#define g_list_alloc monoeg_g_list_alloc
@@ -92,7 +78,6 @@
#define g_list_nth_data monoeg_g_list_nth_data
#define g_list_prepend monoeg_g_list_prepend
#define g_list_remove monoeg_g_list_remove
#define g_list_remove_all monoeg_g_list_remove_all
#define g_list_remove_link monoeg_g_list_remove_link
#define g_list_reverse monoeg_g_list_reverse
#define g_list_sort monoeg_g_list_sort
@@ -134,7 +119,6 @@
#define g_ptr_array_sized_new monoeg_g_ptr_array_sized_new
#define g_ptr_array_sort monoeg_g_ptr_array_sort
#define g_ptr_array_sort_with_data monoeg_g_ptr_array_sort_with_data
#define g_qsort_with_data monoeg_g_qsort_with_data
#define g_queue_free monoeg_g_queue_free
#define g_queue_is_empty monoeg_g_queue_is_empty
#define g_queue_foreach monoeg_g_queue_foreach
@@ -176,7 +160,6 @@
#define g_spawn_async_with_pipes monoeg_g_spawn_async_with_pipes
#define g_spawn_command_line_sync monoeg_g_spawn_command_line_sync
#define g_sprintf monoeg_g_sprintf
#define g_stpcpy monoeg_g_stpcpy
#define g_str_equal monoeg_g_str_equal
#define g_str_has_prefix monoeg_g_str_has_prefix
#define g_str_has_suffix monoeg_g_str_has_suffix
@@ -195,17 +178,12 @@
#define g_string_append monoeg_g_string_append
#define g_string_append_c monoeg_g_string_append_c
#define g_string_append_len monoeg_g_string_append_len
#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
#define g_string_truncate monoeg_g_string_truncate
#define g_strjoin monoeg_g_strjoin
@@ -223,7 +201,6 @@
#define g_timer_start monoeg_g_timer_start
#define g_timer_stop monoeg_g_timer_stop
#define g_trailingBytesForUTF8 monoeg_g_trailingBytesForUTF8
#define g_ucs4_to_utf8 monoeg_g_ucs4_to_utf8
#define g_ucs4_to_utf16 monoeg_g_ucs4_to_utf16
#define g_unichar_case monoeg_g_unichar_case
#define g_unichar_isxdigit monoeg_g_unichar_isxdigit
@@ -237,20 +214,11 @@
#define g_utf16_to_ucs4 monoeg_g_utf16_to_ucs4
#define g_utf16_to_utf8 monoeg_g_utf16_to_utf8
#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
#define g_utf8_strdown monoeg_g_utf8_strdown
#define g_utf8_strlen monoeg_g_utf8_strlen
#define g_utf8_strup monoeg_g_utf8_strup
#define g_utf8_to_ucs4_fast monoeg_g_utf8_to_ucs4_fast
#define g_utf8_to_utf16 monoeg_g_utf8_to_utf16
#define g_utf8_validate monoeg_g_utf8_validate
#define g_unichar_to_utf8 monoeg_g_unichar_to_utf8
#define g_unichar_is_space monoeg_g_unichar_is_space
#define g_unicode_break_type monoeg_g_unicode_break_type
#define g_utf8_offset_to_pointer monoeg_g_utf8_offset_to_pointer
#define g_utf8_pointer_to_offset monoeg_g_utf8_pointer_to_offset
#define g_utf8_to_ucs4_fast monoeg_g_utf8_to_ucs4_fast
#define g_win32_getlocale monoeg_g_win32_getlocale
#define g_assertion_message monoeg_assertion_message
#define g_malloc monoeg_malloc
@@ -262,14 +230,6 @@
#define g_strdup monoeg_strdup
#define g_ucs4_to_utf16_len monoeg_ucs4_to_utf16_len
#define g_utf16_to_ucs4_len monoeg_utf16_to_ucs4_len
#define g_byte_array_free monoeg_g_byte_array_free
#define g_byte_array_new monoeg_g_byte_array_new
#define g_ascii_strcasecmp monoeg_ascii_strcasecmp
#define g_ascii_strup monoeg_ascii_strup
#define g_ascii_toupper monoeg_ascii_toupper
#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
+15 -47
View File
@@ -39,28 +39,30 @@ typedef struct {
gboolean clear_;
guint element_size;
gboolean zero_terminated;
guint capacity;
gint capacity;
} GArrayPriv;
static void
ensure_capacity (GArrayPriv *priv, guint capacity)
ensure_capacity (GArrayPriv *priv,
int capacity)
{
guint new_capacity;
if (capacity <= priv->capacity)
int new_capacity = MAX (priv->capacity, INITIAL_CAPACITY);
if (capacity < priv->capacity)
return;
new_capacity = (capacity + 63) & ~63;
priv->array.data = g_realloc (priv->array.data, element_length (priv, new_capacity));
while (new_capacity < capacity) {
new_capacity <<= 1;
}
capacity = new_capacity;
priv->array.data = (gchar*)g_realloc (priv->array.data, element_length (priv, capacity));
if (priv->clear_) {
memset (element_offset (priv, priv->capacity),
0,
element_length (priv, new_capacity - priv->capacity));
element_length (priv, capacity - priv->capacity));
}
priv->capacity = new_capacity;
priv->capacity = capacity;
}
GArray *
@@ -78,22 +80,6 @@ g_array_new (gboolean zero_terminated,
return (GArray*)rv;
}
GArray *
g_array_sized_new (gboolean zero_terminated,
gboolean clear_,
guint element_size,
guint reserved_size)
{
GArrayPriv *rv = g_new0 (GArrayPriv, 1);
rv->zero_terminated = zero_terminated;
rv->clear_ = clear_;
rv->element_size = element_size;
ensure_capacity (rv, reserved_size);
return (GArray*)rv;
}
gchar*
g_array_free (GArray *array,
gboolean free_segment)
@@ -218,21 +204,3 @@ g_array_remove_index_fast (GArray *array,
return array;
}
void
g_array_set_size (GArray *array, gint length)
{
GArrayPriv *priv = (GArrayPriv*)array;
g_return_if_fail (array != NULL);
g_return_if_fail (length >= 0);
if (length == priv->capacity)
return; // nothing to be done
if (length > priv->capacity) {
// grow the array
ensure_capacity (priv, length);
}
array->len = length;
}
+49 -5
View File
@@ -29,23 +29,67 @@
#include <stdlib.h>
#include <glib.h>
#define INITIAL_CAPACITY 16
static void
ensure_capacity (GByteArray *array,
int capacity)
{
int new_capacity = MAX (array->len, INITIAL_CAPACITY);
if (capacity < array->len)
return;
while (new_capacity < capacity) {
new_capacity <<= 1;
}
capacity = new_capacity;
array->data = (guint8*) g_realloc (array->data, capacity);
memset (array->data + array->len, 0, capacity - array->len);
array->len = capacity;
}
GByteArray *
g_byte_array_new ()
{
return (GByteArray *) g_array_new (FALSE, TRUE, 1);
GByteArray *rv = g_new0 (GByteArray, 1);
ensure_capacity (rv, INITIAL_CAPACITY);
return rv;
}
guint8*
g_byte_array_free (GByteArray *array,
gboolean free_segment)
{
return (guint8*) g_array_free ((GArray *)array, free_segment);
guint8* rv = NULL;
g_return_val_if_fail (array != NULL, NULL);
if (free_segment)
g_free (array->data);
else
rv = array->data;
g_free (array);
return rv;
}
GByteArray *
g_byte_array_append (GByteArray *array,
const guint8 *data,
g_array_append (GByteArray *array,
guint8 *data,
guint len)
{
return (GByteArray *)g_array_append_vals ((GArray *)array, data, len);
g_return_val_if_fail (array != NULL, NULL);
ensure_capacity (array, array->len + len);
memmove (array->data + array->len, data, len);
array->len += len;
return array;
}
-38
View File
@@ -105,42 +105,4 @@ g_dir_close (GDir *dir)
g_free (dir);
}
int
g_mkdir_with_parents (const gchar *pathname, int mode)
{
char *path, *d;
int rv;
if (!pathname || *pathname == '\0') {
errno = EINVAL;
return -1;
}
d = path = g_strdup (pathname);
if (*d == '/')
d++;
while (TRUE) {
if (*d == '/' || *d == '\0') {
char orig = *d;
*d = '\0';
rv = mkdir (path, mode);
if (rv == -1 && errno != EEXIST) {
g_free (path);
return -1;
}
*d++ = orig;
while (orig == '/' && *d == '/')
d++;
if (orig == '\0')
break;
} else {
d++;
}
}
g_free (path);
return 0;
}
+5 -5
View File
@@ -47,14 +47,14 @@ g_dir_open (const gchar *path, guint flags, GError **error)
GDir *dir;
gunichar2* path_utf16;
gunichar2* path_utf16_search;
WIN32_FIND_DATAW find_data;
WIN32_FIND_DATA find_data;
g_return_val_if_fail (path != 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((wchar_t *) path_utf16) + 3)*sizeof(gunichar2));
path_utf16_search = g_malloc ((wcslen(path_utf16) + 3)*sizeof(gunichar2));
wcscpy (path_utf16_search, path_utf16);
wcscat (path_utf16_search, L"\\*");
@@ -72,7 +72,7 @@ g_dir_open (const gchar *path, guint flags, GError **error)
g_free (path_utf16_search);
g_free (path_utf16);
while ((wcscmp ((wchar_t *) find_data.cFileName, L".") == 0) || (wcscmp ((wchar_t *) find_data.cFileName, L"..") == 0)) {
while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0)) {
if (!FindNextFileW (dir->handle, &find_data)) {
if (error) {
gint err = errno;
@@ -91,7 +91,7 @@ g_dir_open (const gchar *path, guint flags, GError **error)
const gchar *
g_dir_read_name (GDir *dir)
{
WIN32_FIND_DATAW find_data;
WIN32_FIND_DATA find_data;
g_return_val_if_fail (dir != NULL && dir->handle != 0, NULL);
@@ -111,7 +111,7 @@ g_dir_read_name (GDir *dir)
dir->next = NULL;
return dir->current;
}
} while ((wcscmp ((wchar_t *) find_data.cFileName, L".") == 0) || (wcscmp ((wchar_t *) find_data.cFileName, L"..") == 0));
} while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0));
dir->next = u16to8 (find_data.cFileName);
return dir->current;
+4 -15
View File
@@ -29,18 +29,16 @@
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/types.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <fcntl.h>
#include <errno.h>
#ifdef _MSC_VER
#include <direct.h>
#endif
#ifdef G_OS_WIN32
int mkstemp (char *tmp_template);
#endif
@@ -154,15 +152,6 @@ g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
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;
@@ -181,5 +170,5 @@ g_get_current_dir (void)
* so we return the buffer here since it has a pointer to the valid string
*/
return buffer;
#endif
}
+5 -1
View File
@@ -29,10 +29,12 @@
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
@@ -78,3 +80,5 @@ g_file_test (const gchar *filename, GFileTest test)
}
return FALSE;
}
-5
View File
@@ -39,13 +39,9 @@
#ifdef G_OS_WIN32
#include <io.h>
#define open _open
#ifndef S_ISREG
#define S_ISREG(x) ((x & _S_IFMT) == _S_IFREG)
#endif
#ifndef S_ISDIR
#define S_ISDIR(x) ((x & _S_IFMT) == _S_IFDIR)
#endif
#endif
int mkstemp (char *tmp_template)
{
@@ -61,7 +57,6 @@ int mkstemp (char *tmp_template)
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_EXCL, _S_IREAD | _S_IWRITE);
}
/* FIXME: this will crash if utf16_template == NULL */
sprintf (tmp_template + strlen (tmp_template) - 6, "%S", utf16_template + wcslen (utf16_template) - 6);
g_free (utf16_template);
-63
View File
@@ -25,25 +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 <glib.h>
#include <stdio.h>
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <errno.h>
static gpointer error_quark = "FileError";
gpointer
g_file_error_quark (void)
{
return error_quark;
}
GFileError
g_file_error_from_errno (gint err_no)
{
@@ -105,53 +91,4 @@ g_file_error_from_errno (gint err_no)
}
}
#ifdef G_OS_WIN32
#define TMP_FILE_FORMAT "%.*s%s.tmp"
#else
#define TMP_FILE_FORMAT "%.*s.%s~"
#endif
gboolean
g_file_set_contents (const gchar *filename, const gchar *contents, gssize length, GError **err)
{
const char *name;
char *path;
FILE *fp;
if (!(name = strrchr (filename, G_DIR_SEPARATOR)))
name = filename;
else
name++;
path = g_strdup_printf (TMP_FILE_FORMAT, name - filename, filename, name);
if (!(fp = fopen (path, "wb"))) {
g_set_error (err, G_FILE_ERROR, g_file_error_from_errno (errno), "%s", g_strerror (errno));
g_free (path);
return FALSE;
}
if (length < 0)
length = strlen (contents);
if (fwrite (contents, 1, length, fp) < length) {
g_set_error (err, G_FILE_ERROR, g_file_error_from_errno (ferror (fp)), "%s", g_strerror (ferror (fp)));
g_unlink (path);
g_free (path);
fclose (fp);
return FALSE;
}
fclose (fp);
if (g_rename (path, filename) != 0) {
g_set_error (err, G_FILE_ERROR, g_file_error_from_errno (errno), "%s", g_strerror (errno));
g_unlink (path);
g_free (path);
return FALSE;
}
g_free (path);
return TRUE;
}
+2 -66
View File
@@ -264,37 +264,6 @@ g_hash_table_insert_replace (GHashTable *hash, gpointer key, gpointer value, gbo
sanity_check (hash);
}
GList*
g_hash_table_get_keys (GHashTable *hash)
{
GHashTableIter iter;
GList *rv = NULL;
gpointer key;
g_hash_table_iter_init (&iter, hash);
while (g_hash_table_iter_next (&iter, &key, NULL))
rv = g_list_prepend (rv, key);
return g_list_reverse (rv);
}
GList*
g_hash_table_get_values (GHashTable *hash)
{
GHashTableIter iter;
GList *rv = NULL;
gpointer value;
g_hash_table_iter_init (&iter, hash);
while (g_hash_table_iter_next (&iter, NULL, &value))
rv = g_list_prepend (rv, value);
return g_list_reverse (rv);
}
guint
g_hash_table_size (GHashTable *hash)
{
@@ -329,10 +298,8 @@ g_hash_table_lookup_extended (GHashTable *hash, gconstpointer key, gpointer *ori
for (s = hash->table [hashcode]; s != NULL; s = s->next){
if ((*equal)(s->key, key)){
if (orig_key)
*orig_key = s->key;
if (value)
*value = s->value;
*orig_key = s->key;
*value = s->value;
return TRUE;
}
}
@@ -469,37 +436,6 @@ g_hash_table_foreach_remove (GHashTable *hash, GHRFunc func, gpointer user_data)
return count;
}
gboolean
g_hash_table_steal (GHashTable *hash, gconstpointer key)
{
GEqualFunc equal;
Slot *s, *last;
guint hashcode;
g_return_val_if_fail (hash != NULL, FALSE);
sanity_check (hash);
equal = hash->key_equal_func;
hashcode = ((*hash->hash_func)(key)) % hash->table_size;
last = NULL;
for (s = hash->table [hashcode]; s != NULL; s = s->next){
if ((*equal)(s->key, key)) {
if (last == NULL)
hash->table [hashcode] = s->next;
else
last->next = s->next;
g_free (s);
hash->in_use--;
sanity_check (hash);
return TRUE;
}
last = s;
}
sanity_check (hash);
return FALSE;
}
guint
g_hash_table_foreach_steal (GHashTable *hash, GHRFunc func, gpointer user_data)
{
-1370
View File
File diff suppressed because it is too large. Load diff
+111 -243
View File
@@ -11,10 +11,6 @@
#ifdef _MSC_VER
#pragma include_alias(<eglib-config.h>, <eglib-config.hw>)
#endif
/* VS 2010 and later have stdint.h */
#if defined(_MSC_VER) && _MSC_VER < 1600
#else
#include <stdint.h>
#endif
@@ -28,11 +24,6 @@
#include <alloca.h>
#endif
#ifdef WIN32
/* For alloca */
#include <malloc.h>
#endif
#ifndef offsetof
# define offsetof(s_name,n_name) (size_t)(char *)&(((s_name*)0)->m_name)
#endif
@@ -49,12 +40,6 @@
G_BEGIN_DECLS
#ifdef G_OS_WIN32
/* MSC and Cross-compilatin will use this */
int vasprintf (char **strp, const char *fmt, va_list ap);
#endif
/*
* Basic data types
*/
@@ -70,19 +55,19 @@ typedef char gchar;
typedef unsigned char guchar;
#if !G_TYPES_DEFINED
/* VS 2010 and later have stdint.h */
#if defined(_MSC_VER) && _MSC_VER < 1600
typedef __int8 gint8;
#ifdef _MSC_VER
typedef __int8 gint8;
typedef unsigned __int8 guint8;
typedef __int16 gint16;
typedef __int16 gint16;
typedef unsigned __int16 guint16;
typedef __int32 gint32;
typedef __int32 gint32;
typedef unsigned __int32 guint32;
typedef __int64 gint64;
typedef __int64 gint64;
typedef unsigned __int64 guint64;
typedef float gfloat;
typedef double gdouble;
typedef int gboolean;
typedef float gfloat;
typedef double gdouble;
typedef unsigned __int16 gunichar2;
typedef int gboolean;
#else
/* Types defined in terms of the stdint.h */
typedef int8_t gint8;
@@ -95,13 +80,11 @@ typedef int64_t gint64;
typedef uint64_t guint64;
typedef float gfloat;
typedef double gdouble;
typedef uint16_t gunichar2;
typedef int32_t gboolean;
#endif
#endif
typedef guint16 gunichar2;
typedef guint32 gunichar;
/*
* Macros
*/
@@ -110,13 +93,9 @@ typedef guint32 gunichar;
#define FALSE 0
#define TRUE 1
#define G_MINSHORT SHRT_MIN
#define G_MAXSHORT SHRT_MAX
#define G_MAXUSHORT USHRT_MAX
#define G_MAXINT INT_MAX
#define G_MININT INT_MIN
#define G_MAXINT32 INT32_MAX
#define G_MAXUINT32 UINT32_MAX
#define G_MININT32 INT32_MIN
#define G_MININT64 INT64_MIN
#define G_MAXINT64 INT64_MAX
@@ -129,9 +108,7 @@ typedef guint32 gunichar;
#define G_USEC_PER_SEC 1000000
#ifndef ABS
#define ABS(a) ((a) > 0 ? (a) : -(a))
#endif
#define G_STRUCT_OFFSET(p_type,field) offsetof(p_type,field)
@@ -193,10 +170,65 @@ gchar* g_win32_getlocale(void);
/*
* Precondition macros
*/
#define g_warn_if_fail(x) G_STMT_START { if (!(x)) { g_warning ("%s:%d: assertion '%s' failed", __FILE__, __LINE__, #x); } } G_STMT_END
#define g_return_if_fail(x) G_STMT_START { if (!(x)) { g_critical ("%s:%d: assertion '%s' failed", __FILE__, __LINE__, #x); return; } } G_STMT_END
#define g_return_val_if_fail(x,e) G_STMT_START { if (!(x)) { g_critical ("%s:%d: assertion '%s' failed", __FILE__, __LINE__, #x); return (e); } } G_STMT_END
/*
* Hashtables
*/
typedef struct _GHashTable GHashTable;
typedef struct _GHashTableIter GHashTableIter;
/* Private, but needed for stack allocation */
struct _GHashTableIter
{
gpointer dummy [8];
};
typedef void (*GFunc) (gpointer data, gpointer user_data);
typedef gint (*GCompareFunc) (gconstpointer a, gconstpointer b);
typedef gint (*GCompareDataFunc) (gconstpointer a, gconstpointer b, gpointer user_data);
typedef void (*GHFunc) (gpointer key, gpointer value, gpointer user_data);
typedef gboolean (*GHRFunc) (gpointer key, gpointer value, gpointer user_data);
typedef void (*GDestroyNotify) (gpointer data);
typedef guint (*GHashFunc) (gconstpointer key);
typedef gboolean (*GEqualFunc) (gconstpointer a, gconstpointer b);
typedef void (*GFreeFunc) (gpointer data);
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);
void g_hash_table_insert_replace (GHashTable *hash, gpointer key, gpointer value, gboolean replace);
guint g_hash_table_size (GHashTable *hash);
gpointer g_hash_table_lookup (GHashTable *hash, gconstpointer key);
gboolean g_hash_table_lookup_extended (GHashTable *hash, gconstpointer key, gpointer *orig_key, gpointer *value);
void g_hash_table_foreach (GHashTable *hash, GHFunc func, gpointer user_data);
gpointer g_hash_table_find (GHashTable *hash, GHRFunc predicate, gpointer user_data);
gboolean g_hash_table_remove (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);
void g_hash_table_destroy (GHashTable *hash);
void g_hash_table_print_stats (GHashTable *table);
void g_hash_table_iter_init (GHashTableIter *iter, GHashTable *hash_table);
gboolean g_hash_table_iter_next (GHashTableIter *iter, gpointer *key, gpointer *value);
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)
gboolean g_direct_equal (gconstpointer v1, gconstpointer v2);
guint g_direct_hash (gconstpointer v1);
gboolean g_int_equal (gconstpointer v1, gconstpointer v2);
guint g_int_hash (gconstpointer v1);
gboolean g_str_equal (gconstpointer v1, gconstpointer v2);
guint g_str_hash (gconstpointer v1);
#define g_assert(x) G_STMT_START { if (!(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__); } G_STMT_END
/*
* Errors
*/
@@ -252,16 +284,11 @@ gint g_snprintf (gchar *string, gulong n, gchar const *format, ..
#define g_vsnprintf vsnprintf
#define g_vasprintf vasprintf
gsize g_strlcpy (gchar *dest, const gchar *src, gsize dest_size);
gchar *g_stpcpy (gchar *dest, const char *src);
gsize g_strlcpy (gchar *dest, const gchar *src, gsize dest_size);
gchar g_ascii_tolower (gchar c);
gchar g_ascii_toupper (gchar c);
gchar *g_ascii_strdown (const gchar *str, gssize len);
gchar *g_ascii_strup (const gchar *str, gssize len);
gint g_ascii_strncasecmp (const gchar *s1, const gchar *s2, gsize n);
gint g_ascii_strcasecmp (const gchar *s1, const gchar *s2);
gint g_ascii_xdigit_value (gchar c);
#define g_ascii_isspace(c) (isspace (c) != 0)
#define g_ascii_isalpha(c) (isalpha (c) != 0)
@@ -271,15 +298,16 @@ gint g_ascii_xdigit_value (gchar c);
/* FIXME: g_strcasecmp supports utf8 unicode stuff */
#ifdef _MSC_VER
#define g_strcasecmp stricmp
#define g_ascii_strcasecmp stricmp
#define g_strncasecmp strnicmp
#define g_strstrip(a) g_strchug (g_strchomp (a))
#else
#define g_strcasecmp strcasecmp
#define g_ascii_strcasecmp strcasecmp
#define g_ascii_strtoull strtoull
#define g_strncasecmp strncasecmp
#define g_strstrip(a) g_strchug (g_strchomp (a))
#endif
#define g_ascii_strdup strdup
#define G_STR_DELIMITERS "_-|> <."
@@ -300,29 +328,14 @@ gchar *g_string_free (GString *string, gboolean free_segment);
GString *g_string_append (GString *string, const gchar *val);
void g_string_printf (GString *string, const gchar *format, ...);
void g_string_append_printf (GString *string, const gchar *format, ...);
void g_string_append_vprintf (GString *string, const gchar *format, va_list args);
GString *g_string_append_unichar (GString *string, gunichar c);
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
typedef void (*GFunc) (gpointer data, gpointer user_data);
typedef gint (*GCompareFunc) (gconstpointer a, gconstpointer b);
typedef gint (*GCompareDataFunc) (gconstpointer a, gconstpointer b, gpointer user_data);
typedef void (*GHFunc) (gpointer key, gpointer value, gpointer user_data);
typedef gboolean (*GHRFunc) (gpointer key, gpointer value, gpointer user_data);
typedef void (*GDestroyNotify) (gpointer data);
typedef guint (*GHashFunc) (gconstpointer key);
typedef gboolean (*GEqualFunc) (gconstpointer a, gconstpointer b);
typedef void (*GFreeFunc) (gpointer data);
/*
* Lists
*/
@@ -418,8 +431,6 @@ GList *g_list_find_custom (GList *list,
GCompareFunc func);
GList *g_list_remove (GList *list,
gconstpointer data);
GList *g_list_remove_all (GList *list,
gconstpointer data);
GList *g_list_reverse (GList *list);
GList *g_list_remove_link (GList *list,
GList *link);
@@ -434,52 +445,6 @@ GList *g_list_insert_before (GList *list,
GList *g_list_sort (GList *sort,
GCompareFunc func);
/*
* Hashtables
*/
typedef struct _GHashTable GHashTable;
typedef struct _GHashTableIter GHashTableIter;
/* Private, but needed for stack allocation */
struct _GHashTableIter
{
gpointer dummy [8];
};
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);
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);
gpointer g_hash_table_lookup (GHashTable *hash, gconstpointer key);
gboolean g_hash_table_lookup_extended (GHashTable *hash, gconstpointer key, gpointer *orig_key, gpointer *value);
void g_hash_table_foreach (GHashTable *hash, GHFunc func, gpointer user_data);
gpointer g_hash_table_find (GHashTable *hash, GHRFunc predicate, gpointer user_data);
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);
void g_hash_table_destroy (GHashTable *hash);
void g_hash_table_print_stats (GHashTable *table);
void g_hash_table_iter_init (GHashTableIter *iter, GHashTable *hash_table);
gboolean g_hash_table_iter_next (GHashTableIter *iter, gpointer *key, gpointer *value);
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)
gboolean g_direct_equal (gconstpointer v1, gconstpointer v2);
guint g_direct_hash (gconstpointer v1);
gboolean g_int_equal (gconstpointer v1, gconstpointer v2);
guint g_int_hash (gconstpointer v1);
gboolean g_str_equal (gconstpointer v1, gconstpointer v2);
guint g_str_hash (gconstpointer v1);
/*
* ByteArray
*/
@@ -505,24 +470,16 @@ struct _GArray {
};
GArray *g_array_new (gboolean zero_terminated, gboolean clear_, guint element_size);
GArray *g_array_sized_new (gboolean zero_terminated, gboolean clear_, guint element_size, guint reserved_size);
gchar* g_array_free (GArray *array, gboolean free_segment);
GArray *g_array_append_vals (GArray *array, gconstpointer data, guint len);
GArray* g_array_insert_vals (GArray *array, guint index_, gconstpointer data, guint len);
GArray* g_array_remove_index (GArray *array, guint index_);
GArray* g_array_remove_index_fast (GArray *array, guint index_);
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))
/*
* QSort
*/
void g_qsort_with_data (gpointer base, size_t nmemb, size_t size, GCompareDataFunc compare, gpointer user_data);
/*
* Pointer Array
*/
@@ -625,6 +582,7 @@ gpointer g_convert_error_quark(void);
* only used if the old collation code is activated, so this is only the
* bare minimum to build.
*/
typedef guint32 gunichar;
typedef enum {
G_UNICODE_CONTROL,
@@ -659,53 +617,12 @@ typedef enum {
G_UNICODE_SPACE_SEPARATOR
} GUnicodeType;
typedef enum {
G_UNICODE_BREAK_MANDATORY,
G_UNICODE_BREAK_CARRIAGE_RETURN,
G_UNICODE_BREAK_LINE_FEED,
G_UNICODE_BREAK_COMBINING_MARK,
G_UNICODE_BREAK_SURROGATE,
G_UNICODE_BREAK_ZERO_WIDTH_SPACE,
G_UNICODE_BREAK_INSEPARABLE,
G_UNICODE_BREAK_NON_BREAKING_GLUE,
G_UNICODE_BREAK_CONTINGENT,
G_UNICODE_BREAK_SPACE,
G_UNICODE_BREAK_AFTER,
G_UNICODE_BREAK_BEFORE,
G_UNICODE_BREAK_BEFORE_AND_AFTER,
G_UNICODE_BREAK_HYPHEN,
G_UNICODE_BREAK_NON_STARTER,
G_UNICODE_BREAK_OPEN_PUNCTUATION,
G_UNICODE_BREAK_CLOSE_PUNCTUATION,
G_UNICODE_BREAK_QUOTATION,
G_UNICODE_BREAK_EXCLAMATION,
G_UNICODE_BREAK_IDEOGRAPHIC,
G_UNICODE_BREAK_NUMERIC,
G_UNICODE_BREAK_INFIX_SEPARATOR,
G_UNICODE_BREAK_SYMBOL,
G_UNICODE_BREAK_ALPHABETIC,
G_UNICODE_BREAK_PREFIX,
G_UNICODE_BREAK_POSTFIX,
G_UNICODE_BREAK_COMPLEX_CONTEXT,
G_UNICODE_BREAK_AMBIGUOUS,
G_UNICODE_BREAK_UNKNOWN,
G_UNICODE_BREAK_NEXT_LINE,
G_UNICODE_BREAK_WORD_JOINER,
G_UNICODE_BREAK_HANGUL_L_JAMO,
G_UNICODE_BREAK_HANGUL_V_JAMO,
G_UNICODE_BREAK_HANGUL_T_JAMO,
G_UNICODE_BREAK_HANGUL_LV_SYLLABLE,
G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE
} GUnicodeBreakType;
gunichar g_unichar_toupper (gunichar c);
gunichar g_unichar_tolower (gunichar c);
gunichar g_unichar_totitle (gunichar c);
GUnicodeType g_unichar_type (gunichar c);
gboolean g_unichar_isspace (gunichar c);
gboolean g_unichar_isxdigit (gunichar c);
gint g_unichar_xdigit_value (gunichar c);
GUnicodeBreakType g_unichar_break_type (gunichar c);
#ifndef MAX
#define MAX(a,b) (((a)>(b)) ? (a) : (b))
@@ -727,9 +644,6 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
#define G_UNLIKELY(x) (x)
#endif
#define g_assert(x) G_STMT_START { if (G_UNLIKELY (!(x))) g_assertion_message ("* Assertion at %s:%d, condition `%s' not met\n", __FILE__, __LINE__, #x); } G_STMT_END
#define g_assert_not_reached() G_STMT_START { g_assertion_message ("* Assertion: should not be reached at %s:%d\n", __FILE__, __LINE__); } G_STMT_END
/*
* Unicode conversion
*/
@@ -745,22 +659,17 @@ typedef enum {
G_CONVERT_ERROR_NOT_ABSOLUTE_PATH
} GConvertError;
gchar *g_utf8_strup (const gchar *str, gssize len);
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);
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);
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);
gunichar2 *g_ucs4_to_utf16 (const gunichar *str, glong len, glong *items_read, glong *items_written, GError **err);
gchar* g_utf8_strup (const gchar *str, gssize len);
gchar* g_utf8_strdown (const gchar *str, gssize len);
gunichar2 *g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **error);
gchar *g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **error);
gunichar2 *g_ucs4_to_utf16 (const gunichar *str, glong len, glong *items_read, glong *items_written, GError **error);
gunichar *g_utf16_to_ucs4 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **error);
#define u8to16(str) g_utf8_to_utf16(str, (glong)strlen(str), NULL, NULL, NULL)
#ifdef G_OS_WIN32
#define u16to8(str) g_utf16_to_utf8((gunichar2 *) (str), (glong)wcslen((wchar_t *) (str)), NULL, NULL, NULL)
#define u16to8(str) g_utf16_to_utf8(str, (glong)wcslen(str), NULL, NULL, NULL)
#else
#define u16to8(str) g_utf16_to_utf8(str, (glong)strlen(str), NULL, NULL, NULL)
#endif
@@ -836,10 +745,6 @@ void g_usleep (gulong microseconds);
* File
*/
gpointer g_file_error_quark (void);
#define G_FILE_ERROR g_file_error_quark ()
typedef enum {
G_FILE_ERROR_EXIST,
G_FILE_ERROR_ISDIR,
@@ -877,24 +782,11 @@ typedef enum {
} GFileTest;
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 **error);
gboolean g_file_test (const gchar *filename, GFileTest test);
#define g_open open
#define g_rename rename
#define g_stat stat
#define g_unlink unlink
#define g_fopen fopen
#define g_lstat lstat
#define g_rmdir rmdir
#define g_mkstemp mkstemp
#define g_ascii_isdigit isdigit
#define g_ascii_strtod strtod
#define g_ascii_isalnum isalnum
/*
* Pattern matching
*/
@@ -911,8 +803,6 @@ 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);
int g_mkdir_with_parents (const gchar *pathname, int mode);
#define g_mkdir mkdir
/*
@@ -969,11 +859,14 @@ gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
/*
* Character set conversion
*/
typedef struct _GIConv *GIConv;
gsize g_iconv (GIConv cd, gchar **inbytes, gsize *inbytesleft, gchar **outbytes, gsize *outbytesleft);
GIConv g_iconv_open (const gchar *to_charset, const gchar *from_charset);
int g_iconv_close (GIConv cd);
/*
* Index into the table below with the first byte of a UTF-8 sequence to
* get the number of trailing bytes that are supposed to follow it.
* Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
* left as-is for anyone who may want to do such conversion, which was
* allowed in earlier algorithms.
*/
extern const gchar g_trailingBytesForUTF8[256];
gboolean g_get_charset (G_CONST_RETURN char **charset);
gchar *g_locale_to_utf8 (const gchar *opsysstring, gssize len,
@@ -986,27 +879,10 @@ gchar *g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *byte
gchar *g_convert (const gchar *str, gssize len,
const gchar *to_codeset, const gchar *from_codeset,
gsize *bytes_read, gsize *bytes_written, GError **error);
/*
* Unicode manipulation
*/
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);
gchar *g_utf8_offset_to_pointer (const gchar *str, glong offset);
glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
/*
* priorities
*/
#define G_PRIORITY_DEFAULT 0
#define G_PRIORITY_DEFAULT_IDLE 200
#define g_utf8_next_char(p) p + (g_trailingBytesForUTF8[(guchar)(*p)] + 1)
/*
* Empty thread functions, not used by eglib
@@ -1036,48 +912,40 @@ glong g_utf8_pointer_to_offset (const gchar *str, const gchar *pos);
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
# define GUINT64_FROM_BE(x) GUINT64_SWAP_LE_BE(x)
# define GUINT32_FROM_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT32_TO_LE(x) (x)
# define GUINT64_TO_LE(x) (x)
# define GUINT16_TO_LE(x) (x)
# define GUINT_TO_LE(x) (x)
# define GUINT32_TO_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT16_FROM_BE(x) GUINT16_SWAP_LE_BE(x)
# define GUINT_FROM_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT64_FROM_LE(x) (x)
# define GUINT32_FROM_LE(x) (x)
# define GUINT16_FROM_LE(x) (x)
# define GUINT_FROM_LE(x) (x)
# define GUINT64_TO_BE(x) GUINT64_SWAP_LE_BE(x)
# define GUINT32_TO_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT16_TO_BE(x) GUINT16_SWAP_LE_BE(x)
# define GUINT_TO_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT64_TO_LE(x) (x)
# define GUINT32_TO_LE(x) (x)
# define GUINT16_TO_LE(x) (x)
# define GUINT_TO_LE(x) (x)
# define GUINT32_FROM_BE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT64_FROM_BE(x) GUINT64_SWAP_LE_BE(x)
# define GINT16_FROM_BE(x) GUINT16_SWAP_LE_BE(x)
# define GINT32_FROM_BE(x) GUINT32_SWAP_LE_BE(x)
# define GINT64_FROM_BE(x) GUINT64_SWAP_LE_BE(x)
#else
# define GUINT64_FROM_BE(x) (x)
# define GUINT32_FROM_BE(x) (x)
# define GUINT32_TO_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT64_TO_LE(x) GUINT64_SWAP_LE_BE(x)
# define GUINT16_TO_LE(x) GUINT16_SWAP_LE_BE(x)
# define GUINT_TO_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT32_TO_BE(x) (x)
# define GUINT16_FROM_BE(x) (x)
# define GUINT_FROM_BE(x) (x)
# define GUINT64_FROM_LE(x) GUINT64_SWAP_LE_BE(x)
# define GUINT32_FROM_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT16_FROM_LE(x) GUINT16_SWAP_LE_BE(x)
# define GUINT_FROM_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT64_TO_BE(x) (x)
# define GUINT32_TO_BE(x) (x)
# define GUINT16_TO_BE(x) (x)
# define GUINT_TO_BE(x) (x)
# define GUINT64_TO_LE(x) GUINT64_SWAP_LE_BE(x)
# define GUINT32_TO_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT16_TO_LE(x) GUINT16_SWAP_LE_BE(x)
# define GUINT_TO_LE(x) GUINT32_SWAP_LE_BE(x)
# define GUINT32_FROM_BE(x) (x)
# define GUINT64_FROM_BE(x) (x)
# define GINT16_FROM_BE(x) (x)
# define GINT32_FROM_BE(x) (x)
# define GINT64_FROM_BE(x) (x)
#endif
#define GINT64_FROM_BE(x) (GUINT64_TO_BE (x))
#define GINT32_FROM_BE(x) (GUINT32_TO_BE (x))
#define GINT16_FROM_BE(x) (GUINT16_TO_BE (x))
#define GINT64_FROM_LE(x) (GUINT64_TO_LE (x))
#define GINT32_FROM_LE(x) (GUINT32_TO_LE (x))
#define GINT16_FROM_LE(x) (GUINT16_TO_LE (x))
#define GUINT32_FROM_LE(x) (GUINT32_TO_LE (x))
#define GUINT64_FROM_LE(x) (GUINT64_TO_LE (x))
#define GUINT16_FROM_LE(x) (GUINT16_TO_LE (x))
#define GUINT_FROM_LE(x) (GUINT_TO_LE (x))
#define _EGLIB_MAJOR 2
#define _EGLIB_MIDDLE 4
#define _EGLIB_MINOR 0
-19
View File
@@ -125,25 +125,6 @@ g_list_remove (GList *list, gconstpointer data)
return list;
}
GList*
g_list_remove_all (GList *list, gconstpointer data)
{
GList *current = g_list_find (list, data);
if (!current)
return list;
while (current) {
if (current == list)
list = list->next;
g_list_free_1 (disconnect_node (current));
current = g_list_find (list, data);
}
return list;
}
GList*
g_list_remove_link (GList *list, GList *link)
{
+1 -1
View File
@@ -276,7 +276,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
switch (context->state){
case START:
if (c == ' ' || c == '\t' || c == '\f' || c == '\n' || (c & 0x80))
if (c == ' ' || c == '\t' || c == '\f' || c == '\n')
continue;
if (c == '<'){
if (p+1 < end && p [1] == '?'){
+7 -10
View File
@@ -80,19 +80,17 @@ g_unsetenv(const gchar *variable)
{
gunichar2 *var;
var = u8to16(variable);
SetEnvironmentVariableW(var, L"");
SetEnvironmentVariableW(var, TEXT(""));
g_free(var);
}
gchar*
g_win32_getlocale(void)
{
LCID lcid = GetThreadLocale();
gchar buf[19];
gint ccBuf = GetLocaleInfo(lcid, LOCALE_SISO639LANGNAME, buf, 9);
buf[ccBuf - 1] = '-';
ccBuf += GetLocaleInfo(lcid, LOCALE_SISO3166CTRYNAME, buf + ccBuf, 9);
return strdup(buf);
/* FIXME: Use GetThreadLocale
* and convert LCID to standard
* string form, "en_US" */
return strdup ("en_US");
}
gboolean
@@ -100,15 +98,14 @@ g_path_is_absolute (const char *filename)
{
g_return_val_if_fail (filename != NULL, FALSE);
if (filename[0] != '\0' && filename[1] != '\0') {
if (filename[1] == ':' && filename[2] != '\0' &&
if (filename[0] != '\0' && filename[1] != '\0')
if (filename[1] == ':' && filename[2] != '\0' &&
(filename[2] == '\\' || filename[2] == '/'))
return TRUE;
/* UNC paths */
else if (filename[0] == '\\' && filename[1] == '\\' &&
filename[2] != '\0')
return TRUE;
}
return FALSE;
}
+39 -3
View File
@@ -28,12 +28,46 @@
* 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 <gmodule.h>
#if defined(G_OS_UNIX) && defined(HAVE_DLFCN_H)
#if defined(__native_client__)
GModule *
g_module_open (const gchar *file, GModuleFlags flags)
{
printf("dlopen() not supported on Native Client.\n");
return NULL;
}
gboolean
g_module_symbol (GModule *module, const gchar *symbol_name, gpointer *symbol)
{
return FALSE;
}
const gchar*
g_module_error(void)
{
return "dlopen not supported on Native Client.";
}
gboolean
g_module_close (GModule *module)
{
return FALSE;
}
gchar*
g_module_build_path (const gchar *directory, const gchar *module_name)
{
return NULL;
}
#else
#ifdef G_OS_UNIX
#include <dlfcn.h>
/* For Linux and Solaris, need to add others as we port this */
@@ -288,3 +322,5 @@ g_module_build_path (const gchar *directory, const gchar *module_name)
return g_strdup_printf ("%s%s" LIBSUFFIX, lib_prefix, module_name);
}
#endif /* __native_client__ */
+1 -2
View File
@@ -53,7 +53,7 @@ g_module_open (const gchar *file, GModuleFlags flags)
gunichar2 *file16;
file16 = u8to16(file);
module->main_module = FALSE;
module->handle = LoadLibraryW (file16);
module->handle = LoadLibrary (file16);
g_free(file16);
if (!module->handle) {
g_free (module);
@@ -141,7 +141,6 @@ g_module_error (void)
TCHAR* buf = NULL;
DWORD code = GetLastError ();
/* FIXME: buf must not be NULL! */
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL,
code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, 0, NULL);
+9 -50
View File
@@ -5,8 +5,6 @@
* 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
@@ -26,7 +24,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 <stdlib.h>
#include <glib.h>
@@ -58,30 +55,6 @@ out_vfprintf (FILE *ignore, const gchar *format, va_list args)
/* TODO: provide a proper app name */
__android_log_vprint (ANDROID_LOG_ERROR, "mono", format, args);
}
#elif MONOTOUCH && defined(__arm__)
#include <asl.h>
static int
to_asl_priority (GLogLevelFlags log_level)
{
switch (log_level & G_LOG_LEVEL_MASK)
{
case G_LOG_LEVEL_ERROR: return ASL_LEVEL_CRIT;
case G_LOG_LEVEL_CRITICAL: return ASL_LEVEL_ERR;
case G_LOG_LEVEL_WARNING: return ASL_LEVEL_WARNING;
case G_LOG_LEVEL_MESSAGE: return ASL_LEVEL_NOTICE;
case G_LOG_LEVEL_INFO: return ASL_LEVEL_INFO;
case G_LOG_LEVEL_DEBUG: return ASL_LEVEL_DEBUG;
}
return ASL_LEVEL_ERR;
}
static void
out_vfprintf (FILE *ignore, const gchar *format, va_list args)
{
asl_vlog (NULL, NULL, ASL_LEVEL_WARNING, format, args);
}
#else
static void
out_vfprintf (FILE *file, const gchar *format, va_list args)
@@ -138,29 +111,18 @@ g_log_set_fatal_mask (const gchar *log_domain, GLogLevelFlags fatal_mask)
void
g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format, va_list args)
{
#if PLATFORM_ANDROID
__android_log_vprint (to_android_priority (log_level), log_domain, format, args);
#elif MONOTOUCH && defined(__arm__)
asl_vlog (NULL, NULL, to_asl_priority (log_level), format, args);
#else
char *msg;
if (vasprintf (&msg, format, args) < 0)
return;
#ifdef G_OS_WIN32
vasprintf (&msg, format, args);
#if PLATFORM_ANDROID
__android_log_print (to_android_priority (log_level),
/* TODO: provide a proper app name */
"mono", "%s%s%s",
log_domain != NULL ? log_domain : "",
log_domain != NULL ? ": " : "",
msg);
#else
printf ("%s%s%s\n",
log_domain != NULL ? log_domain : "",
log_domain != NULL ? ": " : "",
msg);
#else
#if MONOTOUCH
FILE *target = stderr;
#else
FILE *target = stdout;
#endif
fprintf (target, "%s%s%s\n",
log_domain != NULL ? log_domain : "",
log_domain != NULL ? ": " : "",
msg);
@@ -169,9 +131,6 @@ g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format,
if (log_level & fatal){
fflush (stdout);
fflush (stderr);
}
#endif
if (log_level & fatal){
abort ();
}
}
+33 -59
View File
@@ -41,69 +41,44 @@
gchar *
g_build_path (const gchar *separator, const gchar *first_element, ...)
{
const char *elem, *next, *endptr;
gboolean trimmed;
GString *path;
va_list args;
GString *result;
const char *s, *p, *next;
size_t slen;
va_list args;
g_return_val_if_fail (separator != NULL, NULL);
path = g_string_sized_new (48);
if (first_element == NULL)
return g_strdup ("");
result = g_string_sized_new (48);
slen = strlen (separator);
va_start (args, first_element);
for (elem = first_element; elem != NULL; elem = next) {
/* trim any trailing separators from @elem */
endptr = elem + strlen (elem);
trimmed = FALSE;
while (endptr >= elem + slen) {
if (strncmp (endptr - slen, separator, slen) != 0)
break;
endptr -= slen;
trimmed = TRUE;
for (s = first_element; s != NULL; s = next){
next = va_arg (args, char *);
p = (s + strlen (s));
if (next && p - slen > s){
for (; strncmp (p-slen, separator, slen) == 0; ){
p -= slen;
}
}
/* append elem, not including any trailing separators */
if (endptr > elem)
g_string_append_len (path, elem, endptr - elem);
/* get the next element */
do {
if (!(next = va_arg (args, char *)))
break;
/* remove leading separators */
while (!strncmp (next, separator, slen))
g_string_append_len (result, s, p - s);
if (next && *next){
if (strncmp (separator, result->str + strlen (result->str) - slen, slen))
g_string_append (result, separator);
for (; strncmp (next, separator, slen) == 0; )
next += slen;
} while (*next == '\0');
if (next || trimmed)
g_string_append_len (path, separator, slen);
}
}
g_string_append_c (result, 0);
va_end (args);
return g_string_free (path, FALSE);
}
static gchar*
strrchr_seperator (const gchar* filename)
{
#ifdef G_OS_WIN32
char *p2;
#endif
char *p;
p = strrchr (filename, G_DIR_SEPARATOR);
#ifdef G_OS_WIN32
p2 = strrchr (filename, '/');
if (p2 > p)
p = p2;
#endif
return p;
return g_string_free (result, FALSE);
}
gchar *
@@ -113,7 +88,7 @@ g_path_get_dirname (const gchar *filename)
size_t count;
g_return_val_if_fail (filename != NULL, NULL);
p = strrchr_seperator (filename);
p = strrchr (filename, G_DIR_SEPARATOR);
if (p == NULL)
return g_strdup (".");
if (p == filename)
@@ -137,7 +112,7 @@ g_path_get_basename (const char *filename)
return g_strdup (".");
/* No separator -> filename */
r = strrchr_seperator (filename);
r = strrchr (filename, G_DIR_SEPARATOR);
if (r == NULL)
return g_strdup (filename);
@@ -145,7 +120,7 @@ g_path_get_basename (const char *filename)
if (r [1] == 0){
char *copy = g_strdup (filename);
copy [r-filename] = 0;
r = strrchr_seperator (copy);
r = strrchr (copy, G_DIR_SEPARATOR);
if (r == NULL){
g_free (copy);
@@ -216,10 +191,10 @@ cont:
gchar *
g_find_program_in_path (const gchar *program)
{
char *p;
char *x, *l;
char *p = g_strdup (g_getenv ("PATH"));
char *x = p, *l;
gchar *curdir = NULL;
char *save = NULL;
char *save;
#ifdef G_OS_WIN32
char *program_exe;
char *suffix_list[5] = {".exe",".cmd",".bat",".com",NULL};
@@ -228,7 +203,6 @@ g_find_program_in_path (const gchar *program)
#endif
g_return_val_if_fail (program != NULL, NULL);
x = p = g_strdup (g_getenv ("PATH"));
if (x == NULL || *x == '\0') {
curdir = g_get_current_dir ();
+8 -10
View File
@@ -3,10 +3,8 @@
*
* Author:
* Aaron Bockover ([email protected])
* Gonzalo Paniagua Javier ([email protected])
* Jeffrey Stedfast ([email protected])
*
* (C) 2006,2011 Novell, Inc.
* (C) 2006 Novell, Inc.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@@ -59,7 +57,7 @@ g_ptr_array_grow(GPtrArrayPriv *array, guint length)
}
GPtrArray *
g_ptr_array_new(void)
g_ptr_array_new()
{
return g_ptr_array_sized_new(0);
}
@@ -211,17 +209,17 @@ g_ptr_array_foreach(GPtrArray *array, GFunc func, gpointer user_data)
}
void
g_ptr_array_sort(GPtrArray *array, GCompareFunc compare)
g_ptr_array_sort(GPtrArray *array, GCompareFunc compare_func)
{
g_return_if_fail(array != NULL);
qsort(array->pdata, array->len, sizeof(gpointer), compare);
qsort(array->pdata, array->len, sizeof(gpointer), compare_func);
}
void
g_ptr_array_sort_with_data (GPtrArray *array, GCompareDataFunc compare, gpointer user_data)
g_ptr_array_sort_with_data(GPtrArray *array, GCompareDataFunc compare_func,
gpointer user_data)
{
g_return_if_fail (array != NULL);
g_qsort_with_data (array->pdata, array->len, sizeof (gpointer), compare, user_data);
}
-165
View File
@@ -1,165 +0,0 @@
/*
* QuickSort
*
* Author: Jeffrey Stedfast <[email protected]>
*
* (C) 2011 Novell, 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 <stdlib.h>
#include <glib.h>
/* Any segment <= this threshold will be sorted using insertion
* sort. OpenBSD seems to use a value of 7 so we'll go with that for
* now... */
#define MAX_THRESHOLD 7
#define STACK_SIZE (8 * sizeof (size_t))
typedef struct _QSortStack {
char *array;
size_t count;
} QSortStack;
#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) { \
long __n = size / sizeof (TYPE); \
register TYPE *__a = (TYPE *) (a); \
register TYPE *__b = (TYPE *) (b); \
register TYPE t; \
\
do { \
t = *__a; \
*__a++ = *__b; \
*__b++ = t; \
} while (--__n > 0); \
}
#define SWAPBYTE(a, b) SWAPTYPE(char, (a), (b))
#define SWAPLONG(a, b) SWAPTYPE(long, (a), (b))
#define SWAP(a, b) if (swaplong) SWAPLONG((a), (b)) else SWAPBYTE((a), (b))
/* check if we can swap by longs rather than bytes by making sure that
* memory is properly aligned and that the element size is a multiple
* of sizeof (long) */
#define SWAP_INIT() swaplong = (((char *) base) - ((char *) 0)) % sizeof (long) == 0 && (size % sizeof (long)) == 0
void
g_qsort_with_data (gpointer base, size_t nmemb, size_t size, GCompareDataFunc compare, gpointer user_data)
{
QSortStack stack[STACK_SIZE], *sp;
register char *i, *k, *mid;
size_t n, n1, n2;
char *lo, *hi;
int swaplong;
if (nmemb <= 1)
return;
SWAP_INIT ();
/* initialize our stack */
sp = stack;
QSORT_PUSH (sp, base, nmemb);
do {
QSORT_POP (sp, lo, n);
hi = lo + (n - 1) * size;
if (n < MAX_THRESHOLD) {
/* switch to insertion sort */
for (i = lo + size; i <= hi; i += size)
for (k = i; k > lo && compare (k - size, k, user_data) > 0; k -= size)
SWAP (k - size, k);
continue;
}
/* calculate the middle element */
mid = lo + (n / 2) * size;
/* once we re-order the lo, mid, and hi elements to be in
* ascending order, we'll use mid as our pivot. */
if (compare (mid, lo, user_data) < 0) {
SWAP (mid, lo);
}
if (compare (hi, mid, user_data) < 0) {
SWAP (mid, hi);
if (compare (mid, lo, user_data) < 0) {
SWAP (mid, lo);
}
}
/* since we've already guaranteed that lo <= mid and mid <= hi,
* we can skip comparing them again */
i = lo + size;
k = hi - size;
do {
/* find the first element with a value > pivot value */
while (i < k && compare (i, mid, user_data) <= 0)
i += size;
/* find the last element with a value <= pivot value */
while (k >= i && compare (mid, k, user_data) < 0)
k -= size;
if (k <= i)
break;
SWAP (i, k);
/* make sure we keep track of our pivot element */
if (mid == i) {
mid = k;
} else if (mid == k) {
mid = i;
}
i += size;
k -= size;
} while (1);
if (k != mid) {
/* swap the pivot with the last element in the first partition */
SWAP (mid, k);
}
/* calculate segment sizes */
n2 = (hi - k) / size;
n1 = (k - lo) / size;
/* push our partitions onto the stack, largest first
* (to make sure we don't run out of stack space) */
if (n2 > n1) {
if (n2 > 1) QSORT_PUSH (sp, k + size, n2);
if (n1 > 1) QSORT_PUSH (sp, lo, n1);
} else {
if (n1 > 1) QSORT_PUSH (sp, lo, n1);
if (n2 > 1) QSORT_PUSH (sp, k + size, n2);
}
} while (sp > stack);
}
+2 -2
View File
@@ -57,7 +57,7 @@ split_cmdline (const gchar *cmdline, GPtrArray *array, GError **error)
} else if (quote_char) {
if (c == quote_char) {
quote_char = '\0';
if (fresh && (g_ascii_isspace (*ptr) || *ptr == '\0')){
if (fresh && g_ascii_isspace (*ptr)){
g_ptr_array_add (array, g_string_free (str, FALSE));
str = g_string_new ("");
}
@@ -225,7 +225,7 @@ g_shell_unquote (const gchar *quoted_string, GError **error)
}
} else if (*p == '\\'){
char c = *(++p);
if (!(c == '$' || c == '"' || c == '\\' || c == '`' || c == '\'' || c == 0 ))
if (!(c == '$' || c == '"' || c == '\\' || c == '`' || c == 0))
g_string_append_c (result, '\\');
if (c == 0)
break;
+4 -27
View File
@@ -79,7 +79,6 @@ gchar ***_NSGetEnviron();
extern char **environ;
#endif
#ifndef G_OS_WIN32
static int
safe_read (int fd, gchar *buffer, gint count, GError **error)
{
@@ -186,28 +185,6 @@ create_pipe (int *fds, GError **error)
}
return TRUE;
}
#endif /* G_OS_WIN32 */
static int
write_all (int fd, const void *vbuf, size_t n)
{
const char *buf = (const char *) vbuf;
size_t nwritten = 0;
int w;
do {
do {
w = write (fd, buf + nwritten, n - nwritten);
} while (w == -1 && errno == EINTR);
if (w == -1)
return -1;
nwritten += w;
} while (nwritten < n);
return nwritten;
}
gboolean
g_spawn_command_line_sync (const gchar *command_line,
@@ -382,12 +359,12 @@ g_spawn_async_with_pipes (const gchar *working_directory,
if ((flags & G_SPAWN_DO_NOT_REAP_CHILD) == 0) {
pid = getpid ();
NO_INTR (unused, write_all (info_pipe [1], &pid, sizeof (pid_t)));
NO_INTR (unused, write (info_pipe [1], &pid, sizeof (pid_t)));
}
if (working_directory && chdir (working_directory) == -1) {
int err = errno;
NO_INTR (unused, write_all (info_pipe [1], &err, sizeof (int)));
NO_INTR (unused, write (info_pipe [1], &err, sizeof (int)));
exit (0);
}
@@ -429,13 +406,13 @@ g_spawn_async_with_pipes (const gchar *working_directory,
arg0 = g_find_program_in_path (argv [0]);
if (arg0 == NULL) {
int err = ENOENT;
write_all (info_pipe [1], &err, sizeof (int));
write (info_pipe [1], &err, sizeof (int));
exit (0);
}
}
execve (arg0, actual_args, envp);
write_all (info_pipe [1], &errno, sizeof (int));
write (info_pipe [1], &errno, sizeof (int));
exit (0);
}
} else if ((flags & G_SPAWN_DO_NOT_REAP_CHILD) == 0) {
+31 -98
View File
@@ -251,12 +251,8 @@ g_strsplit (const gchar *string, const gchar *delimiter, gint max_tokens)
}
if (*string) {
if (strcmp (string, delimiter) == 0)
add_to_vector (&vector, size, g_strdup (""));
else {
/* Add the rest of the string as the last element */
add_to_vector (&vector, size, g_strdup (string));
}
/* Add the rest of the string as the last element */
add_to_vector (&vector, size, g_strdup (string));
size++;
}
@@ -355,21 +351,21 @@ g_strsplit_set (const gchar *string, const gchar *delimiter, gint max_tokens)
gchar *
g_strreverse (gchar *str)
{
size_t i, j;
size_t len, half;
size_t i;
gchar c;
if (str == NULL)
return NULL;
if (*str == 0)
return str;
for (i = 0, j = strlen (str) - 1; i < j; i++, j--) {
len = strlen (str);
half = len / 2;
len--;
for (i = 0; i < half; i++, len--) {
c = str [i];
str [i] = str [j];
str [j] = c;
str [i] = str [len];
str [len] = c;
}
return str;
}
@@ -377,14 +373,13 @@ gchar *
g_strjoin (const gchar *separator, ...)
{
va_list args;
char *res, *s, *r;
char *res, *s;
size_t len, slen;
if (separator != NULL)
slen = strlen (separator);
else
slen = 0;
len = 0;
va_start (args, separator);
for (s = va_arg (args, char *); s != NULL; s = va_arg (args, char *)){
@@ -392,22 +387,21 @@ g_strjoin (const gchar *separator, ...)
len += slen;
}
va_end (args);
if (len == 0)
return g_strdup ("");
/* Remove the last separator */
if (slen > 0 && len > 0)
len -= slen;
res = g_malloc (len + 1);
len++;
res = g_malloc (len);
va_start (args, separator);
s = va_arg (args, char *);
r = g_stpcpy (res, s);
strcpy (res, s);
for (s = va_arg (args, char *); s != NULL; s = va_arg (args, char *)){
if (separator != NULL)
r = g_stpcpy (r, separator);
r = g_stpcpy (r, s);
strcat (res, separator);
strcat (res, s);
}
va_end (args);
@@ -417,7 +411,7 @@ g_strjoin (const gchar *separator, ...)
gchar *
g_strjoinv (const gchar *separator, gchar **str_array)
{
char *res, *r;
char *res;
size_t slen, len, i;
if (separator != NULL)
@@ -430,21 +424,18 @@ g_strjoinv (const gchar *separator, gchar **str_array)
len += strlen (str_array [i]);
len += slen;
}
if (len == 0)
return g_strdup ("");
if (slen > 0 && len > 0)
len -= slen;
res = g_malloc (len + 1);
r = g_stpcpy (res, str_array [0]);
len++;
res = g_malloc (len);
strcpy (res, str_array [0]);
for (i = 1; str_array [i] != NULL; i++){
if (separator != NULL)
r = g_stpcpy (r, separator);
r = g_stpcpy (r, str_array [i]);
strcat (res, separator);
strcat (res, str_array [i]);
}
return res;
}
@@ -710,31 +701,6 @@ g_ascii_strdown (const gchar *str, gssize len)
return ret;
}
gchar
g_ascii_toupper (gchar c)
{
return c >= 'a' && c <= 'z' ? c + ('A' - 'a') : c;
}
gchar *
g_ascii_strup (const gchar *str, gssize len)
{
char *ret;
int i;
g_return_val_if_fail (str != NULL, NULL);
if (len == -1)
len = strlen (str);
ret = g_malloc (len + 1);
for (i = 0; i < len; i++)
ret [i] = (guchar) g_ascii_toupper (str [i]);
ret [i] = 0;
return ret;
}
gint
g_ascii_strncasecmp (const gchar *s1, const gchar *s2, gsize n)
{
@@ -743,35 +709,20 @@ g_ascii_strncasecmp (const gchar *s1, const gchar *s2, gsize n)
g_return_val_if_fail (s1 != NULL, 0);
g_return_val_if_fail (s2 != NULL, 0);
for (i = 0; i < n; i++) {
for (i = 0; i < n; i++){
gchar c1 = g_ascii_tolower (*s1++);
gchar c2 = g_ascii_tolower (*s2++);
if (c1 != c2)
return c1 - c2;
}
return 0;
}
gint
g_ascii_strcasecmp (const gchar *s1, const gchar *s2)
{
const char *sp1 = s1;
const char *sp2 = s2;
g_return_val_if_fail (s1 != NULL, 0);
g_return_val_if_fail (s2 != NULL, 0);
while (*sp1 != '\0') {
char c1 = g_ascii_tolower (*sp1++);
char c2 = g_ascii_tolower (*sp2++);
if (c1 == c2)
continue;
if (c1 != c2)
return c1 - c2;
if (c1 == 0)
return -1;
if (c2 == 0)
return 1;
return c1-c2;
}
return (*sp1) - (*sp2);
return 0;
}
gchar *
@@ -827,24 +778,6 @@ g_strlcpy (gchar *dest, const gchar *src, gsize dest_size)
#endif
}
gchar *
g_stpcpy (gchar *dest, const char *src)
{
g_return_val_if_fail (dest != NULL, dest);
g_return_val_if_fail (src != NULL, dest);
#if HAVE_STPCPY
return stpcpy (dest, src);
#else
while (*src)
*dest++ = *src++;
*dest = '\0';
return dest;
#endif
}
static const gchar escaped_dflt [256] = {
1, 1, 1, 1, 1, 1, 1, 1, 'b', 't', 'n', 1, 'f', 'r', 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+2 -77
View File
@@ -132,20 +132,6 @@ g_string_append_c (GString *string, gchar c)
return string;
}
GString *
g_string_append_unichar (GString *string, gunichar c)
{
gchar utf8[6];
gint len;
g_return_val_if_fail (string != NULL, NULL);
if ((len = g_unichar_to_utf8 (c, utf8)) <= 0)
return string;
return g_string_append_len (string, utf8, len);
}
GString *
g_string_prepend (GString *string, const gchar *val)
{
@@ -163,24 +149,6 @@ g_string_prepend (GString *string, const gchar *val)
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, ...)
{
@@ -198,19 +166,6 @@ g_string_append_printf (GString *string, const gchar *format, ...)
g_free (ret);
}
void
g_string_append_vprintf (GString *string, const gchar *format, va_list args)
{
char *ret;
g_return_if_fail (string != NULL);
g_return_if_fail (format != NULL);
ret = g_strdup_vprintf (format, args);
g_string_append (string, ret);
g_free (ret);
}
void
g_string_printf (GString *string, const gchar *format, ...)
{
@@ -235,42 +190,12 @@ g_string_truncate (GString *string, gsize len)
g_return_val_if_fail (string != NULL, string);
/* Silent return */
if (len >= string->len)
if (len < 0 || len >= string->len) {
return string;
}
string->len = len;
string->str[len] = 0;
return string;
}
GString *
g_string_set_size (GString *string, gsize len)
{
g_return_val_if_fail (string != NULL, string);
GROW_IF_NECESSARY(string, len);
string->len = 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;
}
+229 -24
View File
@@ -43,26 +43,57 @@
/* FIXME */
# define CODESET 1
# include <windows.h>
# ifdef _MSC_VER
typedef int iconv_t;
# endif
#else
# ifdef HAVE_LANGINFO_H
# include <langinfo.h>
# endif
# ifdef HAVE_ICONV_H
# include <iconv.h>
# endif
# ifdef HAVE_LOCALCHARSET_H
# include <localcharset.h>
# endif
#endif
static const char *my_charset;
static char *my_charset;
static gboolean is_utf8;
/*
* Character set conversion
*/
/*
* Index into the table below with the first byte of a UTF-8 sequence to
* get the number of trailing bytes that are supposed to follow it.
* Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
* left as-is for anyone who may want to do such conversion, which was
* allowed in earlier algorithms.
*/
const gchar g_trailingBytesForUTF8 [256] = {
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,0,0
};
/*
* Magic values subtracted from a buffer value during UTF8 conversion.
* This table contains as many values as there might be trailing bytes
* in a UTF-8 sequence.
*/
static const gulong offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
0x03C82080UL, 0xFA082080UL, 0x82082080UL };
GUnicodeType
g_unichar_type (gunichar c)
{
int i;
int i;
guint16 cp = (guint16) c;
for (i = 0; i < unicode_category_ranges_count; i++) {
@@ -99,13 +130,6 @@ g_unichar_type (gunichar c)
return 0;
}
GUnicodeBreakType
g_unichar_break_type (gunichar c)
{
// MOONLIGHT_FIXME
return G_UNICODE_BREAK_UNKNOWN;
}
gunichar
g_unichar_case (gunichar c, gboolean upper)
{
@@ -179,19 +203,84 @@ g_unichar_xdigit_value (gunichar c)
return -1;
}
gboolean
g_unichar_isspace (gunichar c)
gchar *
g_convert (const gchar *str, gssize len,
const gchar *to_codeset, const gchar *from_codeset,
gsize *bytes_read, gsize *bytes_written, GError **error)
{
GUnicodeType type = g_unichar_type (c);
if (type == G_UNICODE_LINE_SEPARATOR ||
type == G_UNICODE_PARAGRAPH_SEPARATOR ||
type == G_UNICODE_SPACE_SEPARATOR)
return TRUE;
char *result = NULL;
#ifdef G_OS_WIN32
#elif HAVE_ICONV_H
iconv_t convertor;
char *buffer, *output;
const char *strptr = (const char *) str;
size_t str_len = len == -1 ? strlen (str) : len;
size_t buffer_size;
size_t left, out_left;
convertor = iconv_open (to_codeset, from_codeset);
if (convertor == (iconv_t) -1){
if (bytes_written)
*bytes_written = 0;
if (bytes_read)
*bytes_read = 0;
return NULL;
}
return FALSE;
buffer_size = str_len + 1 + 8;
buffer = g_malloc (buffer_size);
out_left = str_len;
output = buffer;
left = str_len;
while (left > 0){
int res = iconv (convertor, (char **) &strptr, &left, &output, &out_left);
if (res == (size_t) -1){
if (errno == E2BIG){
char *n;
size_t extra_space = 8 + left;
size_t output_used = output - buffer;
buffer_size += extra_space;
n = g_realloc (buffer, buffer_size);
if (n == NULL){
if (error != NULL)
*error = g_error_new (NULL, G_CONVERT_ERROR_FAILED, "No memory left");
g_free (buffer);
result = NULL;
goto leave;
}
buffer = n;
out_left += extra_space;
output = buffer + output_used;
} else if (errno == EILSEQ){
if (error != NULL)
*error = g_error_new (NULL, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "Invalid multi-byte sequence on input");
result = NULL;
g_free (buffer);
goto leave;
} else if (errno == EINVAL){
if (error != NULL)
*error = g_error_new (NULL, G_CONVERT_ERROR_PARTIAL_INPUT, "Partial character sequence");
result = NULL;
g_free (buffer);
goto leave;
}
}
}
if (bytes_read != NULL)
*bytes_read = strptr - str;
if (bytes_written != NULL)
*bytes_written = output - buffer;
*output = 0;
result = buffer;
leave:
iconv_close (convertor);
#endif
return result;
}
/*
* This is broken, and assumes an UTF8 system, but will do for eglib's first user
*/
@@ -211,13 +300,13 @@ g_filename_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gs
gboolean
g_get_charset (G_CONST_RETURN char **charset)
{
if (my_charset == NULL) {
#ifdef G_OS_WIN32
static char buf [14];
sprintf (buf, "CP%u", GetACP ());
my_charset = buf;
is_utf8 = FALSE;
static char buf[14];
sprintf (buf, "CP%u", GetACP ());
*charset = buf;
is_utf8 = FALSE;
#else
if (my_charset == NULL){
/* These shouldn't be heap allocated */
#if HAVE_LOCALCHARSET_H
my_charset = locale_charset ();
@@ -227,12 +316,12 @@ g_get_charset (G_CONST_RETURN char **charset)
my_charset = "UTF-8";
#endif
is_utf8 = strcmp (my_charset, "UTF-8") == 0;
#endif
}
if (charset != NULL)
*charset = my_charset;
#endif
return is_utf8;
}
@@ -251,3 +340,119 @@ g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsiz
return g_convert (utf8string, len, my_charset, "UTF-8", bytes_read, bytes_written, error);
}
/**
* g_utf8_validate
* @utf: Pointer to putative UTF-8 encoded string.
*
* Checks @utf for being valid UTF-8. @utf is assumed to be
* null-terminated. This function is not super-strict, as it will
* allow longer UTF-8 sequences than necessary. Note that Java is
* capable of producing these sequences if provoked. Also note, this
* routine checks for the 4-byte maximum size, but does not check for
* 0x10ffff maximum value.
*
* Return value: true if @utf is valid.
**/
gboolean
g_utf8_validate (const gchar *str, gssize max_len, const gchar **end)
{
gssize byteCount = 0;
gboolean retVal = TRUE;
gboolean lastRet = TRUE;
guchar* ptr = (guchar*) str;
guint length;
guchar a;
guchar* srcPtr;
if (max_len == 0)
return 0;
else if (max_len < 0)
byteCount = max_len;
while (*ptr != 0 && byteCount <= max_len) {
length = g_trailingBytesForUTF8 [*ptr] + 1;
srcPtr = (guchar*) ptr + length;
switch (length) {
default: retVal = FALSE;
/* Everything else falls through when "TRUE"... */
case 4: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
if ((a == (guchar) 0xBF || a == (guchar) 0xBE) && *(srcPtr-1) == (guchar) 0xBF) {
if (*(srcPtr-2) == (guchar) 0x8F || *(srcPtr-2) == (guchar) 0x9F ||
*(srcPtr-2) == (guchar) 0xAF || *(srcPtr-2) == (guchar) 0xBF)
retVal = FALSE;
}
case 3: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
case 2: if ((a = (*--srcPtr)) < (guchar) 0x80 || a > (guchar) 0xBF) retVal = FALSE;
switch (*ptr) {
/* no fall-through in this inner switch */
case 0xE0: if (a < (guchar) 0xA0) retVal = FALSE; break;
case 0xED: if (a > (guchar) 0x9F) retVal = FALSE; break;
case 0xEF: if (a == (guchar)0xB7 && (*(srcPtr+1) > (guchar) 0x8F && *(srcPtr+1) < 0xB0)) retVal = FALSE;
if (a == (guchar)0xBF && (*(srcPtr+1) == (guchar) 0xBE || *(srcPtr+1) == 0xBF)) retVal = FALSE; break;
case 0xF0: if (a < (guchar) 0x90) retVal = FALSE; break;
case 0xF4: if (a > (guchar) 0x8F) retVal = FALSE; break;
default: if (a < (guchar) 0x80) retVal = FALSE;
}
case 1: if (*ptr >= (guchar ) 0x80 && *ptr < (guchar) 0xC2) retVal = FALSE;
}
if (*ptr > (guchar) 0xF4)
retVal = FALSE;
//If the string is invalid, set the end to the invalid byte.
if (!retVal && lastRet) {
if (end != NULL)
*end = (gchar*) ptr;
lastRet = FALSE;
}
ptr += length;
if(max_len > 0)
byteCount += length;
}
if (retVal && end != NULL)
*end = (gchar*) ptr;
return retVal;
}
/**
* g_utf8_get_char
* @src: Pointer to UTF-8 encoded character.
*
* Return value: UTF-16 value of @src
**/
gunichar
g_utf8_get_char (const gchar *src)
{
gunichar ch = 0;
guchar* ptr = (guchar*) src;
gushort extraBytesToRead = g_trailingBytesForUTF8 [*ptr];
switch (extraBytesToRead) {
case 5: ch += *ptr++; ch <<= 6; // remember, illegal UTF-8
case 4: ch += *ptr++; ch <<= 6; // remember, illegal UTF-8
case 3: ch += *ptr++; ch <<= 6;
case 2: ch += *ptr++; ch <<= 6;
case 1: ch += *ptr++; ch <<= 6;
case 0: ch += *ptr;
}
ch -= offsetsFromUTF8 [extraBytesToRead];
return ch;
}
glong
g_utf8_strlen (const gchar *str, gssize max)
{
gssize byteCount = 0;
guchar* ptr = (guchar*) str;
glong length = 0;
if (max == 0)
return 0;
else if (max < 0)
byteCount = max;
while (*ptr != 0 && byteCount <= max) {
gssize cLen = g_trailingBytesForUTF8 [*ptr] + 1;
if (max > 0 && (byteCount + cLen) > max)
return length;
ptr += cLen;
length++;
if (max > 0)
byteCount += cLen;
}
return length;
}
+562 -318
View File
@@ -5,369 +5,613 @@
* Atsushi Enomoto <[email protected]>
*
* (C) 2006 Novell, Inc.
* Copyright 2012 Xamarin Inc
*/
#include <stdio.h>
#include <glib.h>
/*
* Index into the table below with the first byte of a UTF-8 sequence to get
* the number of bytes that are supposed to follow it to complete the sequence.
*
* Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is left
* as-is for anyone who may want to do such conversion, which was allowed in
* earlier algorithms.
*/
const guchar g_utf8_jump_table[256] = {
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3, 4,4,4,4,4,4,4,4,5,5,5,5,6,6,1,1
};
gpointer error_quark = "ERROR";
static gchar *
static glong utf8_to_utf16_len (const gchar *str, glong len, glong *items_read, GError **error);
static glong utf16_to_utf8_len (const gunichar2 *str, glong len, glong *items_read, GError **error);
gpointer
g_convert_error_quark ()
{
return error_quark;
}
static gunichar*
utf8_case_conv (const gchar *str, gssize len, gboolean upper)
{
gunichar *ustr;
glong i, ulen;
gchar *utf8;
ustr = g_utf8_to_ucs4_fast (str, (glong) len, &ulen);
for (i = 0; i < ulen; i++)
ustr[i] = upper ? g_unichar_toupper (ustr[i]) : g_unichar_tolower (ustr[i]);
utf8 = g_ucs4_to_utf8 (ustr, ulen, NULL, NULL, NULL);
g_free (ustr);
return utf8;
glong i, u16len, u32len;
gunichar2 *u16str;
gunichar *u32str;
gchar *u8str;
GError **err = NULL;
u16str = g_utf8_to_utf16 (str, (glong)len, NULL, &u16len, err);
u32str = g_utf16_to_ucs4 (u16str, u16len, NULL, &u32len, err);
for (i = 0; i < u32len; i++) {
u32str [i] = upper ? g_unichar_toupper (u32str [i]) : g_unichar_tolower (u32str [i]);
}
g_free (u16str);
u16str = g_ucs4_to_utf16 (u32str, u32len, NULL, &u16len, err);
u8str = g_utf16_to_utf8 (u16str, u16len, NULL, NULL, err);
g_free (u32str);
g_free (u16str);
return (gunichar*)u8str;
}
gchar *
gchar*
g_utf8_strup (const gchar *str, gssize len)
{
return utf8_case_conv (str, len, TRUE);
return (gchar*)utf8_case_conv (str, len, TRUE);
}
gchar *
gchar*
g_utf8_strdown (const gchar *str, gssize len)
{
return utf8_case_conv (str, len, FALSE);
return (gchar*)utf8_case_conv (str, len, FALSE);
}
static gboolean
utf8_validate (const unsigned char *inptr, size_t len)
static glong
utf8_to_utf16_len (const gchar *str, glong len, glong *items_read, GError **error)
{
const unsigned char *ptr = inptr + len;
unsigned char c;
/* Everything falls through when TRUE... */
switch (len) {
default:
return FALSE;
case 4:
if ((c = (*--ptr)) < 0x80 || c > 0xBF)
return FALSE;
if ((c == 0xBF || c == 0xBE) && ptr[-1] == 0xBF) {
if (ptr[-2] == 0x8F || ptr[-2] == 0x9F ||
ptr[-2] == 0xAF || ptr[-2] == 0xBF)
return FALSE;
/* It is almost identical to UTF8Encoding.GetCharCount() */
guchar ch, mb_size, mb_remain;
gboolean overlong;
guint32 codepoint;
glong in_pos, ret;
if (len < 0)
len = (glong) strlen (str);
in_pos = 0;
ret = 0;
/* Common case */
for (in_pos = 0; in_pos < len && str [in_pos] < 0x80; in_pos++)
ret ++;
if (in_pos == len) {
if (items_read)
*items_read = in_pos;
return ret;
}
mb_size = 0;
mb_remain = 0;
overlong = 0;
for (; in_pos < len; in_pos++) {
ch = str [in_pos];
if (mb_size == 0) {
if (ch < 0x80)
ret++;
else if ((ch & 0xE0) == 0xC0) {
codepoint = ch & 0x1F;
mb_size = 2;
} else if ((ch & 0xF0) == 0xE0) {
codepoint = ch & 0x0F;
mb_size = 3;
} else if ((ch & 0xF8) == 0xF0) {
codepoint = ch & 7;
mb_size = 4;
} else if ((ch & 0xFC) == 0xF8) {
codepoint = ch & 3;
mb_size = 5;
} else if ((ch & 0xFE) == 0xFC) {
codepoint = ch & 3;
mb_size = 6;
} else {
/* invalid utf-8 sequence */
if (error) {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "invalid utf-8 sequence at %d (illegal first byte)", in_pos);
if (items_read)
*items_read = in_pos;
return -1;
} else {
codepoint = 0;
mb_remain = mb_size = 0;
}
}
if (mb_size > 1)
mb_remain = mb_size - 1;
} else {
if ((ch & 0xC0) == 0x80) {
codepoint = (codepoint << 6) | (ch & 0x3F);
if (--mb_remain == 0) {
/* multi byte character is fully consumed now. */
if (codepoint < 0x10000) {
switch (mb_size) {
case 2:
overlong = codepoint < 0x7F;
break;
case 3:
overlong = codepoint < 0x7FF;
break;
case 4:
overlong = codepoint < 0xFFFF;
break;
case 5:
overlong = codepoint < 0x1FFFFF;
break;
case 6:
overlong = codepoint < 0x03FFFFFF;
break;
}
if (overlong) {
/* invalid utf-8 sequence (overlong) */
if (error) {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "invalid utf-8 sequence at %d (overlong)", in_pos);
if (items_read)
*items_read = in_pos;
return -1;
} else {
codepoint = 0;
mb_remain = 0;
overlong = FALSE;
}
}
else
ret++;
} else if (codepoint < 0x110000) {
/* surrogate pair */
ret += 2;
} else {
/* invalid utf-8 sequence (excess) */
if (error) {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "invalid utf-8 sequence at %d (codepoint range excess)", in_pos);
if (items_read)
*items_read = in_pos;
return -1;
} else {
codepoint = 0;
mb_remain = 0;
}
}
mb_size = 0;
}
} else {
/* invalid utf-8 sequence */
if (error) {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "invalid utf-8 sequence at %d (illegal following bytes)", in_pos);
if (items_read)
*items_read = in_pos;
return -1;
} else {
codepoint = 0;
mb_remain = mb_size = 0;
}
}
}
case 3:
if ((c = (*--ptr)) < 0x80 || c > 0xBF)
return FALSE;
case 2:
if ((c = (*--ptr)) < 0x80 || c > 0xBF)
return FALSE;
/* no fall-through in this inner switch */
switch (*inptr) {
case 0xE0: if (c < 0xA0) return FALSE; break;
case 0xED: if (c > 0x9F) return FALSE; break;
case 0xEF: if (c == 0xB7 && (ptr[1] > 0x8F && ptr[1] < 0xB0)) return FALSE;
if (c == 0xBF && (ptr[1] == 0xBE || ptr[1] == 0xBF)) return FALSE;
}
if (items_read)
*items_read = in_pos;
return ret;
}
gunichar2*
g_utf8_to_utf16 (const gchar *str, glong len, glong *items_read, glong *items_written, GError **error)
{
/* The conversion logic is almost identical to UTF8Encoding.GetChars(),
but error check is always done at utf8_to_utf16_len() so that
the conversion core below simply resets erroreous bits */
glong utf16_len;
gunichar2 *ret;
guchar ch, mb_size, mb_remain;
guint32 codepoint;
glong in_pos, out_pos;
utf16_len = 0;
mb_size = 0;
mb_remain = 0;
in_pos = 0;
out_pos = 0;
if (error)
*error = NULL;
if (len < 0)
len = (glong) strlen (str);
if (items_read)
*items_read = 0;
if (items_written)
*items_written = 0;
utf16_len = utf8_to_utf16_len (str, len, items_read, error);
if (error)
if (*error)
return NULL;
if (utf16_len < 0)
return NULL;
ret = g_malloc ((1 + utf16_len) * sizeof (gunichar2));
/* Common case */
for (in_pos = 0; in_pos < len; in_pos++) {
ch = (guchar) str [in_pos];
if (ch >= 0x80)
break;
case 0xF0: if (c < 0x90) return FALSE; break;
case 0xF4: if (c > 0x8F) return FALSE; break;
default: if (c < 0x80) return FALSE; break;
}
case 1: if (*inptr >= 0x80 && *inptr < 0xC2) return FALSE;
ret [out_pos++] = ch;
}
if (*inptr > 0xF4)
return FALSE;
return TRUE;
}
/**
* g_utf8_validate:
* @str: a utf-8 encoded string
* @max_len: max number of bytes to validate (or -1 to validate the entire null-terminated string)
* @end: output parameter to mark the end of the valid input
*
* Checks @utf for being valid UTF-8. @str is assumed to be
* null-terminated. This function is not super-strict, as it will
* allow longer UTF-8 sequences than necessary. Note that Java is
* capable of producing these sequences if provoked. Also note, this
* routine checks for the 4-byte maximum size, but does not check for
* 0x10ffff maximum value.
*
* Return value: %TRUE if @str is valid or %FALSE otherwise.
**/
gboolean
g_utf8_validate (const gchar *str, gssize max_len, const gchar **end)
{
guchar *inptr = (guchar *) str;
gboolean valid = TRUE;
guint length, min;
gssize n = 0;
if (max_len == 0)
return FALSE;
if (max_len < 0) {
while (*inptr != 0) {
length = g_utf8_jump_table[*inptr];
if (!utf8_validate (inptr, length)) {
valid = FALSE;
break;
for (; in_pos < len; in_pos++) {
ch = (guchar) str [in_pos];
if (mb_size == 0) {
if (ch < 0x80)
ret [out_pos++] = ch;
else if ((ch & 0xE0) == 0xC0) {
codepoint = ch & 0x1F;
mb_size = 2;
} else if ((ch & 0xF0) == 0xE0) {
codepoint = ch & 0x0F;
mb_size = 3;
} else if ((ch & 0xF8) == 0xF0) {
codepoint = ch & 7;
mb_size = 4;
} else if ((ch & 0xFC) == 0xF8) {
codepoint = ch & 3;
mb_size = 5;
} else if ((ch & 0xFE) == 0xFC) {
codepoint = ch & 3;
mb_size = 6;
} else {
/* invalid utf-8 sequence */
codepoint = 0;
mb_remain = mb_size = 0;
}
inptr += length;
}
} else {
while (n < max_len) {
if (*inptr == 0) {
/* Note: return FALSE if we encounter nul-byte
* before max_len is reached. */
valid = FALSE;
break;
if (mb_size > 1)
mb_remain = mb_size - 1;
} else {
if ((ch & 0xC0) == 0x80) {
codepoint = (codepoint << 6) | (ch & 0x3F);
if (--mb_remain == 0) {
/* multi byte character is fully consumed now. */
if (codepoint < 0x10000) {
ret [out_pos++] = (gunichar2)(codepoint % 0x10000);
} else if (codepoint < 0x110000) {
/* surrogate pair */
codepoint -= 0x10000;
ret [out_pos++] = (gunichar2)((codepoint >> 10) + 0xD800);
ret [out_pos++] = (gunichar2)((codepoint & 0x3FF) + 0xDC00);
} else {
/* invalid utf-8 sequence (excess) */
codepoint = 0;
mb_remain = 0;
}
mb_size = 0;
}
} else {
/* invalid utf-8 sequence */
codepoint = 0;
mb_remain = mb_size = 0;
}
length = g_utf8_jump_table[*inptr];
min = MIN (length, max_len - n);
if (!utf8_validate (inptr, min)) {
valid = FALSE;
break;
}
if (min < length) {
valid = FALSE;
break;
}
inptr += length;
n += length;
}
}
if (end != NULL)
*end = (gchar *) inptr;
return valid;
ret [out_pos] = 0;
if (items_written)
*items_written = out_pos;
return ret;
}
gunichar
g_utf8_get_char_validated (const gchar *str, gssize max_len)
gchar*
g_utf16_to_utf8 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **error)
{
unsigned char *inptr = (unsigned char *) str;
gunichar u = *inptr;
int n, i;
if (max_len == 0)
return -2;
if (u < 0x80) {
/* simple ascii case */
return u;
} else if (u < 0xc2) {
return -1;
} else if (u < 0xe0) {
u &= 0x1f;
n = 2;
} else if (u < 0xf0) {
u &= 0x0f;
n = 3;
} else if (u < 0xf8) {
u &= 0x07;
n = 4;
} else if (u < 0xfc) {
u &= 0x03;
n = 5;
} else if (u < 0xfe) {
u &= 0x01;
n = 6;
} else {
return -1;
/* The conversion logic is almost identical to UTF8Encoding.GetBytes(),
but error check is always done at utf16_to_utf8_len() so that
the conversion core below simply resets erroreous bits */
glong utf8_len;
gchar *ret;
glong in_pos, out_pos;
gunichar2 ch;
guint32 codepoint = 0;
gboolean surrogate;
in_pos = 0;
out_pos = 0;
surrogate = FALSE;
if (items_read)
*items_read = 0;
if (items_written)
*items_written = 0;
utf8_len = utf16_to_utf8_len (str, len, items_read, error);
if (error)
if (*error)
return NULL;
if (utf8_len < 0)
return NULL;
ret = g_malloc ((1+utf8_len) * sizeof (gchar));
while (len < 0 ? str [in_pos] : in_pos < len) {
ch = str [in_pos];
if (surrogate) {
if (ch >= 0xDC00 && ch <= 0xDFFF) {
codepoint = 0x10000 + (ch - 0xDC00) + ((surrogate - 0xD800) << 10);
surrogate = 0;
} else {
surrogate = 0;
/* invalid surrogate pair */
continue;
}
} else {
/* fast path optimization */
if (ch < 0x80) {
for (; len < 0 ? str [in_pos] : in_pos < len; in_pos++) {
if (str [in_pos] < 0x80)
ret [out_pos++] = (gchar)(str [in_pos]);
else
break;
}
continue;
}
else if (ch >= 0xD800 && ch <= 0xDBFF)
surrogate = ch;
else if (ch >= 0xDC00 && ch <= 0xDFFF) {
/* invalid surrogate pair */
continue;
}
else
codepoint = ch;
}
in_pos++;
if (surrogate != 0)
continue;
if (codepoint < 0x80)
ret [out_pos++] = (gchar) codepoint;
else if (codepoint < 0x0800) {
ret [out_pos++] = (gchar) (0xC0 | (codepoint >> 6));
ret [out_pos++] = (gchar) (0x80 | (codepoint & 0x3F));
} else if (codepoint < 0x10000) {
ret [out_pos++] = (gchar) (0xE0 | (codepoint >> 12));
ret [out_pos++] = (gchar) (0x80 | ((codepoint >> 6) & 0x3F));
ret [out_pos++] = (gchar) (0x80 | (codepoint & 0x3F));
} else {
ret [out_pos++] = (gchar) (0xF0 | (codepoint >> 18));
ret [out_pos++] = (gchar) (0x80 | ((codepoint >> 12) & 0x3F));
ret [out_pos++] = (gchar) (0x80 | ((codepoint >> 6) & 0x3F));
ret [out_pos++] = (gchar) (0x80 | (codepoint & 0x3F));
}
}
if (max_len > 0) {
if (!utf8_validate (inptr, MIN (max_len, n)))
return -1;
if (max_len < n)
return -2;
} else {
if (!utf8_validate (inptr, n))
return -1;
}
for (i = 1; i < n; i++)
u = (u << 6) | (*++inptr ^ 0x80);
return u;
ret [out_pos] = 0;
if (items_written)
*items_written = out_pos;
return ret;
}
glong
g_utf8_strlen (const gchar *str, gssize max_len)
static glong
utf16_to_utf8_len (const gunichar2 *str, glong len, glong *items_read, GError **error)
{
const guchar *inptr = (const guchar *) str;
glong clen = 0, len = 0, n;
if (max_len == 0)
glong ret, in_pos;
gunichar2 ch;
gboolean surrogate;
ret = 0;
in_pos = 0;
surrogate = FALSE;
while (len < 0 ? str [in_pos] : in_pos < len) {
ch = str [in_pos];
if (surrogate) {
if (ch >= 0xDC00 && ch <= 0xDFFF) {
ret += 4;
} else {
/* invalid surrogate pair */
if (error) {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "invalid utf-16 sequence at %d (missing surrogate tail)", in_pos);
if (items_read)
*items_read = in_pos;
return -1;
} /* otherwise just ignore. */
}
surrogate = FALSE;
} else {
/* fast path optimization */
if (ch < 0x80) {
for (; len < 0 ? str [in_pos] : in_pos < len; in_pos++) {
if (str [in_pos] < 0x80)
++ret;
else
break;
}
continue;
}
else if (ch < 0x0800)
ret += 2;
else if (ch >= 0xD800 && ch <= 0xDBFF)
surrogate = TRUE;
else if (ch >= 0xDC00 && ch <= 0xDFFF) {
/* invalid surrogate pair */
if (error) {
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE, "invalid utf-16 sequence at %d (missing surrogate head)", in_pos);
if (items_read)
*items_read = in_pos;
return -1;
} /* otherwise just ignore. */
}
else
ret += 3;
}
in_pos++;
}
if (items_read)
*items_read = in_pos;
return ret;
}
static glong
g_ucs4_to_utf16_len (const gunichar *str, glong len, glong *items_read, GError **error)
{
glong retlen = 0;
glong errindex = 0;
const gunichar *lstr = str;
if (!str)
return 0;
if (max_len < 0) {
while (*inptr) {
inptr += g_utf8_jump_table[*inptr];
len++;
}
} else {
while (len < max_len && *inptr) {
n = g_utf8_jump_table[*inptr];
if ((clen + n) > max_len)
break;
inptr += n;
clen += n;
len++;
while (*lstr != '\0' && len--) {
gunichar ch;
ch = *lstr++;
if (ch <= 0x0000FFFF) {
if (ch >= 0xD800 && ch <= 0xDFFF) {
errindex = (glong)(lstr - str)-1;
if (error)
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"Invalid sequence in conversion input");
if (items_read)
*items_read = errindex;
return 0;
} else {
retlen++;
}
} else if (ch > 0x10FFFF) {
errindex = (glong)(lstr - str)-1;
if (error)
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"Character out of range for UTF-16");
if (items_read)
*items_read = errindex;
return 0;
} else {
retlen+=2;
}
}
return len;
if (items_read)
*items_read = (glong)(lstr - str);
return retlen;
}
gunichar
g_utf8_get_char (const gchar *src)
gunichar2*
g_ucs4_to_utf16 (const gunichar *str, glong len, glong *items_read, glong *items_written, GError **error)
{
unsigned char *inptr = (unsigned char *) src;
gunichar u = *inptr;
int n, i;
if (u < 0x80) {
/* simple ascii case */
return u;
} else if (u < 0xe0) {
u &= 0x1f;
n = 2;
} else if (u < 0xf0) {
u &= 0x0f;
n = 3;
} else if (u < 0xf8) {
u &= 0x07;
n = 4;
} else if (u < 0xfc) {
u &= 0x03;
n = 5;
} else {
u &= 0x01;
n = 6;
glong allocsz;
gunichar2 *retstr = 0;
gunichar2 *retch = 0;
glong nwritten = 0;
GError *lerror =0 ;
allocsz = g_ucs4_to_utf16_len (str, len, items_read, &lerror);
if (!lerror) {
retch = retstr = g_malloc ((allocsz+1) * sizeof (gunichar2));
retstr[allocsz] = '\0';
while (*str != '\0' && len--) {
gunichar ch;
ch = *str++;
if (ch <= 0x0000FFFF && (ch < 0xD800 || ch > 0xDFFF)) {
*retch++ = (gunichar2)ch;
nwritten ++;
} else {
ch -= 0x0010000UL;
*retch++ = (gunichar2)((ch >> 10) + 0xD800);
*retch++ = (gunichar2)((ch & 0x3FFUL) + 0xDC00);
nwritten +=2;
}
}
}
for (i = 1; i < n; i++)
u = (u << 6) | (*++inptr ^ 0x80);
return u;
if (items_written)
*items_written = nwritten;
if (error)
*error = lerror;
return retstr;
}
gchar *
g_utf8_find_prev_char (const gchar *str, const gchar *p)
static glong
g_utf16_to_ucs4_len (const gunichar2 *str, glong len, glong *items_read, GError **error)
{
while (p > str) {
p--;
if ((*p & 0xc0) != 0xb0)
return (gchar *)p;
}
return NULL;
}
glong retlen = 0;
glong errindex = 0;
const gunichar2 *lstr = str;
gunichar2 ch,ch2;
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)
{
const gchar *p = str;
if (offset > 0) {
do {
p = g_utf8_next_char (p);
offset --;
} while (offset > 0);
}
else if (offset < 0) {
const gchar *jump = str;
do {
// since the minimum size of a character is 1
// we know we can step back at least offset bytes
jump = jump + offset;
// if we land in the middle of a character
// walk to the beginning
while ((*jump & 0xc0) == 0xb0)
jump --;
// count how many characters we've actually walked
// by going forward
p = jump;
do {
p = g_utf8_next_char (p);
offset ++;
} while (p < jump);
} while (offset < 0);
}
return (gchar *)p;
}
glong
g_utf8_pointer_to_offset (const gchar *str, const gchar *pos)
{
const gchar *inptr, *inend;
glong offset = 0;
glong sign = 1;
if (pos == str)
if (!str)
return 0;
if (str < pos) {
inptr = str;
inend = pos;
} else {
inptr = pos;
inend = str;
sign = -1;
while (*lstr != '\0' && len--) {
ch = *lstr++;
if (ch >= 0xD800 && ch <= 0xDBFF) {
if (!len--) {
lstr--;
break;
}
ch2 = *lstr;
if (ch2 >= 0xDC00 && ch2 <= 0xDFFF) {
lstr++;
} else {
errindex = (glong)(lstr - str);
if (error)
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"Invalid sequence in conversion input");
if (items_read)
*items_read = errindex;
return 0;
}
} else {
if (ch >= 0xDC00 && ch <= 0xDFFF) {
errindex = (glong)(lstr - str)-1;
if (error)
g_set_error (error, G_CONVERT_ERROR, G_CONVERT_ERROR_ILLEGAL_SEQUENCE,
"Invalid sequence in conversion input");
if (items_read)
*items_read = errindex;
return 0;
}
}
retlen++;
}
do {
inptr = g_utf8_next_char (inptr);
offset++;
} while (inptr < inend);
return offset * sign;
if (items_read)
*items_read = (glong)(lstr - str);
return retlen;
}
gunichar*
g_utf16_to_ucs4 (const gunichar2 *str, glong len, glong *items_read, glong *items_written, GError **error)
{
glong allocsz;
gunichar *retstr = 0;
gunichar *retch = 0;
glong nwritten = 0;
GError *lerror =0 ;
gunichar ch,ch2;
allocsz = g_utf16_to_ucs4_len (str, len, items_read, &lerror);
if (!lerror) {
retch = retstr = g_malloc ((allocsz+1) * sizeof (gunichar));
retstr[allocsz] = '\0';
nwritten = allocsz;
while (*str != '\0' && allocsz--) {
ch = *str++;
if (ch >= 0xD800 && ch <= 0xDBFF) {
ch2 = *str++;
ch = ((ch - (gunichar)0xD800) << 10)
+ (ch2 - (gunichar)0xDC00) + (gunichar)0x0010000UL;
}
*retch++ = ch;
}
}
if (items_written)
*items_written = nwritten;
if (error)
*error = lerror;
return retstr;
}
+1 -2
View File
@@ -17,7 +17,7 @@ int vasprintf(char **ret, const char *fmt, va_list ap)
len = vsnprintf(NULL, 0, fmt, ap2);
#endif
if (len >= 0 && (buf = malloc ((buflen = (size_t) (len + 1)))) != NULL) {
if (len > 0 && (buf = malloc((buflen = (size_t) (len + 1)))) != NULL) {
len = vsnprintf(buf, buflen, fmt, ap);
*ret = buf;
} else {
@@ -28,4 +28,3 @@ int vasprintf(char **ret, const char *fmt, va_list ap)
va_end(ap2);
return len;
}
Loaded 100 of 17555 files, more files were not shown because too many files have changed in this diff. Show more