Compare commits

..
372 Commits
Author SHA1 Message Date
Everaldo Canuto e117097e1f In System.Windows.Forms:
2008-09-30  Everaldo Canuto  <[email protected]>

	* MenuAPI.cs: Prevent NRE when deactivate menu. Fixes #413636.


svn path=/branches/mono-2-0/mcs/; revision=114557
2008-10-01 13:20:38 +00:00
Michael Hutchinson 95d855ebdd 2008-09-30 Michael Hutchinson <[email protected]>
* HttpServerChannel.cs: make sure the channel data object is set 
	  when the port is auto-assigned.
	* HttpClientTransportSink.cs: Use the __RequestUri header for the 
	  request's URI. Includes workaround for bad __RequestUri values.
	
	Fixes Bug 378713 - [regression] Remoting - HttpChannel.


svn path=/branches/mono-2-0/mcs/; revision=114529
2008-09-30 23:43:33 +00:00
Jb Evain 362fb88f27 2008-09-30 Jb Evain <[email protected]>
* QueryableEnumerable.cs: fix ElementType.


svn path=/branches/mono-2-0/mcs/; revision=114516
2008-09-30 21:36:30 +00:00
Rodrigo Kumpera 9c53f50c43 2008-09-29 Rodrigo Kumpera <[email protected]>
* TypeBuilderTest.cs: Add a test for MakeGenericType with EnumBuilder.
	Tests #430508.

	Backported from trunk.


svn path=/branches/mono-2-0/mcs/; revision=114413
2008-09-29 15:38:28 +00:00
Rodrigo Kumpera 075d5711fa 2008-09-29 Rodrigo Kumpera <[email protected]>
* Type.cs (MakeGenericType): Only use UnderlyingSystemType for user types.
       This must exclude TypeBuilder and EnumBuilder. Fixes #430508.

		Backported from trunk.


svn path=/branches/mono-2-0/mcs/; revision=114412
2008-09-29 15:34:09 +00:00
Geoff Norton c5d359670a 2008-09-29 Geoff Norton <[email protected]>
* include/private/gcconfig.h: Make Darwin/ARM use mmap() instead of
        sbrk() for its allocator implementation.

svn path=/branches/mono-2-0/mono/; revision=114395
2008-09-29 14:03:19 +00:00
Zoltan Varga ee457822fa Merge r114163 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=114200
2008-09-26 16:21:26 +00:00
Zoltan Varga 0589d7ddf5 Merge r113458 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=114102
2008-09-25 17:27:30 +00:00
Marek Safar 2d8310224e 2008-09-25 Marek Safar <marek.safar at gmail.com>
* driver.cs, namespace.cs: Read types and namespaces after all
	requested assemblies are loaded, fixes issues with System.Core
	auto-reference, and #419888.


svn path=/branches/mono-2-0/mcs/; revision=114098
2008-09-25 17:04:27 +00:00
Dick Porter 6bf7d13701 2008-09-25 Dick Porter <[email protected]>
* events.c (event_create): Revert previous kludge as it's no
	longer needed.

	* wait.c: Make sure we keep references to handles we're waiting
	for.  Fixes bug 424851.


svn path=/branches/mono-2-0/mono/; revision=114096
2008-09-25 17:00:21 +00:00
Miguel de Icaza f2eca844d4 Version
svn path=/branches/mono-2-0/mono/; revision=114045
2008-09-25 00:08:10 +00:00
Zoltan Varga 42b162613a 2008-09-24 Zoltan Varga <[email protected]>
* Makefile.am (PLATFORM_DISABLED_TESTS): Disable winx64structs.exe
	on ia64 for the release.

svn path=/branches/mono-2-0/mono/; revision=114015
2008-09-24 20:36:25 +00:00
Michael Hutchinson c02fd518fa 2008-09-24 Michael Hutchinson <[email protected]>
* HttpServerTransportSink.cs: Disable chunking on the server, as 
	  for some reason it was breaking the tests. This reduces efficiency 
	  but right now is unavoidable.
	  
	* HttpServerChannel.cs: Implement AddHookChannelUri. Thanks to 
	  Lluis for the patch.


svn path=/branches/mono-2-0/mcs/; revision=113997
2008-09-24 19:23:00 +00:00
Michael Hutchinson 46ba96ab4c 2008-09-24 Michael Hutchinson <[email protected]>
* HttpServerChannelTests.cs: Don't check for a chunked response from 
	  the Mono HTTP server; it no longer chunks since that was breaking 
	  other tests.


svn path=/branches/mono-2-0/mcs/; revision=113996
2008-09-24 19:22:24 +00:00
Michael Hutchinson 245f79b651 2008-09-23 Michael Hutchinson <[email protected]>
* HttpClientChannel.cs: Fix logic error from ==/!= typo. Stops 
	  channel from trying to handle IPC URLs, which was breaking the 
	  IPC tests.


svn path=/branches/mono-2-0/mcs/; revision=113908
2008-09-23 22:36:04 +00:00
Jb Evain 325b17c5e6 backport fix for bug 428309
svn path=/branches/mono-2-0/mcs/; revision=113782
2008-09-23 06:57:59 +00:00
Miguel de Icaza b77b0e57c7 Backport: do not crash on Goto/cloning
svn path=/branches/mono-2-0/mcs/; revision=113769
2008-09-22 23:26:05 +00:00
Miguel de Icaza 5817f62c06 Backport fix for 427974
svn path=/branches/mono-2-0/mcs/; revision=113636
2008-09-20 16:36:36 +00:00
Kornél Pál 4d846f3217 Backport of r113614. coree.c (_CorValidateImage): Some 64-bit IL only images have entry point calling _CorDllMain imported from mscoree.dll. Set entry point RVA to 0 for 64-bit IL only images because imports are not resolved for IL only images. Special thanks to Bill Holmes for finding this bug and testing the patch. Also fail for 64-bit images marked as CLI_FLAGS_32BITREQUIRED.
svn path=/branches/mono-2-0/mono/; revision=113615
2008-09-20 07:09:14 +00:00
Michael Hutchinson 53ae02f613 2008-09-19 Michael Hutchinson <[email protected]>
* System.Runtime.Remoting_test.dll.sources: add HttpBugtests.cs.


svn path=/branches/mono-2-0/mcs/; revision=113613
2008-09-20 02:13:42 +00:00
Michael Hutchinson 18b14d2b33 2008-09-19 Michael Hutchinson <[email protected]>
* ActivationTests.cs:
	* HttpCalls.cs: Add a timeout on the client.
	* HttpBugTests.cs: Add tests for some bugzilla bugs. One's not fixed, 
	  so is marked as not working.


svn path=/branches/mono-2-0/mcs/; revision=113612
2008-09-20 02:12:30 +00:00
Michael Hutchinson f56c7b32e9 2008-09-19 Michael Hutchinson <[email protected]>
* HttpServerChannel.cs:
	* HttpClientChannel.cs:
	* HttpChannel.cs: Fixes from corcompare, and some cleanup.


svn path=/branches/mono-2-0/mcs/; revision=113611
2008-09-20 02:07:24 +00:00
Jeffrey Stedfast 65a6ec3240 2008-09-19 Jeffrey Stedfast <[email protected]>
* HttpServerChannelTests.cs: More unit tests for
	HttpServerChannel.


svn path=/branches/mono-2-0/mcs/; revision=113600
2008-09-19 23:29:03 +00:00
Jeffrey Stedfast 373c459bb6 2008-09-19 Jeffrey Stedfast <[email protected]>
* HttpChannel.cs: Throw ArgumentNullException if url is null.


svn path=/branches/mono-2-0/mcs/; revision=113552
2008-09-19 17:20:17 +00:00
Michael Hutchinson 384f8eb073 2008-09-18 Michael Hutchinson <[email protected]>
* HttpServerTransportSink.cs:
	* HttpServerChannel.cs: Cleanup.
	* HttpClientTransportSink.cs: Use username/password/domain parameters, 
	  fix some spelling, add FIXME comment regarding stream copying.
	* HttpClientChannel.cs: 
	* HttpChannel.cs: Fix 1.1 API slip.

svn path=/branches/mono-2-0/mcs/; revision=113489
2008-09-19 02:16:53 +00:00
Michael Hutchinson ecb560796d 2008-09-18 Michael Hutchinson <[email protected]>
* HttpServerChannel.cs: Don't try to resolve IPAddress.Any, so that 
	by default we bind to localhost/lo as well as the host address.
	Also remove dead code for binding to multiple IP addresses; I don't 
	think we need to handle that.


svn path=/branches/mono-2-0/mcs/; revision=113457
2008-09-18 19:49:48 +00:00
Michael Hutchinson b94fed666b 2008-09-18 Michael Hutchinson <[email protected]>
* HttpChannel.cs: Fix default channel name.

svn path=/branches/mono-2-0/mcs/; revision=113453
2008-09-18 18:46:34 +00:00
Michael Hutchinson b54f5a8c31 2008-09-18 Michael Hutchinson <[email protected]>
* HttpClientTransportSink: Fix logic error that broke async client 
	functionality. Fixes HttpAsyncCallTest tests.


svn path=/branches/mono-2-0/mcs/; revision=113434
2008-09-18 16:02:59 +00:00
Dick Porter cde9923d53 2008-09-18 Dick Porter <[email protected]>
* events.c (event_create): Start event handles with a reference
	count of 2, to work around a bug causing banshee to hang at exit.
	Temporary kludge for bug 424851.


svn path=/branches/mono-2-0/mono/; revision=113394
2008-09-18 08:11:08 +00:00
Michael Hutchinson a4dd2eb9ab Enable failing test, to avoid missing it later
svn path=/branches/mono-2-0/mcs/; revision=113369
2008-09-17 23:54:32 +00:00
Michael Hutchinson de053ca593 Updated implementation, uses a copy of our HttpListener core
svn path=/branches/mono-2-0/mcs/; revision=113368
2008-09-17 23:53:23 +00:00
Michael Hutchinson 56afb5aa4f Disable failing tests (to fix later; And add binary tests
svn path=/branches/mono-2-0/mcs/; revision=113367
2008-09-17 23:52:55 +00:00
Michael Hutchinson 448d7c2cd7 Add MonoHttp: a scripted copy of the HttpListener core that works in 1.0 for the channel
svn path=/branches/mono-2-0/mcs/; revision=113366
2008-09-17 23:52:10 +00:00
Michael Hutchinson 96c4a7d4b9 2008-09-17 Michael Hutchinson <michael@>
* SoapServerFormatterSink.cs: Do not try to parse text/xml code
	unless there is a SOAPAction.   

	Set position on outgoing streams to zero, so they can be properly
	parsed in the general infrastructure.

	Do not try to seek on incoming streams.

svn path=/branches/mono-2-0/mcs/; revision=113365
2008-09-17 23:51:17 +00:00
Michael Hutchinson e83ed4dbed 2008-09-17 Michael Hutchinson <[email protected]>
* HttpListenerPrefixCollection.cs:
	* EndPointListener.cs:
	* WebHeaderCollection.cs:
	* HttpConnection.cs: Fixes for EMBEDDED_IN_1_0.


svn path=/branches/mono-2-0/mcs/; revision=113363
2008-09-17 23:36:49 +00:00
Miguel de Icaza e4a117cd9a 2008-09-12 Miguel de Icaza <[email protected]>
* HttpListenerPrefixCollection.cs, EndPointListener.cs,
	HttpListener.cs, EndPointManager.cs, HttpConnection.cs: Remove
	generics support where necessary to allow this code to be reused
	in the 1.0 profile.

svn path=/branches/mono-2-0/mcs/; revision=113360
2008-09-17 22:55:36 +00:00
Andreia Gaita c791106c25 * Mono.Mozilla/AsciiString.cs: Change marshalling to ansi - auto is no
good on windows. Fixes #414146.
  [backport of r113117]

svn path=/branches/mono-2-0/mcs/; revision=113308
2008-09-17 13:43:11 +00:00
Ivan Zlatev 2a97314f8d Revert accidental commit to branch.
svn path=/branches/mono-2-0/mcs/; revision=113063
2008-09-15 17:20:56 +00:00
Ivan Zlatev ed54a1b761 2008-09-15 Ivan N. Zlatev <[email protected]>
* MimeIcon.cs: Add null checks in the GnomeHandler, because it might
	happen that the icons from the theme is missing or the particular size
	unavailable.
	[Fixes bug #424981]

svn path=/branches/mono-2-0/mcs/; revision=113059
2008-09-15 17:06:29 +00:00
Michael Hutchinson 7e1ac93383 Add
svn path=/branches/mono-2-0/mcs/; revision=112918
2008-09-12 22:52:36 +00:00
Michael Hutchinson 2fb9b64e73 Removed
svn path=/branches/mono-2-0/mcs/; revision=112917
2008-09-12 22:51:28 +00:00
Dick Porter 1a28da3faf 2008-07-28 Dick Porter <[email protected]>
* handles.c (_wapi_handle_count_signalled_handles): Remove an
	unmatched _wapi_handle_ref().  Fixes bug 410743.
	(Reinstated.)


svn path=/branches/mono-2-0/mono/; revision=112755
2008-09-11 13:13:39 +00:00
Bill Holmes 167914a79b 2008-09-10 Bill Holmes <[email protected]>
Backport of r112715.

	* process.c (complete_path) : Removing quotes from the 
	  input path.  The glib file routines do not handle file paths
	  that have quotes around them.

	Code is contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=112716
2008-09-10 22:00:26 +00:00
Bill Holmes d33e20924b 2008-09-10 Bill Holmes <[email protected]>
Backport of 112681.

	* Socket.cs : Adding a comment to provide locations where
	  changes to MonoSocketAsyncResult need to be synced.

	* Process.cs : Update the fields of ProcessAsyncReader to
	  match MonoSocketAsyncResult metadata/socket-io.h

	Code is contributed under MIT/X11 license.


svn path=/branches/mono-2-0/mcs/; revision=112683
2008-09-10 15:25:30 +00:00
Bill Holmes beb890595c 2008-09-10 Bill Holmes <[email protected]>
Backport of 112680.

	* socket-io.h : Adding a comment to provide locations where
	  changes to MonoSocketAsyncResult need to be synced.

	Code is contributed under MIT/X11 license.


svn path=/branches/mono-2-0/mono/; revision=112682
2008-09-10 15:23:37 +00:00
Andreia Gaita 13f9cb3434 * Mono.Mozilla/WebBrowser.cs: Update the loaded flag so users can now
if the engine is actually running properly.
* Mono.Mozilla/Base.cs: Create cache directory with a version specific
  name so there's no conflict when the user has both xulrunner
  runtime 1.8 and 1.9 installed. Get rid of gluezillaInstalled flag,
  redundant. Bind now returns bool so I can check if the engine is
  actually running properly after initialization. Check the return
  value of createBrowserWindow and bail out if no valid pointer is
  returned. Protect the string functions with a check so they don't
  get called if the engine is not initialized.

Fixes: segfaults when two xulrunner engines are installed. 
segfaults when engine gets initialized but doesn't load properly afterwards

2008-09-10  Andreia Gaita <[email protected]>

svn path=/branches/mono-2-0/mcs/; revision=112640
2008-09-10 03:52:01 +00:00
Dick Porter 85432ce24a Revert this change on 2.0 for now (see bug 424851)
svn path=/branches/mono-2-0/mono/; revision=112613
2008-09-09 19:45:14 +00:00
Jonathan Pryor b9a946161c * TraceImpl.cs:
- Remove the "lock-free" code, which (come to think of it) would be 
	    faulty in a multithreaded environment anyway because the "other"
	    threads won't wait (block) until initialization is complete...
	  - Add InitOnce() calls to all public properties, so that
	    `Debug.AutoFlush=true' will cause InitOnce() to be loaded, lest
	    a `Debug.AutoFlush=true; Debug.Listeners.Add(...)` sequence cause
	    .AutoFlush=true to be ignored as the InitOnce implied by .Add() 
	    will "overwrite" the .AutoFlush.
	  - Split up TraceListenerCollection creation from DefaultTraceListener 
	    addition, as TraceListenerCollection.Add() calls back into 
	    TraceImpl, so if these aren't separate we get an infinite loop
	    and never actually initialize anything.
	  - Fixes #424370.
	* TraceListenerCollection.cs: Add a TraceListenerCollection(bool)
	  constructor, which provides a way to NOT add the
	  DefaultTraceListener (needed by TraceImpl; see above).

svn path=/branches/mono-2-0/mcs/; revision=112607
2008-09-09 17:17:01 +00:00
Zoltan Varga 3674150432 Merge r112539 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=112540
2008-09-08 19:25:38 +00:00
Ivan Zlatev b7db72d0e5 2008-09-08 Ivan N. Zlatev <[email protected]>
* ErrorProvider.cs: Unbreak my previous commit.

svn path=/branches/mono-2-0/mcs/; revision=112522
2008-09-08 16:59:14 +00:00
Ivan Zlatev 7cd4a28f4a 2008-09-08 Ivan N. Zlatev <[email protected]>
* ErrorProvider.cs: Icon should always be 16x16.
	[Fixes bug #424380]

svn path=/branches/mono-2-0/mcs/; revision=112519
2008-09-08 16:16:42 +00:00
Rodrigo Kumpera 5e858b9c01 In .:
2008-09-08  Rodrigo Kumpera  <[email protected]>

	* InotifyWatcher.cs: Really fix #359181.
	(Ported from trunk)
	

svn path=/branches/mono-2-0/mcs/; revision=112516
2008-09-08 16:02:19 +00:00
Miguel de Icaza 653096d4d3 Revert patch, the tests are not working on non UK timezones
svn path=/branches/mono-2-0/mcs/; revision=112507
2008-09-08 15:10:51 +00:00
Miguel de Icaza 596a9f9abf Backport 112483, fixes #409181
svn path=/branches/mono-2-0/mcs/; revision=112485
2008-09-08 02:05:08 +00:00
Ivan Zlatev 86b66e974e 2008-09-07 Ivan N. Zlatev <[email protected]>
* GridEntry.cs: Invalidate the child items cache when the property
	value changes.

svn path=/branches/mono-2-0/mcs/; revision=112467
2008-09-07 17:04:41 +00:00
Ivan Zlatev a30e7b6859 2008-09-07 Ivan N. Zlatev <[email protected]>
* GridEntry.cs, PropertyGridView.cs:
	   - Update the ReadOnly detection and rendering to finally hopefully
	   match the one of MSFT.
	   - Niceify and move the debug CWLS.
	[Fixes bug #409028]

svn path=/branches/mono-2-0/mcs/; revision=112464
2008-09-07 16:53:39 +00:00
Zoltan Varga b9dd5065b4 2008-09-06 Zoltan Varga <[email protected]>
* mini.h (MONO_AOT_FILE_VERSION): Bump this because of the arm AOT
	changes.

svn path=/branches/mono-2-0/mono/; revision=112439
2008-09-06 17:59:39 +00:00
Zoltan Varga 53ea73491e 2008-09-06 Zoltan Varga <[email protected]>
* pinvoke2.cs: Remove a stray Console.WriteLine.

svn path=/branches/mono-2-0/mono/; revision=112425
2008-09-06 14:13:37 +00:00
Zoltan Varga 676e17ac4b 2008-09-06 Zoltan Varga <[email protected]>
* libtest.c pinvoke2.cs: Add float tests.

svn path=/branches/mono-2-0/mono/; revision=112423
2008-09-06 14:10:17 +00:00
Zoltan Varga 742bd55cc3 2008-09-06 Zoltan Varga <[email protected]>
* mini.c (mono_spill_call): Handle pinvoke+soft float on arm.

svn path=/branches/mono-2-0/mono/; revision=112422
2008-09-06 14:06:47 +00:00
Zoltan Varga 8125642105 2008-09-06 Zoltan Varga <[email protected]>
* aot-runtime.c (mono_aot_get_method): Add another cache mapping wrapper
	methods to their code to avoid computing the full name of wrappers and
	doing a lookup in a string hash table.

svn path=/branches/mono-2-0/mono/; revision=112412
2008-09-06 03:01:59 +00:00
Atsushi Eno cac4a6fa87 backport r112408.
svn path=/branches/mono-2-0/mcs/; revision=112409
2008-09-05 23:57:44 +00:00
Zoltan Varga 808a676350 2008-09-06 Zoltan Varga <[email protected]>
* reflection.c (_mono_reflection_get_type_from_info): Revert the last change
	(r111766) as it is not needed after the no-exec changes.

svn path=/branches/mono-2-0/mono/; revision=112404
2008-09-05 22:05:45 +00:00
Ivan Zlatev 73e67e1db3 2008-09-04 Ivan N. Zlatev <[email protected]>
* GridEntry.cs, CategoryGridEntry.cs, RootGridEntry.cs, PropertyGrid.cs,
	PropertyGridView.sc: Implement lazy/delayed propertygrid population
	on item expansion. Improves performance and fixes bug #417955.
	[Fixes bug #417955]

svn path=/branches/mono-2-0/mcs/; revision=112370
2008-09-05 12:01:31 +00:00
Zoltan Varga 0bef4ef894 2008-09-05 Zoltan Varga <[email protected]>
* tramp-arm.c (mono_arch_nullify_class_init_trampoline): Implement this.
	(mono_arch_patch_plt_entry): Fix the calculation of the jump_entry.
	(mono_arch_get_nullified_class_init_trampoline): Return 'code' instead of
	'buf'.

	* aot-compiler.c (emit_plt): Fix the arm plt entries, previously they all 
	jumped to the same entry in plt_jump_table.

svn path=/branches/mono-2-0/mono/; revision=112337
2008-09-04 23:47:03 +00:00
Marek Safar 493446ce04 2008-09-04 Marek Safar <[email protected]>
A fix for bug #422853
	* delegate.cs (DelegateCreation): Add special handling for
	EmptyExpression.Null instance expression which is just another
	hack for undecided member instance exression.


svn path=/branches/mono-2-0/mcs/; revision=112272
2008-09-04 12:34:42 +00:00
Rodrigo Kumpera 9efbf70813 In .:
2008-09-03 Rodrigo Kumpera  <[email protected]>+ 
 	* verify.c (verify_type_compatibility_full): Revert change
 	to allow converting a native int to unmanaged pointer be verifiable
 	under non-strict mode.
 	It turns out that "(IntPtr)null" is indeed unverifiable, go figure.
 
 	* verify.c: Added some TODOs.
	(Ported from trunk)


svn path=/branches/mono-2-0/mono/; revision=112216
2008-09-03 22:05:48 +00:00
Marek Safar 4994a0b289 2008-09-03 Marek Safar <[email protected]>
A fix for bug #422507
	* expression.cs (UnboxCast): Add missing child expression mutator.


svn path=/branches/mono-2-0/mcs/; revision=112185
2008-09-03 15:25:39 +00:00
Ivan Zlatev cb9600b9b9 2008-09-03 Ivan N. Zlatev <[email protected]>
* ButtonBase.cs CheckBox.cs, Control.cs, FlowLayoutPanel.cs,
	  FlowLayoutSettings.cs, GroupBox.cs, Label.cs, ListBox.cs,
	  PropertyGrid.cs, RadioButton.cs, TableLayoutPanel.cs,
	  TableLayoutSettings.cs, ToolStrip.cs, ToolStripDropDownButton.cs,
	  ToolStripDropDownMenu.cs, ToolStripItem.cs, ToolStripSplitButton.cs,
	  ToolStripStatusLabel.cs: Add missing PerformLayout calls to various
	  properties.
	  [Fixes bug #418684]

svn path=/branches/mono-2-0/mcs/; revision=112175
2008-09-03 12:35:10 +00:00
Marek Safar 34c7e44150 2008-09-03 Marek Safar <[email protected]>
A fix for bug #422507
	* expression.cs (StringConcat): Add missing type mutator.


svn path=/branches/mono-2-0/mcs/; revision=112171
2008-09-03 11:59:33 +00:00
Bill Holmes 4cd4569ec6 2008-09-02 Bill Holmes <[email protected]>
Backport of r112125

	* marshal.c (ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi,
	  ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni) :
	  Changed to use GlobalAlloc for the memory returned on Windows platforms.

	Code is contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=112128
2008-09-02 21:43:21 +00:00
Jonathan Pobst 93b9e20e3c 2008-09-02 Jonathan Pobst <[email protected]>
* XplatUIWin32.cs: Ensure we never send the WS_EX_MDICHILD flag
	to Windows when creating a window, as we fake MDI stuffs.
	[Fixes bug #421858]

svn path=/branches/mono-2-0/mcs/; revision=112096
2008-09-02 16:00:34 +00:00
Rodrigo Kumpera 28021d9e5c In .:
2008-09-02  Rodrigo Kumpera  <[email protected]>

	* method-to-ir.c (initialize_array_data): Handle field with RVA from
	dynamic images.
	(Ported from trunk)


svn path=/branches/mono-2-0/mono/; revision=112078
2008-09-02 11:50:22 +00:00
Rodrigo Kumpera d04c85fc8e In .:
2008-09-02 Rodrigo Kumpera  <[email protected]>

	* reflection.c (typebuilder_setup_fields): Handle classes with
	explicit size.
	(Ported from trunk)


svn path=/branches/mono-2-0/mono/; revision=112077
2008-09-02 11:49:03 +00:00
Rodrigo Kumpera beebac4e2e In Test/System.ComponentModel:
2008-09-02  Rodrigo Kumpera  <[email protected]>
	[Backport to 2.0]
	* PropertyDescriptorTest.cs: Tests for Get/Set Value of partial
	overrides of virtual properties.

In System.ComponentModel:
2008-09-02  Rodrigo Kumpera  <[email protected]>
	[Backport to 2.0]
	* ReflectionPropertyDescriptor.cs (SetValue, GetValue) : Lookup
	the MethodInfo for accessors in parent types in case of partial
	overrides of virtual properties.


svn path=/branches/mono-2-0/mcs/; revision=112074
2008-09-02 11:39:01 +00:00
Marek Safar 018c430733 Updated
svn path=/branches/mono-2-0/mcs/; revision=112046
2008-09-01 16:45:30 +00:00
Ivan Zlatev 723a933e9c 2008-09-01 Ivan N. Zlatev <[email protected]>
* TextBox.cs: Invalidate after UseSystemPasswordChar, so that the
	change takes effect.
	[Fixes bug #417957]

svn path=/branches/mono-2-0/mcs/; revision=112042
2008-09-01 16:06:39 +00:00
Jb Evain 8cec72a31f backport r112039
svn path=/branches/mono-2-0/mcs/; revision=112040
2008-09-01 15:22:28 +00:00
Jb Evain ed3a8e8e12 backport 112034
svn path=/branches/mono-2-0/mcs/; revision=112035
2008-09-01 14:23:35 +00:00
Jb Evain 0eee593d3a backport r112032
svn path=/branches/mono-2-0/mcs/; revision=112033
2008-09-01 14:21:02 +00:00
Ivan Zlatev a0b8967951 2008-09-01 Ivan N. Zlatev <[email protected]>
* SettingsPropertyValue.cs: Explicitly use the Invariant culture
	instead of the current.
	[Fixes bug #374516]

svn path=/branches/mono-2-0/mcs/; revision=112028
2008-09-01 13:55:35 +00:00
Ivan Zlatev 4b5cb5b7ec 2008-09-01 Ivan N. Zlatev <[email protected]>
* ParentControlDesigner.cs: Be nice with Components that are no
	Controls in CreateToolCore.

svn path=/branches/mono-2-0/mcs/; revision=112024
2008-09-01 13:32:16 +00:00
Dick Porter 7c9abd6ea4 2008-09-01 Dick Porter <[email protected]>
* InotifyWatcher.cs: Revert fix for bug 322330, as it is somehow
	breaking other stuff.
	(Ported from trunk)



svn path=/branches/mono-2-0/mcs/; revision=112021
2008-09-01 13:28:24 +00:00
Ivan Zlatev 4b791f4ebf 2008-08-24 Ivan N. Zlatev <[email protected]>
* XplatUIX11.cs: Provide MouseButtons/State information to the XPlatUI.
        [Fixes bug #419001]

svn path=/branches/mono-2-0/mcs/; revision=112016
2008-09-01 12:16:42 +00:00
Marek Safar e61f5a6c0b 2008-09-01 Marek Safar <[email protected]>
A fix for bug #421736
	* iterators.cs: Don't crash on unreachable iterators.


svn path=/branches/mono-2-0/mcs/; revision=112014
2008-09-01 11:42:10 +00:00
Marek Safar 4576f262ca 2008-09-01 Marek Safar <[email protected]>
A fix for bug #421628
	* parameter.cs, attribute.cs: Clone also parameter attributes.


svn path=/branches/mono-2-0/mcs/; revision=112009
2008-09-01 10:23:54 +00:00
Marek Habersack 44f49f7e6d Backport of r112005
svn path=/branches/mono-2-0/mcs/; revision=112006
2008-09-01 02:30:50 +00:00
Marek Habersack 06de999787 Backport of r112003 + some forgotten ChangeLog entries
svn path=/branches/mono-2-0/mcs/; revision=112004
2008-09-01 01:33:52 +00:00
Marek Habersack e95d116ee3 Backport of r112000
svn path=/branches/mono-2-0/mcs/; revision=112001
2008-09-01 00:18:10 +00:00
Marek Habersack 24ff4f1c36 Backport of r111998
svn path=/branches/mono-2-0/mcs/; revision=111999
2008-08-31 23:31:09 +00:00
Zoltan Varga 8ecd99c009 Merge r111994 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=111996
2008-08-31 20:12:44 +00:00
Marek Habersack 667266be44 Backport of r111990
svn path=/branches/mono-2-0/mcs/; revision=111991
2008-08-31 17:05:47 +00:00
Zoltan Varga 71b2fac370 Revert last change as it breaks the build.
svn path=/branches/mono-2-0/mono/; revision=111986
2008-08-31 09:19:24 +00:00
Marek Habersack 94782a9675 Backport of r111983
svn path=/branches/mono-2-0/mcs/; revision=111984
2008-08-31 02:06:33 +00:00
Zoltan Varga 58f0695e8b 2008-08-31 Zoltan Varga <[email protected]>
* class.c (mono_class_is_assignable_from): Call mono_class_setup_vtable ()
	before accessing klass->interface_bitmap. Fixes #421744.

svn path=/branches/mono-2-0/mono/; revision=111981
2008-08-30 23:24:16 +00:00
Marek Habersack a0cd75d310 Backport of r111956
svn path=/branches/mono-2-0/mcs/; revision=111957
2008-08-29 22:38:14 +00:00
Marek Habersack 5a6bb10f5c Backport of r111939
svn path=/branches/mono-2-0/mcs/; revision=111940
2008-08-29 19:43:16 +00:00
Geoff Norton cc104efec3 2008-08-29 Geoff Norton <[email protected]>
* aot-compiler.c: The Mach/ARM compiler doesn't understand the bss
        segment, and doesn't properly handle .space as .text.  Fixes
        AOT Mach/ARM

svn path=/branches/mono-2-0/mono/; revision=111931
2008-08-29 17:56:59 +00:00
Geoff Norton f40f665d9b 2008-08-29 Geoff Norton <[email protected]>
* mini.c: Disable the mach exception handler when running on
        ARM

svn path=/branches/mono-2-0/mono/; revision=111928
2008-08-29 15:32:34 +00:00
Geoff Norton 8e2e6c1909 2008-08-29 Geoff Norton <[email protected]>
* aot-compiler.c: Patch from Renaldas Zioma to properly register
        globals on Darwin/ARM

svn path=/branches/mono-2-0/mono/; revision=111923
2008-08-29 14:27:23 +00:00
Marek Habersack 8980b35c17 Backport of r111916
svn path=/branches/mono-2-0/mcs/; revision=111917
2008-08-29 13:08:12 +00:00
Dick Porter 8325c4c78e 2008-07-28 Dick Porter <[email protected]>
* Process.cs: When passing handle references around, it needs to
	be duplicated and freed so the OS doesn't close it.  Makes the
	testcase in 410743 work again now the underlying bug has been
	fixed.
	(Ported from trunk.)



svn path=/branches/mono-2-0/mcs/; revision=111900
2008-08-29 09:26:58 +00:00
Dick Porter e186bdfb4b 2008-08-29 Dick Porter <[email protected]>
* icall-def.h
	* process.c
	(ves_icall_System_Diagnostics_Process_ProcessHandle_duplicate):
	New internal calls to duplicate and close a process handle.
	(Ported from trunk)



svn path=/branches/mono-2-0/mono/; revision=111899
2008-08-29 09:25:17 +00:00
Bill Holmes 208de0f8ac 2008-08-28 Bill Holmes <[email protected]>
Backport of r111875

	* src/glib.h : Adding a c++ definition for G_BEGIN_DECLS.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=111876
2008-08-28 20:55:01 +00:00
Geoff Norton 1eaf76f83a 2008-08-28 Geoff Norton <[email protected]>
* build-iphone.sh: iPhone lies about HAVE_MMAP as well.

svn path=/branches/mono-2-0/mono/; revision=111871
2008-08-28 20:40:57 +00:00
Geoff Norton 84ad52dda7 2008-08-28 Geoff Norton <[email protected]>
* darwin_stop_world.c:
        * include/private/gcconfig.h: Add support for Darwin/ARM

svn path=/branches/mono-2-0/mono/; revision=111870
2008-08-28 20:40:52 +00:00
Zoltan Varga 3afcd622ea Merge r111867 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111868
2008-08-28 20:24:00 +00:00
Zoltan Varga ecf4d5fec4 Merge r111865 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111866
2008-08-28 20:19:11 +00:00
Zoltan Varga 191a0b7c13 Merge r111861 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111862
2008-08-28 19:40:46 +00:00
Zoltan Varga b428cee93f Merge r111859 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111860
2008-08-28 19:37:29 +00:00
Miguel de Icaza 75d83b4784 Add here as well
svn path=/branches/mono-2-0/mcs/; revision=111852
2008-08-28 17:54:30 +00:00
Miguel de Icaza 33a4ce27ab Backport console fixes to 2.0
svn path=/branches/mono-2-0/mcs/; revision=111850
2008-08-28 17:46:03 +00:00
Miguel de Icaza b7fbf894c5 Backport console fixes to 2.0
svn path=/branches/mono-2-0/mono/; revision=111849
2008-08-28 17:45:52 +00:00
Zoltan Varga 733791ff24 Merge the wapi handle leak fix from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111810
2008-08-28 13:54:41 +00:00
Zoltan Varga 462f7da2b9 Merge r111807 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111808
2008-08-28 13:53:01 +00:00
Marek Safar 9b58fb9ab7 2008-08-28 Marek Safar <[email protected]>
A fix for bug #420832
	* anonymous.cs, iterators.cs: Also clone hoisted this iterator variable.


svn path=/branches/mono-2-0/mcs/; revision=111804
2008-08-28 13:33:01 +00:00
Marek Habersack 1c8879f557 Backport of r111801
svn path=/branches/mono-2-0/mcs/; revision=111802
2008-08-28 13:13:53 +00:00
Marek Safar 17da99ccab 2008-08-28 Marek Safar <[email protected]>
A fix for bug #420386
	* nullables.cs: Fixed logic of nullable user comparison operators involving
	null values.


svn path=/branches/mono-2-0/mcs/; revision=111798
2008-08-28 11:07:12 +00:00
Marek Safar c64179faa5 2008-08-28 Marek Safar <[email protected]>
* attribute (IsClsCompliant): Use FALSE value for pointer types.


svn path=/branches/mono-2-0/mcs/; revision=111795
2008-08-28 10:10:25 +00:00
Zoltan Varga 6d32218cb8 Merge r111774 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111775
2008-08-28 01:40:18 +00:00
Marek Habersack 6262c11cfc Backport of r111772
svn path=/branches/mono-2-0/mcs/; revision=111773
2008-08-28 01:36:08 +00:00
Zoltan Varga 412d92d596 Merge r111770 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111771
2008-08-28 01:35:46 +00:00
Zoltan Varga bfcdea1305 Merge r111765 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111768
2008-08-28 01:23:01 +00:00
Zoltan Varga ab453faffe Merge r111766 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111767
2008-08-28 01:19:21 +00:00
Zoltan Varga 62bf373fea Merge r111759 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111760
2008-08-28 00:04:52 +00:00
Zoltan Varga 4136d5da76 Merge r111748-r111752 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111758
2008-08-27 23:42:34 +00:00
Zoltan Varga 9c81677a33 Merge r111755 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=111757
2008-08-27 23:38:56 +00:00
Zoltan Varga fc363fc7a6 Merge r111754 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=111756
2008-08-27 23:36:22 +00:00
Bill Holmes c221d6c0e8 2008-08-27 Bill Holmes <[email protected]>
Backport of r111724.

	* mini-amd64.h : Fix a compiler warning.

	* exceptions-amd64.c (mono_arch_unwindinfo_install_unwind_info) :
	  Changed to use a callback function to retrieve the unwind info.
	  This avoids problems observed when code blocks were removed by
	  unloading an app domain.

	* mini-amd64.c (mono_arch_cpu_optimizazions) : Removing the peephole 
	  and branch excludes for Winx64.  The fix in exceptions-amd64.c allows them
	  to work properly.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=111729
2008-08-27 18:18:35 +00:00
Bill Holmes 47932d265a 2008-08-27 Bill Holmes <[email protected]>
Backport of r111722.

	* mini-amd64.c (mono_arch_output_basic_block) : Fix the OP_X86_PUSH_OBJ
	  case to keep the stack aligned to 8.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=111728
2008-08-27 18:15:59 +00:00
Zoltan Varga e2c37e98bf Merge r111681 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111682
2008-08-27 03:30:26 +00:00
Veerapuram Varadhan 6eedd08ed8 Do not call GetSchemaTable() from the constructor, instead fetch column
information.


svn path=/branches/mono-2-0/mcs/; revision=111651
2008-08-26 19:42:05 +00:00
Veerapuram Varadhan 060406f25e Handle binary type along with VarBinary and Image
svn path=/branches/mono-2-0/mcs/; revision=111645
2008-08-26 19:23:11 +00:00
Veerapuram Varadhan dc60cf7ea6 Test case for testing binary type
svn path=/branches/mono-2-0/mcs/; revision=111644
2008-08-26 19:21:49 +00:00
Zoltan Varga 24575d5e57 Merge r111641 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111642
2008-08-26 19:12:21 +00:00
Zoltan Varga 6f6a2135b5 Merge r111637 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=111639
2008-08-26 18:47:41 +00:00
Geoff Norton 06c53dfc80 Whoops
svn path=/branches/mono-2-0/mono/; revision=111638
2008-08-26 18:44:28 +00:00
Geoff Norton fdcba04ccc 2008-08-26 Geoff Norton <[email protected]>
* build-iphone.sh: Update build-iphone to not wget old inssel's, and build
        out of the box with teh current SDK.

svn path=/branches/mono-2-0/mono/; revision=111636
2008-08-26 18:19:35 +00:00
Jonathan Pobst 2ce934fbac 2008-08-26 Jonathan Pobst <[email protected]>
* ErrorProvider.cs: Fix a regression NRE when setting properties
	for a control before it has a parent.
	[Fixes bug #420305]

svn path=/branches/mono-2-0/mcs/; revision=111627
2008-08-26 16:35:35 +00:00
Jonathan Pobst 4b6092b945 2008-08-19 Jonathan Pobst <[email protected]>
* LinkLabel.cs: Always clear any previous links when LinkArea
	is set.  [Fixes bug #410709]

svn path=/branches/mono-2-0/mcs/; revision=111617
2008-08-26 14:25:38 +00:00
Veerapuram Varadhan c35c98a888 Backported from trunk - test case for bug#377146
svn path=/branches/mono-2-0/mcs/; revision=111613
2008-08-26 13:28:24 +00:00
Veerapuram Varadhan 1d05f4019d Backported from trunk - on demand generation of schemaTable and related
memory fixes


svn path=/branches/mono-2-0/mcs/; revision=111610
2008-08-26 13:17:08 +00:00
Veerapuram Varadhan 2c90f8215b Fix for 377146 - let the reference type's ReadXml do the reading, if it
implements IXmlSerializable


svn path=/branches/mono-2-0/mcs/; revision=111597
2008-08-26 10:18:25 +00:00
Scott Thomas 741b3708a6 Fixed bug 417833 which allowed for the creation of illegal
BitVector32.Sections. Also added a unit test for the bug.


svn path=/branches/mono-2-0/mcs/; revision=111592
2008-08-26 02:26:24 +00:00
Marek Habersack 88d78a139c Backport of r111589
svn path=/branches/mono-2-0/mcs/; revision=111590
2008-08-26 00:58:43 +00:00
Marek Habersack 9ecf430d4a Backport of r111587
svn path=/branches/mono-2-0/mcs/; revision=111588
2008-08-26 00:14:32 +00:00
Zoltan Varga 66fa2508f9 Merge r111576 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111578
2008-08-25 21:33:52 +00:00
Marek Habersack a7d6f5e17f Backport of r111572
svn path=/branches/mono-2-0/mcs/; revision=111573
2008-08-25 20:39:49 +00:00
Zoltan Varga 6b8412c1d3 2008-08-25 Zoltan Varga <[email protected]>
* aot-compiler.c (add_method): Avoid adding a method twice.
	(add_wrappers): Add runtime invoke wrappers for all methods.

svn path=/branches/mono-2-0/mono/; revision=111541
2008-08-25 17:46:47 +00:00
Zoltan Varga 2641cfa52a 2008-08-25 Zoltan Varga <[email protected]>
* mini.c (mono_method_to_ir): Handle the !aot case in CEE_MONO_ICALL_ADDR.

svn path=/branches/mono-2-0/mono/; revision=111537
2008-08-25 15:06:35 +00:00
Atsushi Eno 4a05d3d046 backport r111535.
svn path=/branches/mono-2-0/mcs/; revision=111536
2008-08-25 14:58:12 +00:00
Marek Habersack dda14a7141 Backport of r111526
svn path=/branches/mono-2-0/mcs/; revision=111527
2008-08-25 10:48:41 +00:00
Zoltan Varga 9dbe7163c6 Merge r111497 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111498
2008-08-24 12:34:50 +00:00
Zoltan Varga 4da72ac87d Merge rr111495 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111496
2008-08-24 12:08:12 +00:00
Marek Habersack 965210d362 Backport of r111421
svn path=/branches/mono-2-0/mcs/; revision=111422
2008-08-22 20:52:01 +00:00
Zoltan Varga a2831a6759 Merge r111361 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111362
2008-08-22 11:56:05 +00:00
Atsushi Eno ce7703f9ef backport r111349 and r111350.
svn path=/branches/mono-2-0/mcs/; revision=111351
2008-08-22 08:56:07 +00:00
Massimiliano Mantione e611b35bc9 * mono.1: Updated description of the logging profiler from trunk.
svn path=/branches/mono-2-0/mono/; revision=111345
2008-08-22 07:28:00 +00:00
Massimiliano Mantione 6ae3bec0b6 * mono-profiler-logging.c: Backported fixes from trunk (making it
identical to r111250):
        - r111250 (correct accounting of allocations happening at JIT time).
        - r111096 (emit directives blocks).
        - r111095 (stack tracking).
        - r109120 (fix bug 412473).
        - r109069 (fix allocation summaries).
        - r108633 (emit full type names for loaded classes, by Rodrigo Kumpera).
        - r108632 (use the "runtime initialized" hook to register the thread).


svn path=/branches/mono-2-0/mono/; revision=111344
2008-08-22 07:26:58 +00:00
Bill Holmes e7a8f19764 2008-08-20 Bill Holmes <[email protected]>
Backport of r111197

	* exceptions-amd64.c (seh_handler):  For Winx64 adding missing copy 
	  of nonvolatile registers back from MonoContext to CONTEXT.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=111209
2008-08-20 22:26:00 +00:00
Bill Holmes e7c42af958 2008-08-20 Bill Holmes <[email protected]>
Backport of r111194

	* mini-amd64.c (mono_arch_get_delegate_invoke_impl):  When shifting the
	  arguments on Winx64 there are only 4 argument registers.  For this
	  logic to work the last argument must be pulled from the stack.  

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=111206
2008-08-20 22:23:59 +00:00
Marek Habersack a0d26a1ecc Backport of r111122
svn path=/branches/mono-2-0/mcs/; revision=111123
2008-08-20 14:07:20 +00:00
Marek Habersack 23848fcfc6 Optimization of the bug #418620 fix, by Juraj Skripsky <[email protected]>, thanks!
svn path=/branches/mono-2-0/mcs/; revision=111108
2008-08-20 12:46:53 +00:00
Marek Habersack 8744beb65c Backport of r111103
svn path=/branches/mono-2-0/mcs/; revision=111104
2008-08-20 11:51:29 +00:00
Zoltan Varga 9b07470957 Merge r111051 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=111053
2008-08-20 01:42:54 +00:00
Marek Habersack 7ee3c559e3 Backport of r111024
svn path=/branches/mono-2-0/mcs/; revision=111025
2008-08-19 22:26:05 +00:00
Marek Habersack dc5b0de65a Backport of r110984
svn path=/branches/mono-2-0/mcs/; revision=110985
2008-08-19 19:47:56 +00:00
Zoltan Varga d5a9aafee6 2008-08-19 Zoltan Varga <[email protected]>
* mini-ia64.c (mono_arch_output_basic_block): Add OP_FCONV_TO_I.
	Fixes #418381.

svn path=/branches/mono-2-0/mono/; revision=110976
2008-08-19 18:55:43 +00:00
Marek Habersack e4ab1fe02c Backport of r110941
svn path=/branches/mono-2-0/mcs/; revision=110942
2008-08-19 12:54:35 +00:00
Marek Habersack ad05561854 Backport of r110932
svn path=/branches/mono-2-0/mcs/; revision=110933
2008-08-19 10:34:56 +00:00
Atsushi Eno be268ce1fa backport r110924.
svn path=/branches/mono-2-0/mcs/; revision=110925
2008-08-19 07:51:38 +00:00
Andreia Gaita 3c4a0853ca Revert r110884, these changes are not for the branch :P
svn path=/branches/mono-2-0/mcs/; revision=110893
2008-08-19 00:23:55 +00:00
Andreia Gaita 0c1e02a5fd * Assembly/AssemblyInfo.cs, ChangeLog,
Mono.WebBrowser/DOM/IAttribute.cs,
  Mono.WebBrowser/DOM/IElementCollection.cs,
  Mono.WebBrowser/DOM/IWindow.cs, Mono.WebBrowser/DOM/IDocument.cs,
  Mono.WebBrowser/DOM/IAttributeCollection.cs,
  Mono.WebBrowser/DOM/INodeList.cs,
  Mono.WebBrowser/DOM/IWindowCollection.cs,
  Mono.WebBrowser/DOM/INode.cs, Mono.WebBrowser/DOM/IElement.cs,
  Mono.WebBrowser/DOM/INavigation.cs,
  Mono.WebBrowser/DOM/IHistory.cs, Mono.WebBrowser/Exception.cs,
  Mono.WebBrowser/IWebBrowser.cs, Mono.Mozilla/DOM/Document.cs,
  Mono.Mozilla/DOM/HTMLElement.cs,
  Mono.Mozilla/DOM/AttributeCollection.cs,
  Mono.Mozilla/DOM/DocumentType.cs, Mono.Mozilla/DOM/NodeList.cs,
  Mono.Mozilla/DOM/WindowCollection.cs, Mono.Mozilla/DOM/Node.cs,
  Mono.Mozilla/DOM/NamedNodeMap.cs, Mono.Mozilla/DOM/Element.cs,
  Mono.Mozilla/DOM/HTMLElementCollection.cs,
  Mono.Mozilla/DOM/Navigation.cs, Mono.Mozilla/DOM/History.cs,
  Mono.Mozilla/DOM/Attribute.cs, Mono.Mozilla/DOM/DOMObject.cs,
  Mono.Mozilla/DOM/Window.cs, Mono.Mozilla/Callback.cs,
  Mono.Mozilla/AsciiString.cs, Mono.Mozilla/WebBrowser.cs,
  Mono.Mozilla/UniString.cs, Mono.Mozilla/Base.cs: Fix inconsistent
  newlines. Add eol-style property

svn path=/branches/mono-2-0/mcs/; revision=110884
2008-08-18 23:58:04 +00:00
Marek Habersack 0436f3c228 Backport of r110844
svn path=/branches/mono-2-0/mcs/; revision=110845
2008-08-18 19:49:29 +00:00
Marek Habersack 8eecfbc54b Backport of r110734
svn path=/branches/mono-2-0/mcs/; revision=110735
2008-08-18 14:28:01 +00:00
Marek Habersack a2470d9b12 Backport of r110722
svn path=/branches/mono-2-0/mcs/; revision=110723
2008-08-18 10:21:59 +00:00
Zoltan Varga 9abbb9bfa3 Merge r110653 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=110654
2008-08-16 15:04:13 +00:00
Ivan Zlatev 50c4040639 2008-08-16 Ivan N. Zlatev <[email protected]>
* GridEntry.cs: Leave the ICustomTypeDescriptor handling up to the
	ComponentModel layer, which will properly prioritize the attributes.
	Avoids wrong prioritization of duplicate attributes when retrieving
	the converter and editor.
	[Fixes bug #417729]

svn path=/branches/mono-2-0/mcs/; revision=110644
2008-08-16 11:19:21 +00:00
Ivan Zlatev 438bc0e3aa 2008-08-15 Ivan N. Zlatev <[email protected]>
* GridEntry.cs: Perform stricter check for the ParentEntry's
	PropertyDescriptor/PropertyOwner for the ICustomTypeDescriptor
	implementation.
	[Fixes bug #417567]

svn path=/branches/mono-2-0/mcs/; revision=110565
2008-08-15 12:38:51 +00:00
Zoltan Varga ed6dfed6f5 2008-08-14 Zoltan Varga <[email protected]>
* mini.c (mini_method_compile): Abort aot compilation for generic
	methods if generic sharing is disabled.
	
	* mini.c (mono_method_to_ir): Disable AOT for virtual calls requiring
	an mrgctx.

svn path=/branches/mono-2-0/mono/; revision=110524
2008-08-14 19:44:17 +00:00
Marek Habersack 9ddad195c6 Backport of r110516
svn path=/branches/mono-2-0/mcs/; revision=110517
2008-08-14 18:42:29 +00:00
Geoff Norton 29444d0002 2008-08-14 Geoff Norton <[email protected]>
* XplatUICarbon.cs: Track the ActiveWindow internally for GetActive().
        Don't prematurely display POPUP windows.  Fully fixed #393317.

svn path=/branches/mono-2-0/mcs/; revision=110513
2008-08-14 18:29:37 +00:00
Geoff Norton 079933816f 2008-08-14 Geoff Norton <[email protected]>
* WindowHandler.cs: Revert the change which didn't set ActiveWindow
        here and fix the problem in the driver.  Fully fixes #393317.

svn path=/branches/mono-2-0/mcs/; revision=110512
2008-08-14 18:29:33 +00:00
Marek Safar 950d95d519 2008-08-14 Marek Safar <[email protected]>
A fix for bug #417078
	* expression.cs: Emit correctly left side pointer operators.


svn path=/branches/mono-2-0/mcs/; revision=110469
2008-08-14 11:03:14 +00:00
Marek Habersack 2e21360c50 Backport of r110441
svn path=/branches/mono-2-0/mcs/; revision=110442
2008-08-14 00:36:14 +00:00
Marek Habersack 8943e7e0d6 Backport of r110403
svn path=/branches/mono-2-0/mcs/; revision=110404
2008-08-13 20:39:34 +00:00
Marek Habersack cc3db58df7 Backport of r110389
svn path=/branches/mono-2-0/mcs/; revision=110390
2008-08-13 18:17:30 +00:00
Marek Habersack 7e1e70827a Backport of r110385
svn path=/branches/mono-2-0/mcs/; revision=110386
2008-08-13 17:51:09 +00:00
Bill Holmes 466e31790f 2008-08-13 Bill Holmes <[email protected]>
* winconfig.h:  Updating the config file for MSVC builds to match
 	  the config file used when compiling with gcc in Cygwin.

	* eglib.vcproj, genmdesc.vcproj, libgc.vcproj, libmono.vcproj, libtest.vcproj,
	  mono.vcproj, monoburg.vcproj, monodiet.vcproj, monodis.vcproj, monograph.vcproj,
	  pedump.vcproj, test_eglib.vcproj, teste.vcproj, test-invoke.vcproj,
	  test-metadata.vcproj:  Updating the preprocessor definitions for MSVC builds to
	  match the gcc build in Cygwin.

	* mini-amd64.c (mono_arch_cpu_optimizazions):  Remove peephole and branch
	  from default optimizaton list on Winx64.

	* mini-amd64.c (emit_tls_get):  Added Winx64 specific implementation for GetTLS.

	* mini-amd64.c (mono_arch_emit_prolog):  Adding an offset on Winx64 to get
	  the LMF from the MonoJitTlsData structure.

	* mini-amd64.c (mono_arch_setup_jit_tls_data):  Added Winx64 implementation.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=110378
2008-08-13 16:41:20 +00:00
Zoltan Varga 5405ae9046 2008-08-12 Zoltan Varga <[email protected]>
* driver.c (main_thread_handler): Allow AOT compilation of multiple 
	assemblies in one run.

	* aot-compiler.c (mono_compile_assembly): Only print out a count of
	skipped methods if it is not 0.

svn path=/branches/mono-2-0/mono/; revision=110308
2008-08-12 21:48:51 +00:00
Zoltan Varga d7b1a66b94 Merge r110288 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=110291
2008-08-12 19:46:06 +00:00
Geoff Norton 7b06e01c8f 2008-08-12 Geoff Norton <[email protected]>
* pthread_support.c: GCC shipped with SLES9 ppc gets confused with our current
        GC_setspecific define.  Unfold the define into a static inline on all platforms
        except ppc where it is a static leaf function.

svn path=/branches/mono-2-0/mono/; revision=110287
2008-08-12 19:33:24 +00:00
Zoltan Varga efb68a566b Really fix the build.
svn path=/branches/mono-2-0/mono/; revision=110286
2008-08-12 19:30:16 +00:00
Miguel de Icaza 1ea3cc4cf0 Fix the build
svn path=/branches/mono-2-0/mono/; revision=110267
2008-08-12 17:22:20 +00:00
Carlos Alberto Cortez 2387e7270d * XplatUIX11.cs: Handle the obscured regions while scrolling using
GraphicsExpose event, processing it just after we copy the scrolled
	area. This ensures that the next calls to ScrollWindow will copy
	regions already updated, and the scrolling will be smooth. Also remove
	the code that was trying to detect the obscured regions, since we are
	not using it anymore (too slow).

2008-08-12  Carlos Alberto Cortez <[email protected]>


svn path=/branches/mono-2-0/mcs/; revision=110252
2008-08-12 15:53:00 +00:00
Carlos Alberto Cortez dd49afdaf1 * ListBox.cs: Fix the -temporary- broken selection in ListBox for
MultiExtended mode, by separating some logic between the ctrl/shift
	handling. Also ignore any MouseMove events generated together with
	MouseDown events - we are only interested in the real motion event.
	Fixes part of #414963.

2008-08-12  Carlos Alberto Cortez <[email protected]>


svn path=/branches/mono-2-0/mcs/; revision=110250
2008-08-12 15:33:42 +00:00
Carlos Alberto Cortez 59b3a649d5 2008-08-12 Carlos Alberto Cortez <[email protected]>
* XplatUIX11.cs: When getting EnterNotify with mode other than
	NotifyNormal (pseudo motion events), ignore them as we used to do
	before, since it's breaking our selection code and some drag and drop
	operations, because of the confusion of generating extra events (not
	fired by .net, btw).


svn path=/branches/mono-2-0/mcs/; revision=110246
2008-08-12 15:19:07 +00:00
Zoltan Varga c5fd486b84 2008-08-12 Zoltan Varga <[email protected]>
* mini-amd64.c (emit_call_body): Use image->aot_module instead of 
	assembly->aot_module.

	* aot-runtime.c: Use image->aot_module instead of searching in the aot_modules
	hash table. This simplifies and speeds up a lot of code, and fixes support
	for .netmodules.

svn path=/branches/mono-2-0/mono/; revision=110237
2008-08-12 14:15:45 +00:00
Zoltan Varga 637aa4c949 Merge r110233 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=110234
2008-08-12 14:12:13 +00:00
Zoltan Varga 5db35126ad Merge r110229 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=110230
2008-08-12 13:03:09 +00:00
Zoltan Varga 7b270fecd9 Merge r110156-r110157 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=110158
2008-08-11 20:07:32 +00:00
Marek Habersack 4e6fe443a2 Backport of r110125
svn path=/branches/mono-2-0/mcs/; revision=110126
2008-08-11 17:05:13 +00:00
Marek Habersack b2882b35e8 Backport of r110121
svn path=/branches/mono-2-0/mcs/; revision=110122
2008-08-11 16:14:04 +00:00
Zoltan Varga 1c482a505c Merge r110066 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=110067
2008-08-10 11:30:40 +00:00
Jonathan Pobst d14e5c26e2 2008-08-08 Jonathan Pobst <[email protected]>
* DataGridViewCell.cs: Guard against an AOORE when checking if a cell
	is selected.  [Fixes bug #414143]

svn path=/branches/mono-2-0/mcs/; revision=110025
2008-08-08 20:45:37 +00:00
Zoltan Varga de071f89a0 2008-08-08 Zoltan Varga <[email protected]>
* aot-compiler.c (mono_aot_parse_options): Disable no-dlsym option for now.

svn path=/branches/mono-2-0/mono/; revision=109973
2008-08-08 15:23:07 +00:00
Zoltan Varga 2ddeac257f Merge r109971 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=109972
2008-08-08 15:18:27 +00:00
Zoltan Varga 00c96e5ee1 2008-08-08 Zoltan Varga <[email protected]>
* marshal.c (mono_remoting_wrapper): Handle nullable types correctly.
	Fixes #415621.

	Backported from trunk.

svn path=/branches/mono-2-0/mono/; revision=109969
2008-08-08 14:59:54 +00:00
Zoltan Varga 939f5b706d 2008-08-08 Zoltan Varga <[email protected]>
* mini.c (mono_resolve_patch_target): Don't error out on missing icalls
	while aot compiling.

svn path=/branches/mono-2-0/mono/; revision=109966
2008-08-08 14:34:35 +00:00
Zoltan Varga a549de0c98 Fix a typo.
svn path=/branches/mono-2-0/mono/; revision=109965
2008-08-08 14:11:51 +00:00
Zoltan Varga e4767b2ed7 2008-08-08 Zoltan Varga <[email protected]>
* mini.c driver.c aot-compiler.c: Update after changes to 
	mono_marshal_get_native_wrapper () signature changes.

	* mini.c (mono_resolve_patch_target): Error out if an icall is not found.
	(mono_method_to_ir): Handle new CEE_MONO_ICALL_ADDR opcode.

svn path=/branches/mono-2-0/mono/; revision=109963
2008-08-08 13:50:44 +00:00
Zoltan Varga e336bccc7a 2008-08-08 Zoltan Varga <[email protected]>
* marshal.c (mono_marshal_get_native_wrapper): Add an 'aot' argument, when
	it is set, looking up the icall address is deferred to the JIT, since 
	in embedded scenarios, the icall might not be registered in the runtime
	doing the AOT compilation.

svn path=/branches/mono-2-0/mono/; revision=109962
2008-08-08 13:48:24 +00:00
Zoltan Varga 5b5f567690 2008-08-08 Zoltan Varga <[email protected]>
* cil-opcodes.xml: Add an 'icall_addr' opcode.

svn path=/branches/mono-2-0/mono/; revision=109960
2008-08-08 13:45:45 +00:00
Marek Habersack 46184895e1 Backport of r109952
svn path=/branches/mono-2-0/mcs/; revision=109953
2008-08-08 09:52:47 +00:00
Jb Evain 8b4bde4713 backport r109948
svn path=/branches/mono-2-0/mcs/; revision=109949
2008-08-08 08:43:10 +00:00
Marek Habersack 8e21b187db Backport of r109922
svn path=/branches/mono-2-0/mcs/; revision=109923
2008-08-08 00:37:19 +00:00
Zoltan Varga 2557c91607 2008-08-07 Zoltan Varga <[email protected]>
* aot-runtime.c (load_named_code): Pass the sofile to find_symbol, not the
	MonoAotModule.

svn path=/branches/mono-2-0/mono/; revision=109915
2008-08-07 21:45:49 +00:00
Zoltan Varga 480b7f5d7b 2008-08-07 Zoltan Varga <[email protected]>
* exceptions-arm.c (mono_arch_get_throw_exception_generic): Add aot
	support.

	* aot-runtime.c (load_named_code): Handle 'mono_arm_throw_exception'.

	* mini-arm.c (mono_arch_register_lowlevel_calls): Register 
	mono_arm_throw_exception as a jit icall.

svn path=/branches/mono-2-0/mono/; revision=109912
2008-08-07 21:19:37 +00:00
Zoltan Varga 6629632a6a 2008-08-07 Zoltan Varga <[email protected]>
* exceptions-arm.c (mono_arch_get_throw_exception_generic): Add aot
	support.

	* aot-runtime.c (load_named_code): Handle 'mono_arm_throw_exception'.

	* mini-arm.c (mono_arch_register_lowlevel_calls): Register 
	mono_arm_throw_exception as a jit icall.

svn path=/branches/mono-2-0/mono/; revision=109911
2008-08-07 21:19:13 +00:00
Gert Driesen 9f99215160 * TestIcon.cs: Add test case for bug #410608.
* Makefile: Add 323511.ico.
* Icon.cs (InitFromStreamWithSize): Move init of iconDir.idCount
and imageData until after the number of entries was determined to
cope with skipping of 256x256 icons. Fixes bug #410608.
* TestIcon.cs: Ignore test for bug #410608 on Unix, since it depends
on bug #323511.

svn path=/branches/mono-2-0/mcs/; revision=109881
2008-08-07 17:27:23 +00:00
Ivan Zlatev 278f836939 2008-08-07 Ivan N. Zlatev <[email protected]>
* GridEntry.cs: Check if current property is a ICustomTypeDescriptor
	and not the parent one (the propertyowner). Fixes the behavior of
	GetConverter/GetEditor.
	[Fixes bug #415452]

svn path=/branches/mono-2-0/mcs/; revision=109865
2008-08-07 14:44:32 +00:00
Ivan Zlatev e2bac9878f 2008-08-07 Ivan N. Zlatev <[email protected]>
* PropertyGrid.cs: Refresh should also repopulate the PropertyGrid.
	[Fixes part of bug #415452]

svn path=/branches/mono-2-0/mcs/; revision=109863
2008-08-07 14:41:02 +00:00
Jb Evain f275b6e485 backport 109858
svn path=/branches/mono-2-0/mcs/; revision=109859
2008-08-07 13:50:14 +00:00
Andreia Gaita bf926e9d96 * System.Windows.Forms/WebBrowser.cs: Remove extraneous CWL. Fixes
#411372 (partially)

svn path=/branches/mono-2-0/mcs/; revision=109838
2008-08-07 09:34:51 +00:00
Marek Habersack 6371e5446d Backport of r109776
svn path=/branches/mono-2-0/mcs/; revision=109777
2008-08-06 18:26:10 +00:00
Marek Habersack e6553234a6 Backport of r109773
svn path=/branches/mono-2-0/mcs/; revision=109774
2008-08-06 18:18:21 +00:00
Zoltan Varga f85a872195 2008-08-06 Zoltan Varga <[email protected]>
* aot-compiler.c (mono_compile_assembly): Correct the computation of 
	acfg->nmethods.
	(add_wrappers): Don't emit jit icall wrappers etc. into every image.

svn path=/branches/mono-2-0/mono/; revision=109760
2008-08-06 15:38:21 +00:00
Zoltan Varga bcd23c2ce3 Merge r109756 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=109757
2008-08-06 13:32:13 +00:00
Carlos Alberto Cortez f243f57580 2008-08-06 Carlos Alberto Cortez <[email protected]>
* ListBox.cs: Selection changes made in the MouseDown handler should
	use the *Core versions of selection in SelectedIndices collection,
	since the SelectedIndexChanged/SelectedValueChanged events are fired
	until we get a MouseUp event, and thus we need to separate the logic
	from the events, as done in the keyboard navigation. Also, fire those
	selection events from keyboard navigation in SelectionMode.None, even
	if we don't have a selection, as .Net does.


svn path=/branches/mono-2-0/mcs/; revision=109749
2008-08-06 12:03:42 +00:00
Zoltan Varga 2eab3e93ec Merge r109506 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=109746
2008-08-06 10:55:39 +00:00
Ivan Zlatev 2f5dd747db 2008-08-05 Ivan N. Zlatev <[email protected]>
* ApplicationSettingsBase.cs: If there is no explicit
	SettingsSerializeAs attribute to specify the format, distinguish
	between plain string and XML by checking if the TypeConverter for the
	property type supports string conversions. If it doesn't then we are
	present with XML.
	[Fixes bug #414445]

svn path=/branches/mono-2-0/mcs/; revision=109707
2008-08-05 20:39:48 +00:00
Ivan Zlatev 9b21552888 2008-08-05 Ivan N. Zlatev <[email protected]>
* GridEntry.cs: ITypeDescriptorContext should be relative to the parent
	GridEntry, not the current.
	[Fixes bug #413896]

svn path=/branches/mono-2-0/mcs/; revision=109684
2008-08-05 14:38:40 +00:00
Ivan Zlatev 130cc0265e 2008-08-04 Ivan N. Zlatev <[email protected]>
* TextBoxBase.cs: De-internalize max_length field.
	* RichTextBox.cs: Use base.MaxLength - both TextBoxBase and RichTextBox
	share the same logic.
	[Fixes bug #414454]

svn path=/branches/mono-2-0/mcs/; revision=109615
2008-08-04 20:32:51 +00:00
Zoltan Varga 1aa65b49b5 2008-08-04 Zoltan Varga <[email protected]>
* socket-io.c (get_socket_assembly): Make 'moonlight' variable static.

svn path=/branches/mono-2-0/mono/; revision=109605
2008-08-04 18:58:40 +00:00
Geoff Norton 3d4af0a3ca 2008-08-01 Geoff Norton <[email protected]>
* CarbonCursor.cs: If the window doesn't have a cursor set, revert
        to the default.  Fixes #411114.

svn path=/branches/mono-2-0/mcs/; revision=109603
2008-08-04 18:56:14 +00:00
Geoff Norton 34a36c6021 2008-07-31 Geoff Norton <[email protected]>
* XplatUICarbon.cs: Properly implement PeekMessage and DoEvents
	Fixes #396983

svn path=/branches/mono-2-0/mcs/; revision=109602
2008-08-04 18:56:06 +00:00
Geoff Norton f544ec6a5a 2008-07-31 Geoff Norton <[email protected]>
* WindowHandler.cs: Dont set ActiveWindow when emitting the event,
	its set when the event is handled.  Fixes #393317.

svn path=/branches/mono-2-0/mcs/; revision=109601
2008-08-04 18:56:02 +00:00
Bill Holmes dadc02c527 2008-08-04 Bill Holmes <[email protected]>
* src/glib.h : Changing the allocation routines to return null if 0 size is
	  passed in.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=109561
2008-08-04 13:25:28 +00:00
Zoltan Varga b1d2757f8e Merge r109521 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=109531
2008-08-03 17:49:59 +00:00
Zoltan Varga 87f3f3d032 Merge r109511 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=109512
2008-08-03 15:35:26 +00:00
Zoltan Varga a93743339f Merge r109502 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=109503
2008-08-03 00:20:07 +00:00
Carlos Alberto Cortez 7faba06720 2008-08-01 Carlos Alberto Cortez <[email protected]>
* ListBindingHelperTest.cs: New test for GetList receiving an IEnumerable
	object which return instances of ICustomTypeDescriptor instances,
	instead of actual items.


svn path=/branches/mono-2-0/mcs/; revision=109443
2008-08-01 15:32:18 +00:00
Carlos Alberto Cortez 652318a44d 2008-08-01 Carlos Alberto Cortez <[email protected]>
* DateTimePicker.cs: 
	* ThemeWin32Classic.cs: Add a editing capability to DateTimePicker, in
	order to set the value as required (which means: when selection
	changes for a part being edited, and not before that if not needed).
	Also use an enum to describe which part are we using, and use the
	selection as a property in PartData, in order to notify the
	DateTimePicker owner that we need to end the current edit.
	Fixes #383462.


svn path=/branches/mono-2-0/mcs/; revision=109442
2008-08-01 15:29:16 +00:00
Carlos Alberto Cortez 724f0a6d4e * ThemeWin32Classic.cs: Don't draw ListViewSubItem instances from
DrawListViewItem - we need to reuse the main item's drawing for the
	first sub item in case owner draw is true, but wants the system to
	do the default draw for the first sub item, without incurring in a
	recursion problem.
	Fixes #410880.

2008-08-01  Carlos Alberto Cortez <[email protected]>


svn path=/branches/mono-2-0/mcs/; revision=109441
2008-08-01 15:19:55 +00:00
Carlos Alberto Cortez 5ebc3a5956 2008-08-01 Carlos Alberto Cortez <[email protected]>
* ListBindingHelper.cs: When looking for an object's properties, check
	if it implements ICustomTypeDescriptor, in which case we should
	resolve the propertu based on its GetProperties method, not in its
	actual properties. This is what .Net seems to do.
	Fixes a UsingWebBrowser problem during initialization.



svn path=/branches/mono-2-0/mcs/; revision=109440
2008-08-01 15:10:38 +00:00
Jonathan Pobst 76cb00959c 2008-08-01 Jonathan Pobst <[email protected]>
* ToolStripButton.cs, ToolStripMenuItem.cs: Guard against a NRE my
	last change introduced when an item is clicked but isn't on a toolstrip.

svn path=/branches/mono-2-0/mcs/; revision=109430
2008-08-01 14:42:06 +00:00
Zoltan Varga 3397f96efb 2008-07-31 Zoltan Varga <[email protected]>
* mini.h: Add a declaration for mono_aot_register_module ().

svn path=/branches/mono-2-0/mono/; revision=109375
2008-07-31 18:52:43 +00:00
Zoltan Varga 8c24850ae5 2008-07-31 Zoltan Varga <[email protected]>
* aot-compiler.c aot-runtime.c: Merge some mach changes from Renaldas Zioma.

svn path=/branches/mono-2-0/mono/; revision=109368
2008-07-31 18:12:05 +00:00
Zoltan Varga 95974cdb7a Merge r109366 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=109367
2008-07-31 17:51:01 +00:00
Zoltan Varga 8722a70b7a 2008-07-31 Zoltan Varga <[email protected]>
* debug-debugger.c (MONO_DEBUGGER__debugger_info): Fix a warning.

	* aot-compiler.c aot-runtime.c: Add a 'static' option to generate aot files
	which can be statically linked into an executable.

svn path=/branches/mono-2-0/mono/; revision=109365
2008-07-31 17:40:04 +00:00
Jonathan Pobst e6e4288c5b 2008-07-31 Jonathan Pobst <[email protected]>
* ToolStrip.cs: Fix an NRE caused by clicking on a ToolStripButton
	sitting on a MenuStrip.

svn path=/branches/mono-2-0/mcs/; revision=109357
2008-07-31 16:10:15 +00:00
Dean Brettle 5bbfe2090e ++ System.Web.UI.HtmlControls/ChangeLog (working copy)
* HtmlControl.cs (PreProcessRelativeReference), 
	HtmlForm.cs (RenderAttributes), HtmlInputButton (RenderAttributes),
	HtmlInputRadioButton (RenderAttributes), HtmlSelect (RenderChildren):
	Encode attributes that could contain HTML special chars.
	
	* HtmlSelect (RenderChildren): HTML-encode option text.

++ Test/System.Web.UI.HtmlControls/ChangeLog	(working copy)

	* HtmlInputButtonTest.cs, HtmlImageTest.cs, HtmlFormTest.cs, 
	HtmlInputRadioButtonTest.cs, HtmlSelectTest.cs:	Added tests 
	for HTML-encoded of attributes. 


svn path=/branches/mono-2-0/mcs/; revision=109348
2008-07-31 14:31:31 +00:00
Bill Holmes f9427d49b1 2008-07-31 Bill Holmes <[email protected]>
* marshal.c (cominterop_get_native_wrapper) : Backport of r109343.
	  Adding a call to mono_class_setup_methods if the methods are not
	  initialized.

	Code is contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=109347
2008-07-31 14:07:25 +00:00
Bill Holmes 8561c8042c 2008-07-31 Bill Holmes <[email protected]>
* aot-compiler.c : Backport of r108759.  Fix win32 build.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=109346
2008-07-31 13:58:01 +00:00
Everaldo Canuto d9334ab132 2008-07-30 Everaldo Canuto <[email protected]>
* MenuAPI.cs: Check for null GrabControl on ProcessMnemonic to prevent 
	runtime errors.


svn path=/branches/mono-2-0/mcs/; revision=109320
2008-07-30 22:58:47 +00:00
Rodrigo Kumpera 27810cca75 2008-07-30 Rodrigo Kumpera <[email protected]>
* verify.c: Remove some debug code I commited by accident.

	* verify.c (mono_method_is_valid_in_context): Change the return value
	to make possible to distinguish between invalid and unverifiable.

	* verify.c (verifier_load_method): Don't return NULL for unverifiable
	methods.

	Backported from trunk.



svn path=/branches/mono-2-0/mono/; revision=109302
2008-07-30 20:18:14 +00:00
Rodrigo Kumpera 38342a2028 2008-07-30 Rodrigo Kumpera <[email protected]>
* verify.c (mono_generic_param_is_constraint_compatible): Inflate type
	constraints. Fixes regression in gtest-253.

	Backported from trunk.



svn path=/branches/mono-2-0/mono/; revision=109292
2008-07-30 18:40:51 +00:00
Ivan Zlatev ab969071df 2008-07-30 Ivan N. Zlatev <[email protected]>
* Form.cs: Ensure that we reset the shown_raised flag after
	the form is closed, so that we raise the show events the next
	time the form is shown.
	[Fixes bug #413141]

svn path=/branches/mono-2-0/mcs/; revision=109289
2008-07-30 18:30:09 +00:00
Ivan Zlatev 121aafc036 2008-07-30 Ivan N. Zlatev <[email protected]>
* Form.cs: Ensure closing events are raised only once.
	[Fixes bug #413143]

svn path=/branches/mono-2-0/mcs/; revision=109287
2008-07-30 18:19:45 +00:00
Jonathan Pobst 01443d56f9 2008-07-29 Jonathan Pobst <[email protected]>
* ListBox.cs: Don't let the user set TopIndex so high that it
	scrolls up far enough to show empty items.
	[Fixes bug #412728]

2008-07-29  Jonathan Pobst  <[email protected]>

	* ListBox.cs: Add test for bug #412728.

svn path=/branches/mono-2-0/mcs/; revision=109279
2008-07-30 16:20:27 +00:00
Rodrigo Kumpera d349d3cf66 2008-07-30 Rodrigo Kumpera <[email protected]>
* verify.c (mono_verifier_verify_class): Don't allow generic types
	with explicit layout.

	* verify.c (mono_method_verify): Check locals and argument types.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=109271
2008-07-30 15:40:49 +00:00
Ivan Zlatev 508eeb5266 2008-07-30 Ivan N. Zlatev <[email protected]>
* X11Keyboard.cs: Refactor SendKeyboardInput to accept the keycode,
	so that we can successfully generate the LParam in-place instead of
	in KeyEvent, which isn't called for e.g. MainMenu. Fixes keyboard
	navigation for menus.

svn path=/branches/mono-2-0/mcs/; revision=109251
2008-07-30 12:52:03 +00:00
Everaldo Canuto 9698eebc3a 2008-07-30 Everaldo Canuto <[email protected]>
* MenuAPI.cs: When montion don't set the keyboard navigation state to 
	'navigating'. Fixes bug #411356.

svn path=/branches/mono-2-0/mcs/; revision=109238
2008-07-30 06:55:26 +00:00
Everaldo Canuto bf0c63bdaf 2008-07-30 Everaldo Canuto <[email protected]>
[Fixed remaining issues of #406773 (#1)]
	* MenuItem.cs: UpdateMenuItem added to track the shotcut changes.

	* MenuAPI.cs: Don't create tracker on TrackPopupMenu, it will be created in
	MainMenu (already done) and ContextMenu creation.

	* ContextMenu.cs: Create tracker on construction.

svn path=/branches/mono-2-0/mcs/; revision=109232
2008-07-30 05:13:09 +00:00
Everaldo Canuto 1f4d704c06 2008-07-30 Everaldo Canuto <[email protected]>
* MenuAPI.cs: For ContextMenu set GrabControl on TrackPopupMenu, it make
	possible to instantiate MenuTracker without GrabControl.

svn path=/branches/mono-2-0/mcs/; revision=109229
2008-07-30 03:54:19 +00:00
Everaldo Canuto 0c2a768d04 2008-07-30 Everaldo Canuto <[email protected]>
* MenuAPI.cs: On constructor dont set the GrabControl for non ContextMenu.

	* MainMenu.cs: Set GrabControl on SetForm using current form.

svn path=/branches/mono-2-0/mcs/; revision=109227
2008-07-30 03:36:59 +00:00
Everaldo Canuto d4b59a0987 2008-07-30 Everaldo Canuto <[email protected]>
* MenuAPI.cs: Chage grab_control to GrabControl and make it public.

svn path=/branches/mono-2-0/mcs/; revision=109225
2008-07-30 03:18:33 +00:00
Everaldo Canuto d66bd40a5e 2008-07-30 Everaldo Canuto <[email protected]>
* MenuAPI.cs: Check if menu is activated before deactivate it in 
	ProcessShortcut.


svn path=/branches/mono-2-0/mcs/; revision=109223
2008-07-30 03:13:16 +00:00
Zoltan Varga 8ecd5784fc 2008-07-30 Zoltan Varga <[email protected]>
* SqliteParameterUnitTests.cs: Disable the random value insertion
	test as it fails randomly.

svn path=/branches/mono-2-0/mcs/; revision=109220
2008-07-30 01:46:45 +00:00
Ivan Zlatev 864017ae96 2008-07-30 Ivan N. Zlatev <[email protected]>
* TableLayoutStyleCollection, TableLayoutStyle.cs, RowStyle.cs,
	ColumnStyle.cs:
	Make the TableLayoutStyle owned by the the TableLayoutPanel, so that:
	 - One style instance can only participate in a single style collection.
	 - Styles can request their owner to layout whenever their properties
	 change.
	* TableLayoutTest.cs: Add tests for bug #412582
	 [Fixes bugs #412583 and #412582]

svn path=/branches/mono-2-0/mcs/; revision=109210
2008-07-29 22:05:48 +00:00
Ivan Zlatev 9fa61327c6 2008-07-29 Ivan N. Zlatev <[email protected]>
* X11Keyboard.cs: Implement the generation of the LParam for
	all keyboard messages.
	[Fixes bug #378728]

svn path=/branches/mono-2-0/mcs/; revision=109202
2008-07-29 20:31:24 +00:00
Massimiliano Mantione ac33be5c4f Call the new "runtime initialized" profiler hook (backported from r108631).
svn path=/branches/mono-2-0/mono/; revision=109177
2008-07-29 17:10:27 +00:00
Massimiliano Mantione 022cc2489d Added a new "runtime initialized" profiler hook (backport of r108630 from trunk).
svn path=/branches/mono-2-0/mono/; revision=109176
2008-07-29 17:04:58 +00:00
Dick Porter c9cd06e98c 2008-07-29 Dick Porter <[email protected]>
* processes.c (get_module_name): Make a last-ditch effort to
	figure out the process name.  Fixes bug 413723, patch by Casey
	Marshall <[email protected]>



svn path=/branches/mono-2-0/mono/; revision=109161
2008-07-29 14:18:35 +00:00
Marek Habersack d3c3b9817a Forgotten file
svn path=/branches/mono-2-0/mcs/; revision=109158
2008-07-29 13:02:55 +00:00
Marek Habersack 6574c4842c Backport of r109156
svn path=/branches/mono-2-0/mcs/; revision=109157
2008-07-29 13:02:45 +00:00
Marek Safar 35af91a654 2008-07-29 Marek Safar <[email protected]>
A fix for bug #412880 by Atsushi Enomoto <[email protected]>
	* modifiers.cs (GetDescription): Fixed FamANDAssem case.


svn path=/branches/mono-2-0/mcs/; revision=109151
2008-07-29 12:09:06 +00:00
Marek Safar 924eaae1b1 2008-07-29 Marek Safar <[email protected]>
A fix for bug #412595
	* cfold.cs: Don't cast undefined bool constant.


svn path=/branches/mono-2-0/mcs/; revision=109135
2008-07-29 10:16:37 +00:00
Martin Baulig 5c0653cc3b 2008-07-29 Martin Baulig <[email protected]>
* symbolwriter.cs
	(SymbolWriter.Reset): New public static method.

	* driver.cs
	(CompilerCallableEntryPoint.Reset): Call SymbolWriter.Reset().


svn path=/branches/mono-2-0/mcs/; revision=109113
2008-07-29 07:20:29 +00:00
Martin Baulig 9b10d5247d 2008-07-29 Martin Baulig <[email protected]>
* compiler-tester.cs: Added `-compiler-options' command line
	argument to specify global compiler options in addition to the
	ones which are read from the test cases.


svn path=/branches/mono-2-0/mcs/; revision=109111
2008-07-29 07:15:44 +00:00
Zoltan Varga eed9f45d27 2008-07-29 Zoltan Varga <[email protected]>
* monitor.c (mono_monitor_try_enter_internal): Allow nterruption of the
	wait if the thread is in StopRequested state.

	Backported from trunk.

svn path=/branches/mono-2-0/mono/; revision=109083
2008-07-28 23:00:37 +00:00
Rodrigo Kumpera e938f4fad3 2008-07-28 Rodrigo Kumpera <[email protected]>
* verify.c (mono_type_is_valid_in_context): Improve the error message.
	Check both the type and it's generic type definition for loader errors.
	
	* verify.c (mono_method_is_valid_in_context): Don't generate another
	error when a type errors occur, this leads to the wrong exception been
	thrown.

	Backported from trunk.



svn path=/branches/mono-2-0/mono/; revision=109072
2008-07-28 19:53:45 +00:00
Atsushi Eno 47eb68cddb backport r109049.
svn path=/branches/mono-2-0/mcs/; revision=109050
2008-07-28 16:46:14 +00:00
Marek Habersack db68333eb7 Backport of r109040
svn path=/branches/mono-2-0/mcs/; revision=109041
2008-07-28 16:08:18 +00:00
Ivan Zlatev 3fd99b981e 2008-07-28 Ivan N. Zlatev <[email protected]>
* TableLayout.cs: MS adds rows instead of columns even when
	GrowStyle is AddColumns, but RowCount is 0.

svn path=/branches/mono-2-0/mcs/; revision=109037
2008-07-28 15:50:37 +00:00
Rodrigo Kumpera d59ab90071 2008-07-28 Rodrigo Kumpera <[email protected]>
* verify.c: Implement constraint equivalence checking.
	This is required when a generic parameter is used as
	argument to a constrained one.

	Fixes #410637.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=109029
2008-07-28 15:37:08 +00:00
Jonathan Pobst 8a7077c3fd 2008-07-28 Jonathan Pobst <[email protected]>
* ToolStripButton.cs: Update Checked for CheckOnClick before
	raising the Click event.  [Fixes bug #412505]

svn path=/branches/mono-2-0/mcs/; revision=109019
2008-07-28 15:11:53 +00:00
Marek Habersack fdb3f32aff Backport of r108992
svn path=/branches/mono-2-0/mcs/; revision=108993
2008-07-28 12:38:20 +00:00
Marek Habersack bf91fdc886 Backport of r108985
svn path=/branches/mono-2-0/mcs/; revision=108986
2008-07-28 11:43:37 +00:00
Marek Habersack afabc945e6 Backport of r108975
svn path=/branches/mono-2-0/mcs/; revision=108976
2008-07-28 08:21:14 +00:00
Atsushi Eno 2d6f641629 backport r108971.
svn path=/branches/mono-2-0/mcs/; revision=108972
2008-07-28 06:51:01 +00:00
Ivan Zlatev cbbb130a5f 2008-07-28 Ivan N. Zlatev <[email protected]>
* Form.cs: Remove some seems leftover code for non-TopLevel's
	CreateParams, which is breaking ClientSize sizing, because it
	removes the border window styles.

svn path=/branches/mono-2-0/mcs/; revision=108965
2008-07-27 21:21:57 +00:00
Zoltan Varga 47b637d576 2008-07-27 Zoltan Varga <[email protected]>
* debug-mini.c (mono_debug_close_method): Avoid a crash if jit->this_var
	is not set.

svn path=/branches/mono-2-0/mono/; revision=108963
2008-07-27 20:17:00 +00:00
Ivan Zlatev 82d4d8a64c 2008-07-27 Ivan N. Zlatev <[email protected]>
* RootCodeDomSerializer.cs: Clear the fields as well.

svn path=/branches/mono-2-0/mcs/; revision=108962
2008-07-27 19:18:57 +00:00
Ivan Zlatev e29ff8407d 2008-07-27 Ivan N. Zlatev <[email protected]>
* PropertyGrid.cs: Invalidate the View when the PropertyTab
	changes.

svn path=/branches/mono-2-0/mcs/; revision=108960
2008-07-27 19:15:13 +00:00
Andreas Färber b2225d42ea Merge r108956 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=108957
2008-07-27 18:44:14 +00:00
Zoltan Varga 5e95510e6e Merge r108937 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=108939
2008-07-27 15:00:05 +00:00
Zoltan Varga a583e2b947 Merge r108887 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=108888
2008-07-27 00:08:55 +00:00
Dean Brettle a84f9e8fa3 ++ Test/mainsoft/ChangeLog (working copy)
* NunitWebResources/adapters.browser: added capabilities with 
	multiple substitutions and $ and % characters not associated
	with substitutions. 

++ Test/System.Web/ChangeLog	(working copy)

	* AppBrowsersTest.cs: Added tests for bug where capabilities 
	containing literal $ or % were dropped.  Added test for bug 
	where capabilities with multiple $ substitutions only
	had one applied.

++ System.Web.Configuration_2.0/ChangeLog	(working copy)

	* nBrowser/Node.cs nBrowser/Build.cs nBrowser/Identification.cs:
	Fixed race condition in Node.Process() by removing mutating 
	functions from Identification and changing Node.Process() and
	Node.BrowserIdentification() to maintain state in a List<Match>
	instead of a List<Identification>.
	
	* nBrowser/Node.cs: Fixed race condition associated with lookup of
	adapter types.
	
	* nBrowser/Node.cs: Removed duplicate call to 
	Node.BrowserIdentification() from Node.Process().

	* nBrowser/Node.cs: Removed duplicate call to Result.AddAdaper()
	from Node.Process().
	
	* nBrowser/Node.cs: Fixed bug where capabilities containing literal
	$ or % were dropped.

	* nBrowser/Node.cs: Fixed bug where capabilities with multiple $ 
	substitutions only had one applied.


svn path=/branches/mono-2-0/mcs/; revision=108858
2008-07-26 16:01:24 +00:00
Ivan Zlatev c10bca60c9 2008-07-26 Ivan N. Zlatev <[email protected]>
* TableLayout.cs: Perform layout even if they are no child controls, so
	that cell sizes are updated properly for the cell border painting.

svn path=/branches/mono-2-0/mcs/; revision=108825
2008-07-25 21:17:31 +00:00
Ivan Zlatev 6ddc460530 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayout.cs: For newly created cells for controls without a
	specifically assinged such enforce AddRows if ColumnCount == 0 else
	AddColumns if RowCount == 0.
	[Fixes bug #412163]

svn path=/branches/mono-2-0/mcs/; revision=108823
2008-07-25 21:13:06 +00:00
Ivan Zlatev 00f6a73eb1 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayoutPanel.cs: Perform layout on GrowStyle change, so
	that the change has an immediate effect.

svn path=/branches/mono-2-0/mcs/; revision=108817
2008-07-25 19:59:39 +00:00
Ivan Zlatev 37b08459d4 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayout.cs: Automagically add the required number of columns/rows
	if the control is added at non-existent such. Note that ColumnCount and
	RowCount do not change in LayoutSettings.
	* TableLayoutTest.cs: Add test for bug #412161
	[Fixes bug #412161]

svn path=/branches/mono-2-0/mcs/; revision=108815
2008-07-25 19:55:45 +00:00
Marek Safar 83ceed4489 2008-07-25 Marek Safar <[email protected]>
A fix for bug #412217
	* assign.cs: Mutate also assignment type.


svn path=/branches/mono-2-0/mcs/; revision=108786
2008-07-25 14:59:30 +00:00
Ivan Zlatev bcd3aec7e5 2008-07-25 Ivan N. Zlatev <[email protected]>
* ScrollableControl.cs: Update PerformLayout calls to include
	provide the name of the property that changed.

svn path=/branches/mono-2-0/mcs/; revision=108776
2008-07-25 13:21:15 +00:00
Ivan Zlatev e4ce9895a7 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayoutPanel.cs: Draw relative to the DisplayRectangle
	location. Fixes drawing of border and cell borders if scrollable.

svn path=/branches/mono-2-0/mcs/; revision=108771
2008-07-25 12:58:26 +00:00
Ivan Zlatev 542d8e5b0e 2008-07-25 Ivan N. Zlatev <[email protected]>
* ScrollableControl.cs: Perform layouting after the AutoScroll
	properties have changed, so that the changes have immediate
	effect.
	[Fixes bug #409090]

svn path=/branches/mono-2-0/mcs/; revision=108769
2008-07-25 12:53:29 +00:00
Martin Baulig 8a6f210585 2008-07-25 Martin Baulig <[email protected]>
* debug-debugger.c
	(debugger_get_boxed_object): GC-protect the last 16 objects.
	(debugger_runtime_invoke): Likewise.


svn path=/branches/mono-2-0/mono/; revision=108765
2008-07-25 12:13:14 +00:00
Marek Safar 989abab5fb 2008-07-25 Marek Safar <[email protected]>
A fix for bug #412134
	* expression.cs (ResolveOperatorEnum): Do implicit conversion of
	non-enumerable operands when overloading equality or bitwise operators.


svn path=/branches/mono-2-0/mcs/; revision=108762
2008-07-25 11:20:01 +00:00
Ivan Zlatev e01b93cd98 2008-07-25 Ivan N. Zlatev <[email protected]>
* XplatUIX11.cs: Non Client area is actually Client such in the
	case of NotifyIcon, so double check WholeWindow == ClientWindow
	when adding an expose.
	[Fixes bugs #324237 and #357022]

svn path=/branches/mono-2-0/mcs/; revision=108756
2008-07-25 10:31:14 +00:00
Ivan Zlatev 1b19fbcc37 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayout.cs: Initialize columns and rows as empty array, so that we
	can drop the null check when drawing and always draw the control border,
	but void for the cell borders if there aren't any.
	[Fixes bug #411858]

svn path=/branches/mono-2-0/mcs/; revision=108754
2008-07-25 10:21:11 +00:00
Ivan Zlatev e46bc42fa8 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayout.cs: Initialize columns and rows as empty array, so that we
	can drop the null check when drawing and always draw the control border,
	but void for the cell borders if there aren't any.
	[Fixes bug #411858]

svn path=/branches/mono-2-0/mcs/; revision=108752
2008-07-25 10:19:28 +00:00
Martin Baulig eb6253ba03 Ooops, actually pass the newly created LocalBuilder to the LocalTemporary.
svn path=/branches/mono-2-0/mcs/; revision=108750
2008-07-25 10:18:26 +00:00
Ivan Zlatev 3ed4f50114 2008-07-25 Ivan N. Zlatev <[email protected]>
* TableLayoutPanel.cs: Invalidate after layouting, so that we
	repaint the cell borders.
	[Fix bug #411860]

svn path=/branches/mono-2-0/mcs/; revision=108749
2008-07-25 10:02:58 +00:00
Ivan Zlatev 427d699aa3 2008-07-25 Ivan N. Zlatev <[email protected]>
* PropertyGridTextBox.cs: Stop filtering messages prior to our
	disposal to avoid unexpected ObjectDisposedExceptions.

svn path=/branches/mono-2-0/mcs/; revision=108726
2008-07-24 21:14:27 +00:00
Zoltan Varga 4e0d8f27ba Revert mistaken change.
svn path=/branches/mono-2-0/mono/; revision=108725
2008-07-24 21:21:42 +00:00
Zoltan Varga 1ee3e71937 2008-07-24 Zoltan Varga <[email protected]>
* configure.in: Patch libtool to avoid the 
	'copying selected object files ...' messages.
	
	* configure.in: Invoke patch-quiet.sh using AC_CONFIG_COMMANDS so it
	runs during a reconfigure too.

	Backported from trunk.

svn path=/branches/mono-2-0/mono/; revision=108724
2008-07-24 21:20:23 +00:00
Ivan Zlatev 988168e2c3 2008-07-24 Ivan N. Zlatev <[email protected]>
* TableLayoutPanel.cs: Layout on Row/Column count change.
	[Fixes bug #411891]

svn path=/branches/mono-2-0/mcs/; revision=108721
2008-07-24 20:44:56 +00:00
Zoltan Varga dbacc958c8 2008-07-24 Zoltan Varga <[email protected]>
* aot-runtime.c aot-compiler.c: Merge with the version in HEAD.

svn path=/branches/mono-2-0/mono/; revision=108678
2008-07-24 17:13:41 +00:00
Mark Probst cc46bbf965 2008-07-24 Mark Probst <[email protected]>
* mini-exceptions.c: Free a MonoType with
	mono_metadata_free_type() instead of g_free().

	* aot-runtime.c: Free a MonoType.

	Backported from trunk.

svn path=/branches/mono-2-0/mono/; revision=108675
2008-07-24 16:54:22 +00:00
Rodrigo Kumpera 089e8de54b 2008-07-24 Rodrigo Kumpera <[email protected]>
* verify.c (do_branch_op): Handle valuetypes and generic
	arguments properly.

	* verify.c (do_cmp_op): Same.

	Fixes #410383.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108674
2008-07-24 16:46:25 +00:00
Rodrigo Kumpera 57a84b0eeb 2008-07-24 Rodrigo Kumpera <[email protected]>
* configure.in: Change USED_GC_NAME to show if parallel mark is used.
	This is shown in mono --version.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108661
2008-07-24 15:56:19 +00:00
Bill Holmes 78a2769fe2 2008-07-24 Bill Holmes <[email protected]>
* mini-amd64.c (mono_arch_call_opcode) : Winx64 fix.  Use the size
	  variable computed above as the copy length for arguments of storage
	  type ArgValuetypeAddrInIReg.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=108651
2008-07-24 13:19:31 +00:00
Bill Holmes 986ce54e81 2008-07-24 Bill Holmes <[email protected]>
* mini-amd64.c (mono_arch_emit_prolog) : Winx64 fix.  When omitting the
	  frame pointer the stack adjustment value must be saved to the unwind 
	  info structure.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=108650
2008-07-24 13:12:16 +00:00
Zoltan Varga 4a7de092d4 Merge r108643 from HEAD.
svn path=/branches/mono-2-0/mcs/; revision=108644
2008-07-24 10:45:55 +00:00
Marek Habersack bf76a83964 Backport of r108638
svn path=/branches/mono-2-0/mcs/; revision=108639
2008-07-24 09:56:01 +00:00
Marek Habersack 510576a508 Backport of r108636
svn path=/branches/mono-2-0/mcs/; revision=108637
2008-07-24 09:21:12 +00:00
Rodrigo Kumpera 75639f296f 2008-07-23 Rodrigo Kumpera <[email protected]>
* verify.c (do_cast): Do boxing for generic arguments as well.

	* class.c (is_nesting_type): Drop generic instantiations before
	checking for nesting.

	* class.c (can_access_instantiation): Allow access to generic
	arguments.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108625
2008-07-24 03:10:20 +00:00
Rodrigo Kumpera e7d5ef2c30 2008-07-23 Rodrigo Kumpera <[email protected]>
* verify.c (verify_class_for_overlapping_reference_fields):
	On some cases, the field size might be zero, guard against that.
	Fix the explicit layout check to work as expected.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108608
2008-07-23 23:10:56 +00:00
Zoltan Varga 4d30c11e0c Merge r108601 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=108602
2008-07-23 21:52:57 +00:00
Martin Baulig d3a81ce711 2008-07-23 Martin Baulig <[email protected]>
* debug-mini.c (mono_debug_close_method): Check
	`MONO_INST_IS_DEAD' for `this'.


svn path=/branches/mono-2-0/mono/; revision=108598
2008-07-23 20:43:24 +00:00
Marek Habersack 4170fd8523 Backport of r108538
svn path=/branches/mono-2-0/mcs/; revision=108539
2008-07-23 10:29:13 +00:00
Marek Habersack 73545d7a30 Backport of r108535
svn path=/branches/mono-2-0/mcs/; revision=108536
2008-07-23 10:19:03 +00:00
Martin Baulig 47ecadbebb 2008-07-23 Martin Baulig <[email protected]>
* anonymous.cs
	(AnonymousMethodStorey.EmitHoistedVariables): Added the required
	symbolwriter calls to tell the debugger about the scope variable.
	(AnonymousMethodStorey.EmitType): Added the required symbol writer
	calls to tell the debugger about captured variables.

	* statement.cs
	(ExplicitBlock.EmitSymbolInfo): Moved to `ToplevelBlock'.
	(ToplevelBlock.EmitSymbolInfo): Tell the symbol writer about the
	scope variable.

	* class.cs
	(MethodOrOperator.Define): Set `Modifiers.DEBUGGER_HIDDEN' if
	we're an iterator.
	(MethodOrOperator.Emit): Add the `[DebuggerHidden]' custom
	attribute if requested.
	(Constructor.Emit): Likewise.


svn path=/branches/mono-2-0/mcs/; revision=108527
2008-07-23 03:46:43 +00:00
Gert Driesen b0b8b6fbd8 * LosFormatter.cs: Avoid using Position when stream is unseekable.
Do not invoke Length property twice for seekable MemoryStream.  
* LosFormatterTest.cs: Improved test for bug #411115.

svn path=/branches/mono-2-0/mcs/; revision=108505
2008-07-22 19:54:34 +00:00
Dean Brettle a5c3f5c622 ++ Test/System.Web.UI/ChangeLog (working copy)
* LosFormatterTest.cs: added test for bug 411115 where passing an
	unseekable stream to LosFormatter.Deserialize() causes an exception.

++ System.Web.UI/ChangeLog	(working copy)

	* LosFormatter.cs: fixed bug 411115 where passing an unseekable 
	stream to LosFormatter.Deserialize() causes an exception.


svn path=/branches/mono-2-0/mcs/; revision=108492
2008-07-22 18:20:47 +00:00
Bill Holmes b7f7a9261e 2008-07-22 Bill Holmes <[email protected]>
* libtest.c, winx64structs.cs :
	  Adding tests to exercise calling managed code from native with struct
	  arguments on Winx64.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=108481
2008-07-22 17:04:51 +00:00
Bill Holmes ebe3ff9854 2008-07-22 Bill Holmes <[email protected]>
* inssel-amd64.brg :  Adding rules for OP_VTARG_ADDR that are used for
	  Winx64 struct arguments.

	* mini-amd64.c (mono_arch_allocate_vars) : Implementing the ArgValuetypeAddrInIReg
	  argument case.  Setting the argument op to OP_VTARG_ADDR (OP_REGOFFSET)).

	* mini-amd64.c (mono_arch_emit_prolog, emit_load_volatile_arguments) :
 	  Implementing the ArgValuetypeAddrInIReg argument case.  When the address
 	  of a struct is passed in a register it must be saved with the other
 	  volatile argument on the stack.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=108480
2008-07-22 17:04:11 +00:00
Jb Evain b4b1af268b backport 108467
svn path=/branches/mono-2-0/mono/; revision=108477
2008-07-22 16:30:42 +00:00
Jonathan Pobst 37b6e49f7f Add MonoTODO to VirtualMode.
svn path=/branches/mono-2-0/mcs/; revision=108472
2008-07-22 15:01:36 +00:00
Marek Safar 766c997480 2008-07-22 Marek Safar <[email protected]>
A fix for bug #387040
	* ecore.cs: Skip constrains check for an explicit implementation.


svn path=/branches/mono-2-0/mcs/; revision=108452
2008-07-22 10:34:54 +00:00
Jb Evain b79c922ef9 backport r108446
svn path=/branches/mono-2-0/mcs/; revision=108447
2008-07-22 06:05:15 +00:00
Bill Holmes 524ecb2f30 2008-07-21 Bill Holmes <[email protected]>
Back port from trunk.  r108417

	* mini-amd64.c (get_call_info): Winx64 fix for passing floats.
	  The float param registers and other param registers must be the 
	  same index on Windows x64.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=108418
2008-07-21 21:33:49 +00:00
Rodrigo Kumpera 70ff2308c0 2008-07-21 Rodrigo Kumpera <[email protected]>
* mini.c: Make the previous fix GC safe.
	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108383
2008-07-21 16:36:07 +00:00
Marek Safar e19a0cdd3f 2008-07-21 Marek Safar <[email protected]>
A fix for bug #410369
	* parameter.cs: Clone correctly ParamsParameter.


svn path=/branches/mono-2-0/mcs/; revision=108358
2008-07-21 15:11:09 +00:00
Mark Probst ae1b7774cd 2008-07-21 Mark Probst <[email protected]>
* reflection.c (mono_method_get_object): Don't let static RGCTX
	invoke wrappers get into MonoReflectionMethods.

	Backported from trunk.

2008-07-21  Mark Probst  <[email protected]>

	* generic-getgenericarguments.2.cs: Test case catching static
	RGCTX wrappers in MonoReflectionMethods.

	* Makefile.am: Test added.

	Backported from trunk.

svn path=/branches/mono-2-0/mono/; revision=108353
2008-07-21 14:51:37 +00:00
Bill Holmes 579a15b47a 2008-07-21 Bill Holmes <[email protected]>
Back port from trunk.  r108343

	* mini-amd64.c (get_call_info): Correcting the case for MONO_TYPE_TYPEDBYREF
	  on Winx64.  This type will not be passed on the stack (ArgOnStack), but 
	  ArgValuetypeAddrInIReg instead.

	Contributed under MIT/X11 license.

svn path=/branches/mono-2-0/mono/; revision=108352
2008-07-21 14:48:02 +00:00
Ivan Zlatev d25226e6f7 2008-07-21 Ivan N. Zlatev <[email protected]>
* CodeDomComponentSerializationService.cs: Remove redundant assignment.

svn path=/branches/mono-2-0/mcs/; revision=108351
2008-07-21 14:36:20 +00:00
Raja R Harinath 9fb03707ab * Makefile.am (version.h): Allow a trailing '/' in the repository URL.
svn path=/branches/mono-2-0/mono/; revision=108347
2008-07-21 14:24:11 +00:00
Marek Safar f82536d160 2008-07-19 Marek Safar <[email protected]>
A fix for bug #410666
	* anonymous.cs: Correctly initialize generic storey reference.


svn path=/branches/mono-2-0/mcs/; revision=108313
2008-07-19 12:55:30 +00:00
Gert Driesen 908a4b9c8d * OracleDataAdapter_FillSchema_DsSt.cs: Moved initialization of
connectionString to a setup method, as workaround for NUNit 2.2.0
bug with Assert.Ignore in ctor.
* OracleDataReader_GetDateTime.cs: Moved initialization of
connectionString to a setup method, as workaround for NUnit 2.2.0
bug with Assert.Ignore in ctor.
* OracleDataReader_NextResult.cs: Moved initialization of connection
to setup method, as workaround for NUnit 2.2.0 bug with Assert.Ignore
in ctor.

svn path=/branches/mono-2-0/mcs/; revision=108309
2008-07-19 10:52:46 +00:00
Jb Evain e2bf3c46d7 backport 108305:108307
svn path=/branches/mono-2-0/mcs/; revision=108308
2008-07-19 08:02:57 +00:00
Rodrigo Kumpera eb6fd2eb23 2008-07-18 Rodrigo Kumpera <[email protected]>
* mini.c: Use mono_runtime_class_init_full to avoid leaking memory
	for types which the initialization fails. Raises the provided exception
	at the right stop after cleanup. Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108290
2008-07-18 23:58:06 +00:00
Rodrigo Kumpera 464026f902 2008-07-18 Rodrigo Kumpera <[email protected]>
* object-internals.h:
	* object.c: New mono_runtime_class_init_full function
	that makes throwing the exception optinal.

	* class-internals.h: New exception type MONO_EXCEPTION_OBJECT_SUPPLIED
	for the case where the exception object is supplied.

	Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108289
2008-07-18 23:57:38 +00:00
Rodrigo Kumpera 3e9be851d4 2008-07-18 Rodrigo Kumpera <[email protected]>
* versioninfo.c (map_pe_file): Fix memory leak. Backported from trunk.


svn path=/branches/mono-2-0/mono/; revision=108285
2008-07-18 23:21:18 +00:00
Marek Safar 35439fa111 Reverted GetHashCode changes.
svn path=/branches/mono-2-0/mcs/; revision=108277
2008-07-18 21:50:44 +00:00
Marek Safar 822dba4a3e Reverted GetHashCode changes.
svn path=/branches/mono-2-0/mono/; revision=108277
2008-07-18 21:50:44 +00:00
Marek Safar 8d9bebe7fd 2008-07-18 Marek Safar <[email protected]>
* ecore.cs, linq.cs, delegate.cs, constant.cs, nullable.cs, expression.cs:
	Finished missing generic type mutators.


svn path=/branches/mono-2-0/mcs/; revision=108274
2008-07-18 21:38:46 +00:00
Jonathan Pobst 452b871488 2008-07-16 Jonathan Pobst <[email protected]>
[Backport to 2.0]
	Apply patch from Achille Fouilleul (achille.fouilleul at gadz dot org)

	* BackgroundWorker.cs: Ensure the async object is set to null before
	calling RunWorkerCompleted, as IsBusy is based off the async object.
	[Fixes bug #394365]

2008-07-16  Jonathan Pobst  <[email protected]>
	[Backport to 2.0]
	Apply patches from Jordan Callicoat (MonkeeSage at gmail dot com)

	* AsyncCompleteEventArgs.cs: RaiseExceptionIfNecessary should throw
	TargetInvocationException if there was an exception, and IOE if
	the operation was cancelled.
	* BackgroundWorker.cs: Do not call RunWorkerCompleted from CancelAsync,
	setting cancel_pending to true is enough.
	* RunWorkerCompletedEventArgs.cs: Raise exceptions when user tries
	to access the Result if there are any exceptions.
	[Fixes bugs #328830 and 373153]

2008-07-16  Jonathan Pobst  <[email protected]>
	[Backport to 2.0]
	* BackgroundWorkerTest.cs: Add some asserts for bug #364365.

2008-07-16  Jonathan Pobst  <[email protected]>
	[Backport to 2.0]
	* BackgroundWorkerTest.cs: Add tests for bugs 328830 and 373153.

svn path=/branches/mono-2-0/mcs/; revision=108238
2008-07-18 15:03:17 +00:00
Jonathan Pobst c3b5d44422 2008-07-15 Jonathan Pobst <[email protected]>
[Backport to 2.0]
	* ImageList.cs: Fix ICollection.CopyTo implementation for
	ImageListCollection.  [Fixes bug #409169]

2008-07-15  Jonathan Pobst  <[email protected]>
	[Backport to 2.0]
	* ImageListTest.cs: Add test for bug #409169.

svn path=/branches/mono-2-0/mcs/; revision=108237
2008-07-18 14:57:19 +00:00
Jb Evain fcb0a02c88 merge fixes from 108210:108218
svn path=/branches/mono-2-0/mcs/; revision=108220
2008-07-18 12:14:43 +00:00
Marek Habersack b43ae3c971 Backport of r108179
svn path=/branches/mono-2-0/mcs/; revision=108195
2008-07-17 23:33:49 +00:00
Ivan Zlatev f708641b8d 2008-07-17 Ivan N. Zlatev <[email protected]>
* TypeDescriptor.cs: Attributes precendence (higher to lower)
	should be type -> base types -> interfaces and not
	type -> interfaces -> base types.

svn path=/branches/mono-2-0/mcs/; revision=108191
2008-07-17 22:23:12 +00:00
Ivan Zlatev 4e10c1ab81 2008-07-17 Ivan N. Zlatev <[email protected]>
* TypeDescriptor.cs:
	 - Refactor the default converters table not to be a Hashtable,
	 because the order of the keys is not preserved.
	 - Fix FindDefaultConverterType to properly make use of the default
	 converters.

svn path=/branches/mono-2-0/mcs/; revision=108122
2008-07-17 10:49:00 +00:00
Ivan Zlatev da3f57c214 2008-07-17 Ivan N. Zlatev <[email protected]>
* PropertyGridTextBox.cs: Validation should be performed only if we
	are focused. We can lose focus for example if the Return key is used
	to set the entry and there is an error. When the message box is
	displayed we would have validate on click in the message box.

svn path=/branches/mono-2-0/mcs/; revision=108115
2008-07-17 06:56:31 +00:00
Kornél Pál 48dccee80f Backport r108091.
svn path=/branches/mono-2-0/mono/; revision=108092
2008-07-16 22:25:07 +00:00
Ivan Zlatev 1faa706804 2008-07-16 Ivan N. Zlatev <[email protected]>
* GridEntry.cs: Checking for DesignerSerializaitonVisibility.Content
	in order to determine that we are expandable is wrong. There was a bug,
	now fixed, in TypeDescriptor that was causing the wrong converter to be
	returned which caused GetPropertiesSupported == false in most cases.
	[Fixes bug #409027]

svn path=/branches/mono-2-0/mcs/; revision=108090
2008-07-16 21:29:09 +00:00
Ivan Zlatev 38e2ec8469 2008-07-16 Ivan N. Zlatev <[email protected]>
* TypeDescriptor.cs:
	 - Fix GetConverter (Type) overload to have same logic as the
	 object one.
	 - Object-ReferenceConverter should be the last entry in the predefined
	 converters table, so that when we look up we don't end up with the wrong
	 converter for derived types.
	* TypeDescriptorTests.cs: Add a test that both GetConverter
	overloads return the same converter.

svn path=/branches/mono-2-0/mcs/; revision=108089
2008-07-16 21:22:51 +00:00
Jonathan Chambers 57dbdb3e42 2008-07-15 Jonathan Chambers <[email protected]>
* assembly.c (mono_set_rootdir): Revert part of mixed
       mode assembly patch to fix build. Use mono_module_handle
       instead of linker specific __ImageBase.

       * coree.h: Add back mono_module_handle.

       * coree.c: Add back mono_module_handle.

       Code is contributed under MIT/X11 license.

2008-07-15  Jonathan Chambers  <[email protected]>

       * driver.c: Add back mono_module_handle and
       initialize in DllMain DLL_PROCESS_ATTACH case.

       Code is contributed under MIT/X11 license.


svn path=/branches/mono-2-0/mono/; revision=108051
2008-07-16 16:09:49 +00:00
Marek Habersack e83157f0bf Backport of r108024
svn path=/branches/mono-2-0/mcs/; revision=108030
2008-07-16 13:59:06 +00:00
Zoltan Varga 6bc712404f Merge r107985 from HEAD.
svn path=/branches/mono-2-0/mono/; revision=107988
2008-07-15 18:22:47 +00:00
Andrew Jorgensen 31349722b8 Update versions to 2.0
svn path=/branches/mono-2-0/mono/; revision=107979
2008-07-15 17:11:32 +00:00
12536 changed files with 59791 additions and 2278921 deletions

No files matched your search

+7 -271
View File
@@ -1,203 +1,3 @@
2008-10-18 Jonathan Pryor <[email protected]>
* configure.in: Generate data/monodoc.pc.
2008-10-18 Jonathan Pryor <[email protected]>
* data/Makefile.am: Add monodoc.pc to $(pkgconfig_DATA), $(DISTCLEANFILES).
2008-10-18 Jonathan Pryor <[email protected]>
* data/monodoc.pc.in: Fixup sourcesdir.
* data/Makefile.am (EXTRA_DIST): Add monodoc.pc.in.
2008-10-17 Jonathan Pryor <[email protected]>
* scripts/Makefile.am: Install scripts for mdoc-compat commands.
* scripts (svn:ignore): Ignore generated files.
* mdassembler, mdvalidater, monodocer, monodocs2html,
monodocs2slashdoc: Added; "compatibility" scripts, converting the
previous commands into mdoc commands.
2008-10-17 Jonathan Pryor <[email protected]>
* scripts/Makefile.am: Create scripts for mdoc sub-commands.
2008-10-17 Jonathan Pryor <[email protected]>
* scripts/Makefile.am: Add mod.
2008-10-16 Jonathan Pryor <[email protected]>
* scripts/Makefile.am: Move mono-shlib-cop to scripts_2_0.
2008-10-15 Jonathan Pryor <[email protected]>
* configure.in: Add checks for `struct flock`, `struct timespec`.
2008-10-14 Jonathan Pryor <[email protected]>
* data/mono-options.pcs.in: We're not installing Mono.Options.dll into
the GAC anymore, we're just concerned `pkg-config --variable=Source`
support.
2008-10-14 Jonathan Pryor <[email protected]>
* data/mono-options.pc.in: Add a Sources variable so that
`pkg-config --variable Sources mono-options` can be used to grab the
sources to Mono.Options (useful for embedding).
2008-10-13 Jonathan Pryor <[email protected]>
* configure.in: Generate data/mono-options.pc.
* data/Makefile.am: Support mono-options.pc.in and mono-options.pc.
* data/mono-options.pc.in: Added.
Mon Oct 13 11:26:19 CEST 2008 Paolo Molaro <[email protected]>
* configure.in: check for shm_open ().
2008-10-12 Zoltan Varga <[email protected]>
* configure.in: Only process Makefiles with patch-quiet.sh which have a
corresponding Makefile.in.
2008-10-11 Zoltan Varga <[email protected]>
* configure.in: Make --enable-minimal=reflection_emit turn on
--enable-minimal=reflection_emit_save too.
* README: Add docs for the option.
* configure.in: Add --enable-minimal=reflection_emit_save option.
2008-10-10 Atsushi Enomoto <[email protected]>
* data/net_2_0/web.config: add UrlRouting.axd handler (forbidden).
2008-10-08 Zoltan Varga <[email protected]>
* Makefile.am (dist-hook): Use 'net_1_1' instead of 'default'.
* runtime/Makefile.am: Rename 'default' profile to 'net_1_1'.
2008-10-07 Atsushi Enomoto <[email protected]>
* data/Makefile.am : there seems a couple more of required changes.
2008-10-07 Atsushi Enomoto <[email protected]>
* scripts/Makefile.am : one more dist fix is needed.
2008-10-07 Atsushi Enomoto <[email protected]>
* configure.in : fix missing change for previous change.
2008-10-07 Atsushi Enomoto <[email protected]>
* scripts/mono-nunit.pc.in, data/mono-nunit.pc.in:
move former to latter.
* scripts/Makefile.am : remove packaging info.
* data/Makefile.am : add mono-nunit.pc too.
2008-10-03 Rodrigo Kumpera <[email protected]>
* configure.in: Add simd intrinsics to the disable set.
2008-10-01 Jb Evain <[email protected]>
* scripts/Makefile.am: add mono-cil-strip.
2008-09-29 Zoltan Varga <[email protected]>
* scripts/patch-quiet.sh: Handle the ifs used by some versions of
automake.
2008-09-25 Luis Ortiz <[email protected]>
* configure.in: Big arrays are only supported on 64 bit systems.
Fixes #430022
2008-09-24 Zoltan Varga <[email protected]>
* configure.in: Add --enable-minimal=attach option.
2008-09-22 Raja R Harinath <[email protected]>
* scripts/patch-quiet.sh: Skip Makefiles that've already been
patched. Handle automake 1.10a.
2008-09-18 Mark Probst <[email protected]>
* docs/generic-sharing: More generic sharing porting
documentation.
2008-09-17 Raja R Harinath <[email protected]>
* Makefile.am (EXTRA_DIST): Update.
* nls.m4, progtest.m4: Really add from Gettext 0.17.
2008-09-15 Raja R Harinath <[email protected]>
* configure.in (AC_CONFIG_FILES): Put po/mcs/Makefile.in in its
own stanza.
(AC_OUTPUT): Don't list po/mcs/Makefile, it's automatically
handled by AM_PO_SUBDIRS.
2008-09-14 Miguel de Icaza <[email protected]>
* Added some infrastructure to start the translation of the
compiler error messages.
Currently the compiler does not yet use the infrastructure,
that needs a bit of work, but the PO infrastructure is in place.
2008-09-14 gettextize <[email protected]>
* Makefile.am (SUBDIRS): Add po/mcs.
(DIST_SUBDIRS): Add po/mcs.
(EXTRA_DIST): Add config.rpath.
* configure.in (AC_CONFIG_FILES): Add po/mcs/Makefile.in.
2008-09-14 gettextize <[email protected]>
* gettext.m4: New file, from gettext-0.17.
* iconv.m4: New file, from gettext-0.17.
* lib-ld.m4: New file, from gettext-0.17.
* lib-link.m4: New file, from gettext-0.17.
* lib-prefix.m4: New file, from gettext-0.17.
* nls.m4: New file, from gettext-0.17.
* po.m4: New file, from gettext-0.17.
* progtest.m4: New file, from gettext-0.17.
* Makefile.am (EXTRA_DIST): Add the new files.
2008-09-12 Zoltan Varga <[email protected]>
* scripts/patch-quiet.sh: Remove an obsolete comment. Change the Makefile so
this script is rerun if Makefile.am changes.
2008-09-11 Zoltan Varga <[email protected]>
* configure.in: Add a DISABLE_JIT automake conditional too.
* configure.in: Add a --enable-minimal=jit option to disable jit, only
allowing full-aot execution.
2008-09-10 Zoltan Varga <[email protected]>
* configure.in: Move the computation of export_ldflags after libtool has
been created.
2008-09-08 Massimiliano Mantione <[email protected]>
* configure.in: Added DISABLE_PROFILER automake conditional.
2008-08-29 Geoff Norton <[email protected]>
* configure.in: Rollup our unrolled FreeBSD support so that we properly
build and compile on FreeBSD6+. (FreeBSD5 is 2004)
2008-08-28 Geoff Norton <[email protected]>
* build-iphone.sh: iPhone lies about HAVE_MMAP as well.
@@ -207,97 +7,33 @@ Mon Oct 13 11:26:19 CEST 2008 Paolo Molaro <[email protected]>
* build-iphone.sh: Update build-iphone to not wget old inssel's, and build
out of the box with teh current SDK.
2008-08-28 Zoltan Varga <vargaz@gmail.com>
* scripts/Makefile.am (scripts_2_0): Add gacutil2.
* scripts/gacutil2: New file.
2008-08-22 Jb Evain <[email protected]>
* data/wcf.pc.in
* data/Makefile.am
* configure.in: add a new wcf.pc for assemblies recently moved
from olive to mcs.
2008-08-12 Bill Holmes <[email protected]>
2008-08-13 Bill Holmes <billholmes54@gmail.com>
* winconfig.h: Updating the config file for MSVC builds to match
the config file used when compiling with gcc in Cygwin.
Contributed under MIT/X11 license.
2008-08-09 Rodrigo Kumpera <[email protected]>
* docs/generic-sharing: Some updates from an irc talk with Mark.
2008-08-06 Zoltan Varga <[email protected]>
* Makefile.am (EXTRA_DIST): Add dtrace-prelink.sh and build-mingw32.sh.
* scripts/Makefile.am (EXTRA_DIST): Add patch-quiet.sh.
2008-08-05 Marek Habersack <[email protected]>
* configure.in: use the PKG_CONFIG_PATH only when cross-compiling.
2008-08-05 Marek Habersack <[email protected]>
* configure.in: added support for cross-compilation
2008-08-05 Marek Habersack <[email protected]>
* build-mingw32.sh: added a script to build Mono for Windows on a
Linux host using mingw.
2008-08-05 Marek Habersack <[email protected]>
* scripts/Makefile.am: added support for cross-compilation,
including .bat generation for windows targets.
2008-08-05 Marek Habersack <[email protected]>
* scripts/smcs.bat.in, scripts/script.bat.in,
scripts/script_umask.bat.in: added .bat templates.
2008-08-05 Marek Habersack <[email protected]>
* runtime/Makefile.am: mingw cross-compilation support.
2008-08-05 Andreas Färber <[email protected]>
* autogen.sh: Suppress arguments warning for NOCONFIGURE.
Contributed under MIT/X11 license.
2008-08-02 Zoltan Varga <[email protected]>
* configure.in: Enable dtrace by default on platforms which support it.
2008-07-27 Zoltan Varga <[email protected]>
* scripts/patch-quiet.sh: Make the libtool --quiet flag configurable by
V=1 as well.
2008-07-24 Zoltan Varga <[email protected]>
* configure.in: Patch libtool to avoid the
'copying selected object files ...' messages.
* configure.in: Invoke patch-quiet.sh using AC_CONFIG_COMMANDS so it
runs during a reconfigure too.
Backported from trunk.
2008-07-24 Rodrigo Kumpera <[email protected]>
* configure.in: Change USED_GC_NAME to show if parallel mark is used.
This is shown in mono --version.
2008-07-22 Mark Probst <[email protected]>
* configure.in: New configure option (--with-malloc-mempools) to
make mempools use malloc for every single allocation, which makes
it easier to use debugging/profiling tools like Valgrind.
2008-07-21 Zoltan Varga <[email protected]>
* configure.in: Invoke patch-quiet.sh using AC_CONFIG_COMMANDS so it
runs during a reconfigure too.
Backported from trunk.
2008-07-13 Zoltan Varga <[email protected]>
+1 -1
View File
@@ -22,7 +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.
If you need further information, please contact [email protected]
If you ned further information, please contact [email protected]
* The Modules
+4 -4
View File
@@ -1,20 +1,20 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .
SUBDIRS = po $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
SUBDIRS = $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
# Keep in sync with SUBDIRS
## 'tools' is not normally built
DIST_SUBDIRS = po libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
DIST_SUBDIRS = libgc $(eglib_dir) mono ikvm-native support docs data runtime scripts man samples web tools msvc
EXTRA_DIST= nls.m4 po.m4 progtest.m4 mono-uninstalled.pc.in dtrace-prelink.sh build-mingw32.sh LICENSE mkinstalldirs
EXTRA_DIST= mono-uninstalled.pc.in LICENSE
DISTCHECK_CONFIGURE_FLAGS = EXTERNAL_MCS=false EXTERNAL_RUNTIME=false
# Distribute the 'mcs' tree too
dist-hook:
test -d $(distdir)/mcs || mkdir $(distdir)/mcs
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_1_1 distdir=$$d dist-recursive
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=default distdir=$$d dist-recursive
d=`cd $(distdir)/mcs && pwd`; cd $(mcs_topdir) && $(MAKE) PROFILE=net_2_0 distdir=$$d dist-recursive
pkgconfigdir = $(libdir)/pkgconfig
+18 -41
View File
@@ -67,14 +67,6 @@ This is 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 SVN
---------------------------------
@@ -324,25 +316,22 @@ This is Mono.
Disables support for the Ahead of Time
compilation.
com:
Disables COM support.
debug:
Drop debugging support.
profiler:
Disables support for the default profiler.
decimal:
Disables support for System.Decimal.
generics:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
pinvoke:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
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.
debug:
Drop debugging support.
reflection_emit:
Drop System.Reflection.Emit support
large_code:
Disables support for large assemblies.
@@ -350,31 +339,19 @@ This is Mono.
logging:
Disables support for debug logging.
pinvoke:
Support for Platform Invocation services,
disabling this will drop support for any
libraries using DllImport.
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.
simd:
Disables support for the Mono.SIMD intrinsics
library.
com:
Disables COM support.
ssa:
Disables compilation for the SSA optimization
framework, and the various SSA-based
optimizations.
generics:
Generics support. Disabling this will not
allow Mono to run any 2.0 libraries or
code that contains generics.
--enable-big-arrays
This enables the use arrays whose indexes are larger
+3 -3
View File
@@ -82,7 +82,7 @@ if test "$DIE" -eq 1; then
exit 1
fi
if test x$NOCONFIGURE = x && test -z "$*"; then
if test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line."
@@ -102,8 +102,8 @@ if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
fi
fi
echo "Running aclocal -I . $ACLOCAL_FLAGS ..."
aclocal -I . $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"
-110
View File
@@ -1,110 +0,0 @@
#!/bin/bash -e
CURDIR="`pwd`"
CROSS_DIR=${1:-/opt/cross/}
MINGW=${1:-i386-mingw32msvc}
CROSS_BIN_DIR="$CROSS_DIR/bin"
CROSS_DLL_DIR="$CROSS_DIR/$MINGW/bin"
CROSS_PKG_CONFIG_DIR=$CROSS_DIR/$MINGW/lib/pkgconfig
COPY_DLLS="libgio*.dll libglib*.dll libgmodule*.dll libgthread*.dll libgobject*.dll"
PATH=$CROSS_BIN_DIR:$PATH
INSTALL_DESTDIR="$CURDIR/mono-win32"
PROFILES="default net_2_0 net_2_1 net_3_5"
export PATH
function setup ()
{
if [ -d ./.git/svn ]; then
SVN_INFO='git svn info'
elif [ -d ./.svn ]; then
SVN_INFO='svn info'
else
SVN_INFO=""
fi
if [ -n "$SVN_INFO" ]; then
MONO_SVN_REVISION=`$SVN_INFO | grep Revision | sed 's/.*: //'`
MONO_BRANCH=`$SVN_INFO | grep URL | sed -e 's;.*source/;;g' -e 's;/mono;;g'`
else
MONO_SVN_REVISION="rUNKNOWN"
MONO_BRANCH="tarball"
fi
MONO_VERSION=`grep AM_INIT_AUTOMAKE configure.in | cut -d ',' -f 2|tr -d '\)'`
MONO_RELEASE="$MONO_VERSION-$MONO_BRANCH-r$MONO_SVN_REVISION"
MONO_PREFIX="/mono-$MONO_RELEASE"
NOCONFIGURE=yes
export NOCONFIGURE
echo Mono Win32 installation prefix: $MONO_PREFIX
}
function build ()
{
./autogen.sh
if [ -f ./Makefile ]; then
make distclean
fi
if [ ! -d "$CURDIR/build-cross-windows" ]; then
mkdir "$CURDIR/build-cross-windows"
fi
cd "$CURDIR/build-cross-windows"
rm -rf *
../configure --prefix=$MONO_PREFIX --with-crosspkgdir=$CROSS_PKG_CONFIG_DIR --target=$MINGW --host=$MINGW --enable-parallel-mark --program-transform-name=""
make
cd "$CURDIR"
if [ ! -d "$CURDIR/build-cross-windows-mcs" ]; then
mkdir "$CURDIR/build-cross-windows-mcs"
fi
cd "$CURDIR/build-cross-windows-mcs"
rm -rf *
../configure --prefix=$MONO_PREFIX --enable-parallel-mark
make
}
function doinstall ()
{
if [ -d "$INSTALL_DIR" ]; then
rm -rf "$INSTALL_DIR"
fi
cd "$CURDIR/build-cross-windows"
make DESTDIR="$INSTALL_DESTDIR" USE_BATCH_FILES=yes install
cd "$CURDIR/../mcs/mcs"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "mcs profile $p installation failed"
done
cd "$CURDIR/../mcs/class"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "class library profile $p installation failed"
done
cd "$CURDIR/../mcs/tools"
for p in $PROFILES; do
make DESTDIR="$INSTALL_DESTDIR" PROFILE=$p install || echo "tools profile $p installation failed"
done
cd "$CURDIR/mono-win32"
for dll in $COPY_DLLS; do
cp -ap "$CROSS_DLL_DIR"/$dll "$INSTALL_DESTDIR/$MONO_PREFIX/bin"
done
rm -f "$CURDIR/mono-win32-$MONO_RELEASE".zip
zip -9r "$CURDIR/mono-win32-$MONO_RELEASE".zip .
}
pushd . > /dev/null
setup
build
doinstall
popd > /dev/null
+93 -102
View File
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(mono,2.1)
AM_INIT_AUTOMAKE(mono,2.0)
AM_MAINTAINER_MODE
API_VER=1.0
@@ -49,6 +49,8 @@ libmono_cflags=""
libmono_ldflags=""
AC_SUBST(libmono_cflags)
AC_SUBST(libmono_ldflags)
export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
AC_SUBST(export_ldflags)
# Variable to have relocatable .pc files (lib, or lib64)
reloc_libdir=`basename ${libdir}`
@@ -63,7 +65,6 @@ need_link_unlink=no
# Thread configuration inspired by sleepycat's db
AC_MSG_CHECKING([host platform characteristics])
libgc_threads=no
has_dtrace=no
case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
@@ -76,8 +77,8 @@ case "$host" in
HOST_CC="gcc"
# Windows 2000 is required that includes Internet Explorer 5.01
CPPFLAGS="$CPPFLAGS -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 -D_WIN32_IE=0x0501 -D_UNICODE -DUNICODE -DWIN32_THREADS -DFD_SETSIZE=1024"
libmono_cflags="-mno-cygwin -mms-bitfields -mwindows"
libmono_ldflags="-mno-cygwin -mms-bitfields -mwindows"
libmono_cflags="-mno-cygwin"
libmono_ldflags="-mno-cygwin"
libdl=
libgc_threads=win32
gc_default=included
@@ -98,7 +99,33 @@ case "$host" in
libgc_threads=pthreads
with_sigaltstack=no
;;
*-*-*freebsd*)
# these flags will work for all versions of -STABLE
#
*-*-*freebsd4*)
platform_win32=no
if test "x$PTHREAD_CFLAGS" = "x"; then
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
libmono_cflags="-D_THREAD_SAFE"
else
CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
libmono_cflags="$PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
LDFLAGS="$LDFLAGS -pthread"
libmono_ldflags="-pthread"
else
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
fi
CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD4"
need_link_unlink=yes
AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread_t is a pointer])
libdl=
libgc_threads=pthreads
# TLS isn't implemented at all on 4-STABLE
with_tls=pthread
;;
*-*-*freebsd5*)
platform_win32=no
if test "x$PTHREAD_CFLAGS" = "x"; then
CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
@@ -114,9 +141,36 @@ case "$host" in
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
fi
CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD"
CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD5"
need_link_unlink=yes
AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
AC_DEFINE(PTHREAD_POINTER_ID)
libdl=
with_sigaltstack=yes
libgc_threads=pthreads
# TLS is only partially implemented on 5-STABLE (compiler support
# but NOT library support)
#
with_tls=pthread
;;
*-*-*freebsd6*)
platform_win32=no
if test "x$PTHREAD_CFLAGS" = "x"; then
CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
libmono_cflags=
else
CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
libmono_cflags="$PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
LDFLAGS="$LDFLAGS -pthread"
libmono_ldflags="-pthread"
else
LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
libmono_ldflags="$PTHREAD_LIBS"
fi
CPPFLAGS="$CPPFLAGS -DPLATFORM_BSD -DPLATFORM_BSD6"
need_link_unlink=yes
AC_DEFINE(PTHREAD_POINTER_ID)
libdl=
libgc_threads=pthreads
with_sigaltstack=yes
@@ -170,7 +224,6 @@ case "$host" in
libgc_threads=pthreads
# This doesn't seem to work on solaris/x86, but the configure test runs
with_tls=pthread
has_dtrace=yes
;;
*-*-darwin*)
platform_win32=no
@@ -185,7 +238,6 @@ case "$host" in
no_version_script=yes
libdl=
libgc_threads=pthreads
has_dtrace=yes
if test "x$cross_compiling" = "xyes"; then
has_broken_apple_cpp=yes
fi
@@ -241,7 +293,6 @@ AC_SUBST(HOST_CC)
AC_SUBST(BUILD_EXEEXT)
AM_CONDITIONAL(CROSS_COMPILING, [test x$cross_compiling = xyes])
AM_CONDITIONAL(USE_BATCH_FILES, [test x$platform_win32 = xyes -a x$cross_compiling = xyes])
# Set STDC_HEADERS
AC_HEADER_STDC
@@ -252,9 +303,6 @@ AM_PROG_LIBTOOL
# Use dolt (http://dolt.freedesktop.org/) instead of libtool for building.
DOLT
export_ldflags=`(./libtool --config; echo eval echo \\$export_dynamic_flag_spec) | sh`
AC_SUBST(export_ldflags)
# Test whenever ld supports -version-script
AC_PROG_LD
AC_PROG_LD_GNU
@@ -300,7 +348,17 @@ AC_CHECK_HEADERS(syslog.h)
# for mono/dis
AC_CHECK_HEADERS(wchar.h)
AC_CHECK_HEADERS(ieeefp.h)
case "$host" in
*-*-*freebsd6*)
AC_CHECK_HEADERS(ieeefp.h)
;;
*-*-*freebsd*)
/* Only freebsd6 has a working ieeefp.h */
;;
*)
AC_CHECK_HEADERS(ieeefp.h)
;;
esac
AC_MSG_CHECKING(for isinf)
AC_TRY_LINK([#include <math.h>], [
int f = isinf (1);
@@ -385,10 +443,6 @@ if test -d $srcdir/$olivedir; then
olive_topdir='$(top_srcdir)/'$olivedir
fi
# gettext: prepare the translation directories.
# we do not configure the full gettext, as we consume it dynamically from C#
AM_PO_SUBDIRS
AC_ARG_WITH([libgdiplus],
[ --with-libgdiplus=installed|sibling|<path> Override the libgdiplus used for System.Drawing tests (defaults to NO)],
[], [with_libgdiplus=installed])
@@ -437,17 +491,9 @@ embedded)
AC_CONFIG_SUBDIRS(eglib)
;;
system)
if test "x$cross_compiling" = "xyes"; then
pkg_config_path="$PKG_CONFIG_PATH"
unset PKG_CONFIG_PATH
fi
BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
if test "x$cross_compiling" = "xyes"; then
PKG_CONFIG_PATH=$pkg_config_path
export PKG_CONFIG_PATH
fi
## Versions of dependencies
GLIB_REQUIRED_VERSION=1.3.11
@@ -540,7 +586,7 @@ DISABLED_FEATURES=none
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
LIST is a comma-separated list from: aot, profiler, decimal, pinvoke, debug,
reflection_emit, reflection_emit_save, large_code, logging, com, ssa, generics, attach, jit, simd.],
reflection_emit, large_code, logging, com, ssa, generics.],
[
for feature in `echo "$enable_minimal" | sed -e "s/,/ /g"`; do
eval "mono_feature_disable_$feature='yes'"
@@ -559,7 +605,6 @@ fi
if test "x$mono_feature_disable_profiler" = "xyes"; then
AC_DEFINE(DISABLE_PROFILER, 1, [Disable default profiler support])
fi
AM_CONDITIONAL(DISABLE_PROFILER, test x$mono_feature_disable_profiler = xyes)
if test "x$mono_feature_disable_decimal" = "xyes"; then
AC_DEFINE(DISABLE_DECIMAL, 1, [Disable System.Decimal support])
@@ -575,11 +620,6 @@ fi
if test "x$mono_feature_disable_reflection_emit" = "xyes"; then
AC_DEFINE(DISABLE_REFLECTION_EMIT, 1, [Disable reflection emit support])
mono_feature_disable_reflection_emit_save=yes
fi
if test "x$mono_feature_disable_reflection_emit_save" = "xyes"; then
AC_DEFINE(DISABLE_REFLECTION_EMIT_SAVE, 1, [Disable assembly saving support in reflection emit])
fi
if test "x$mono_feature_disable_large_code" = "xyes"; then
@@ -602,20 +642,6 @@ if test "x$mono_feature_disable_generics" = "xyes"; then
AC_DEFINE(DISABLE_GENERICS, 1, [Disable generics support])
fi
if test "x$mono_feature_disable_attach" = "xyes"; then
AC_DEFINE(DISABLE_ATTACH, 1, [Disable agent attach support])
fi
if test "x$mono_feature_disable_jit" = "xyes"; then
AC_DEFINE(DISABLE_JIT, 1, [Disable the JIT, only full-aot mode will be supported by the runtime.])
fi
AM_CONDITIONAL(DISABLE_JIT, test x$mono_feature_disable_jit = xyes)
if test "x$mono_feature_disable_simd" = "xyes"; then
AC_DEFINE(DISABLE_SIMD, 1, [Disable SIMD intrinsics related optimizations.])
fi
AC_MSG_CHECKING(for visibility __attribute__)
AC_TRY_COMPILE([], [
void __attribute__ ((visibility ("hidden"))) doit (void) {}
@@ -1089,7 +1115,13 @@ if test x$platform_win32 = xno; then
# and libpthread does not exist
#
case "${host}" in
*-*-*freebsd*)
*-*-*freebsd4*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
*-*-*freebsd5*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
*-*-*freebsd6*)
AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
;;
*)
@@ -1267,9 +1299,6 @@ if test x$platform_win32 = xno; then
# pthread (first!) on Linux
AC_SEARCH_LIBS(sem_init, pthread rt posix4)
AC_SEARCH_LIBS(shm_open, pthread rt posix4)
AC_CHECK_FUNCS(shm_open)
dnl ********************************
dnl *** Checks for timezone stuff **
dnl ********************************
@@ -1439,17 +1468,12 @@ if test x$platform_win32 = xno; then
#include <unistd.h>])
AC_CHECK_TYPES([suseconds_t], [AC_DEFINE(HAVE_SUSECONDS_T)], ,
[#include <sys/time.h>])
AC_CHECK_TYPES([struct flock], [AC_DEFINE(HAVE_STRUCT_FLOCK)], ,
[#include <unistd.h>
#include <fcntl.h>])
AC_CHECK_TYPES([struct pollfd], [AC_DEFINE(HAVE_STRUCT_POLLFD)], ,
[#include <sys/poll.h>])
AC_CHECK_TYPES([struct stat], [AC_DEFINE(HAVE_STRUCT_STAT)], ,
[#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>])
AC_CHECK_TYPES([struct timespec], [AC_DEFINE(HAVE_STRUCT_TIMESPEC)], ,
[#include <time.h>])
AC_CHECK_TYPES([struct timeval], [AC_DEFINE(HAVE_STRUCT_TIMEVAL)], ,
[#include <sys/time.h>
#include <sys/types.h>
@@ -1657,35 +1681,21 @@ AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
AC_MSG_CHECKING([if big-arrays are to be enabled])
AC_ARG_ENABLE(big-arrays, [ --enable-big-arrays Enable the allocation and indexing of arrays greater than Int32.MaxValue], enable_big_arrays=$enableval, enable_big_arrays=no)
if test "x$enable_big_arrays" = "xyes" ; then
if test "x$ac_cv_sizeof_void_p" = "x8"; then
AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
else
AC_MSG_ERROR([The allocation and indexing of arrays greater than Int32.MaxValue is not supported on this platform.])
fi
fi
AC_MSG_RESULT($enable_big_arrays)
dnl **************
dnl *** DTRACE ***
dnl **************
AC_ARG_ENABLE(dtrace,[ --enable-dtrace Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=$has_dtrace)
if test "x$enable_dtrace" = "xyes"; then
if test "x$has_dtrace" = "xno"; then
AC_MSG_ERROR([DTrace probes are not supported on this platform.])
fi
AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin])
if test "x$DTRACE" = "xno"; then
AC_MSG_RESULT([dtrace utility not found, dtrace support disabled.])
enable_dtrace=no
fi
if test "x$enable_big_arrays" = "xyes" ; then
AC_DEFINE(MONO_BIG_ARRAYS,1,[Enable the allocation and indexing of arrays greater than Int32.MaxValue])
fi
AC_MSG_CHECKING([if DTrace support is requested])
AC_ARG_ENABLE(dtrace,[ --enable-dtrace Enable DTrace probes], enable_dtrace=$enableval, enable_dtrace=no)
AC_MSG_RESULT($enable_dtrace)
dtrace_g=no
if test "x$enable_dtrace" = "xyes"; then
AC_DEFINE(ENABLE_DTRACE, 1, [Enable DTrace probes])
AC_PATH_PROG(DTRACE, [dtrace], [no], [$PATH:/usr/sbin])
if test "x$DTRACE" = "xno"; then
AC_MSG_FAILURE([DTrace requested but not found])
fi
DTRACEFLAGS=
if test "x$ac_cv_sizeof_void_p" = "x8"; then
case "$host" in
@@ -2104,14 +2114,6 @@ AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path> Enable oprofile support (defa
fi
])
MALLOC_MEMPOOLS=no
AC_ARG_WITH(malloc_mempools,[ --with-malloc-mempools=yes,no Use malloc for each single mempool allocation (only for runtime debugging, defaults to NO)],[
if test x$with_malloc_mempools = xyes; then
MALLOC_MEMPOOLS=yes
AC_DEFINE(USE_MALLOC_FOR_MEMPOOLS,1,[Use malloc for each single mempool allocation])
fi
])
AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
AC_SUBST(OPROFILE_CFLAGS)
AC_SUBST(OPROFILE_LIBS)
@@ -2165,18 +2167,12 @@ AC_SUBST(mono_runtime)
mono_cfg_root=$mono_build_root/runtime
if test x$platform_win32 = xyes; then
if test "x$cross_compiling" = "xno"; then
mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
else
mono_cfg_dir=`echo $mono_cfg_root | tr '/' '\\\'`\\etc
fi
mono_cfg_dir=`cygpath -w -a $mono_cfg_root`\\etc
else
mono_cfg_dir=$mono_cfg_root/etc
fi
AC_SUBST(mono_cfg_dir)
AC_CONFIG_FILES([po/mcs/Makefile.in])
AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
@@ -2251,13 +2247,14 @@ AC_CONFIG_COMMANDS([runtime/etc/mono/2.0/Browsers/Compat.browser],
],[LN_S='$LN_S'])
if test x$enable_quiet_build = xyes; then
AC_CONFIG_COMMANDS([quiet], [for i in `find mono libgc support -name Makefile.in | sed -e 's/Makefile.in/Makefile/g'`; do $srcdir/scripts/patch-quiet.sh $i; done], [shell=$SHELL])
AC_CONFIG_COMMANDS([quiet], [find mono libgc support -name Makefile -exec $shell $srcdir/scripts/patch-quiet.sh {} \;], [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])
fi
AC_OUTPUT([
Makefile
mono-uninstalled.pc
scripts/mono-nunit.pc
scripts/mono-find-provides
scripts/mono-find-requires
mono/Makefile
@@ -2306,12 +2303,8 @@ data/net_2_0/Browsers/Makefile
data/mint.pc
data/mono.pc
data/mono-cairo.pc
data/mono-nunit.pc
data/mono-options.pc
data/monodoc.pc
data/dotnet.pc
data/dotnet35.pc
data/wcf.pc
data/cecil.pc
data/smcs.pc
samples/Makefile
@@ -2321,7 +2314,6 @@ tools/Makefile
tools/locale-builder/Makefile
runtime/Makefile
msvc/Makefile
po/Makefile
])
if test x$platform_win32 = xyes; then
@@ -2412,7 +2404,6 @@ echo "
zlib: $zlib_msg
oprofile: $OPROFILE
BigArrays: $enable_big_arrays
DTrace: $enable_dtrace
$disabled
"
+6 -6
View File
@@ -5,22 +5,22 @@ monodir = $(sysconfdir)/mono
EXTRA_DIST = \
config.in \
browscap.ini mono.supp mono.d README \
mono.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 smcs.pc.in
mono.pc.in mint.pc.in dotnet.pc.in dotnet35.pc.in \
mono-cairo.pc.in cecil.pc.in smcs.pc.in
pkgconfigdir = $(libdir)/pkgconfig
if JIT_SUPPORTED
if INTERP_SUPPORTED
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
pkgconfig_DATA= mono.pc mint.pc dotnet.pc dotnet35.pc mono-cairo.pc cecil.pc smcs.pc
else
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
pkgconfig_DATA= mono.pc dotnet.pc dotnet35.pc mono-cairo.pc cecil.pc smcs.pc
endif
else
pkgconfig_DATA= mint.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
pkgconfig_DATA= mint.pc mono-cairo.pc cecil.pc smcs.pc
endif
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc wcf.pc mono-nunit.pc mono-cairo.pc mono-options.pc cecil.pc smcs.pc monodoc.pc
DISTCLEANFILES= mono.pc mint.pc dotnet.pc dotnet35.pc mono-cairo.pc cecil.pc smcs.pc
mono_DATA = config \
browscap.ini
-7
View File
@@ -1,7 +0,0 @@
prefix=${pcfiledir}/../..
assemblies_dir=${prefix}/lib/mono-options
Sources=${assemblies_dir}/Options.cs
Name: Mono.Options
Description: Command Line Parsing Library
Version: 0.2.1
-9
View File
@@ -1,9 +0,0 @@
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@prefix@/lib
sourcesdir=${libdir}/monodoc/sources
Name: Monodoc
Description: Monodoc - Mono Documentation Tools
Version: @VERSION@
Libs: /r:${prefix}/lib/mono/monodoc/monodoc.dll
-32
View File
@@ -1,35 +1,3 @@
2008-10-09 Gonzalo Paniagua Javier <[email protected]>
* web.config: default values for httpRuntime are different in 2.0
2008-10-09 Marek Habersack <[email protected]>
* web.config: added the default monoSettings section which works around
an incompatibility between mcs and csc, mentioned in bug #433806
* machine.config: added definition of the monoSettings section to
the system.web group
2008-10-06 Marek Habersack <[email protected]>
* machine.config: added entries to ignore the mobileControls and
deviceFilters sections.
2008-09-02 Marek Habersack <[email protected]>
* web.config: removed System.Web.Extensions.dll from the assemblies
(reverting r112073) - it would break all the ASP.NET applications
which use System.Web.Extensions other than 3.5.0.0
2008-09-06 Daniel Morgan <[email protected]>
* machine.config: added Mono.Data.SybaseClient
to DbProviderFactories section.
2008-09-02 Atsushi Enomoto <[email protected]>
* web.config: added System.Web.Extensions.dll to assemblies.
2008-08-28 Zoltan Varga <[email protected]>
* machine.config: Fix syntax error.
-6
View File
@@ -37,8 +37,6 @@
<section name="identity" type="System.Web.Configuration.IdentitySection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="machineKey" type="System.Web.Configuration.MachineKeySection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="membership" type="System.Web.Configuration.MembershipSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="mobileControls" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="deviceFilters" type="System.Configuration.IgnoreSection, System.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="pages" type="System.Web.Configuration.PagesSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="processModel" type="System.Web.Configuration.ProcessModelSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineOnly" allowLocation="false" />
<section name="profile" type="System.Web.Configuration.ProfileSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
@@ -60,7 +58,6 @@
<section name="outputCacheSettings" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
<section name="sqlCacheDependency" type="System.Web.Configuration.OutputCacheSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" allowDefinition="MachineToApplication"/>
</sectionGroup>
<section name="monoSettings" type="System.Web.Configuration.MonoSettingsSection, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</sectionGroup>
<sectionGroup name="system.net" type="System.Net.Configuration.NetSectionGroup, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="authenticationModules" type="System.Net.Configuration.AuthenticationModulesSection, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
@@ -184,9 +181,6 @@
<add name="SqlClient Data Provider" invariant="System.Data.SqlClient"
description=".Net Framework Data Provider for SqlServer"
type="System.Data.SqlClient.SqlClientFactory, System.Data, Version=2.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=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756"/>
</DbProviderFactories>
</system.data>
+2 -10
View File
@@ -3,19 +3,11 @@
<configuration>
<system.web>
<monoSettings>
<compilersCompatibility>
<compiler language="c#;cs;csharp" extension=".cs" compilerOptions="/nowarn:0169"
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</compilersCompatibility>
</monoSettings>
<authorization>
<allow users="*" />
</authorization>
<httpHandlers>
<add verb="*" path="Trace.axd" type="System.Web.Handlers.TraceHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="UrlRouting.axd" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.aspx" type="System.Web.UI.PageHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asmx" validate="false" type="System.Web.Services.Protocols.WebServiceHandlerFactory, System.Web.Services, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ashx" type="System.Web.UI.SimpleHandlerFactory, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
@@ -123,12 +115,12 @@
<add extension=".refresh" type="System.Web.Compilation.IgnoreFileBuildProvider" />
</buildProviders>
</compilation>
<httpRuntime executionTimeout="110"
<httpRuntime executionTimeout="90"
maxRequestLength="4096"
useFullyQualifiedRedirectUrl="false"
minFreeThreads="8"
minLocalRequestFreeThreads="4"
appRequestQueueLimit="5000" />
appRequestQueueLimit="100" />
<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)" />
-5
View File
@@ -1,5 +0,0 @@
Name: WCF
Description: References WCF for compilation
Version: @VERSION@
Libs: -r:System.Runtime.Serialization.dll -r:System.IdentityModel.dll -r:System.IdentityModel.Selectors.dll -r:System.ServiceModel.dll -r:System.ServiceModel.Web.dll
-27
View File
@@ -1,27 +0,0 @@
Call Sites
Extracted from emails from Paolo Molaro
There are 3 basic different kinds of call sites:
1) normal calls:
call relative_displacement
2) virtual calls:
call *positive_offset(%register)
3) interface calls:
mov constant, %imt_register
call *negative_offset(%register)
The above is what happens on x86 and amd64, with different values of
%imt_register for each arch (this register is a constant, but it could
change with different mono builds, it should be likely one of
constants the runtime comunicates to the debugger). %register can
change depending on the callsite based on the register allocator
choices. Note that the constant for the interface calls won't
necessarily be a MonoMethod address: this could change in the future
to a simple number.
In all the 3 cases the JIT trampolines will need to inspect the call
site, but only in the first case the call site will be changed.
+12 -53
View File
@@ -9,30 +9,15 @@ Generic code sharing
The generic class init trampoline is very similar to the class init
trampoline, with the exception that the VTable of the class to be
inited is passed in a register, MONO_ARCH_VTABLE_REG. That register
can be the same as the IMT register.
inited is passed in a register, MONO_ARCH_VTABLE_REG. That can be the
same as the IMT register.
The call to the generic class init trampoline is never patched because
the VTable is not constant - it depends on the type arguments of the
class/method doing the call to the trampoline. For that reason, the
trampoline needs a fast path for the case that the class is already
inited, i.e. the trampoline needs to check the initialized bit of the
MonoVTable and immediately return if it is set. See tramp-x86.c for
how to portably figure out the number of the bit in the bit-field that
needs to be checked.
Since the MONO_ARCH_VTABLE_REG is needed by the generic class init
trampoline function (in mini-trampolines.c) it needs to be saved by
the generic trampoline code in the register save block which is passed
to the trampoline. This also applies to the RGCTX fetch trampoline
(see below).
Like the normal class init trampoline, the result of the generic class
init trampoline function is not a pointer to code that needs to be
jumped to. Instead, just like for the class init trampoline, the
generic trampoline code must return to the caller instead of jumping
to the returned value. The same applies for the RGCTX fetch
trampoline (see below).
inited. See tramp-x86.c for how to portably figure out the number of
the bit in the bit-field that needs to be checked.
** RGCTX register
@@ -57,20 +42,6 @@ MONO_ARCH_RGCTX_REG can be the same as the IMT register for now, but
this might change in the future when we implement virtual generic
method calls (more) efficiently.
This register lifetime starts at the call site that loads it and
ends in the callee prologue when it is either discarded or stored
into a local variable.
It's better to avoid registers used for argument passing for the RGCTX
as it would make the code dealing with calling conventions code a lot
harder.
** Method prologue
Generic shared code that have a RGCTX receive it in RGCTX_REG. There
must be a check in mono_arch_emit_prolog for MonoCompile::rgctx_var
and if set store it. See mini-x86.c for reference.
** Dealing with types
Types passed to arch functions might be type parameters
@@ -104,14 +75,14 @@ the layout of a RGCTX:
.
.
For fetching a slot from a RGCTX the trampoline is passed a pointer
(as a normal integer argument) to the VTable. From there it has to
fetch the pointer to the RGCTX, which might be null. Then it has to
traverse the correct number of "next" links, each of which might be
NULL. Arriving at the right array it needs to fetch the slot, which
might also be NULL. If any of the NULL cases, the trampoline must
transition to unmanaged code to potentially setup the RGCTX and fill
the slot. Here is pseudo-code for fetching slot 11:
For fetching a slot from a RGCTX the trampoline is passed a pointer to
the VTable. From there it has to fetch the pointer to the RGCTX,
which might be null. Then it has to traverse the correct number of
"next" links, each of which might be NULL. Arriving at the right
array it needs to fetch the slot, which might also be NULL. If any of
the NULL cases, the trampoline must transition to unmanaged code to
potentially setup the RGCTX and fill the slot. Here is pseudo-code
for fetching slot 11:
; vtable ptr in r1
; fetch RGCTX array 0
@@ -158,18 +129,6 @@ a trampoline for an MRGCTX is needed, as opposed to one for a RGCTX.
Use MONO_RGCTX_SLOT_INDEX to get the index of the slot (like 2 for
"slot 2" as above).
The unmanaged fetch code is yet another trampoline created via
mono_arch_create_specific_trampoline(), of type
MONO_TRAMPOLINE_RGCTX_LAZY_FETCH. It's given the slot number as the
trampoline argument. In addition, the pointer to the VTable/MRGCTX is
passed in MONO_ARCH_VTABLE_REG (like the VTable to the generic class
init trampoline - see above).
Like the class init and generic class init trampolines, the RGCTX
fetch trampoline code doesn't return code that must be jumped to, so,
like for those trampolines (see above), the generic trampoline code
must do a normal return instead.
* Getting generics information about a stack frame
-24
View File
@@ -103,30 +103,6 @@ In the cases above, the number of generated trampolines goes from
5400 for the IronPython case and from 800 to 150 for the hello world
case.
Kinds of Trampolines and Thunks
===============================
This is a list of the trampolines and thunks used in Mono:
- create_fnptr
- load_aot_method
- imt thunk
Interface Method Table, this is used to dispatch calls to
interface methods.
- jump table
- debugger code
- exception call filter
- trampoline (various types)
- throw corlib exception
- restore context
- throw exception by name
- handle stack overflow
- throw exception
- delegate invoke implementation
- cpuid code
Implementation for x86/x86-64
=============================
+2 -95
View File
@@ -1,103 +1,11 @@
2008-10-17 Miguel de Icaza <[email protected]>
* Allow types to be defined on the eglib-config.h file, that could
be a platform specific generated type file.
* gtimer.c: split functionality in platforms.
2008-10-13 Bill Holmes <[email protected]>
* src/gdate-win32.c : Fix compiler errors for MSVC.
* src/gpath.c : Fix compiler errors for MSVC.
* src/gfile-posix.c : Adding declaration for mkstemp for the win 32
implementation in gfile-win32.c.
Contributed under MIT/X11 license.
2008-10-11 Miguel de Icaza <[email protected]>
* gtimer.c: Same process.
* src/glib.h: Move g_strdup here, to consolidate all allocations
in this header, will help for merging the allocation work later.
* src/gpattern.c (compile_pattern): From Unity, use -1 in the enum
for MatchType.
* src/gpath.c: Split this one as well.
* src/gmodule-win32.c, src/gmisc-unix.c, src/gmisc-win32.c,
src/gmodule-unix.c: split functionality in platforms.
* src/goutput.c (g_logv): On some platforms, before we abort we
want to flush the stdout/stderr.
2008-10-10 Miguel de Icaza <[email protected]>
* Split functionality that is operating system specific into
-win32.c, -unix.c and -posix.c
* Use g_malloc everywhere, and g_free, so that these can be easily
overwritten consistently.
2008-09-16 Bill Holmes <[email protected]>
* src/gunicode.c : Fix a warning.
Contributed under MIT/X11 license.
2008-08-28 Bill Holmes <[email protected]>
Backport of r111875
* src/glib.h : Adding a c++ definition for G_BEGIN_DECLS.
Contributed under MIT/X11 license.
2008-08-27 Bill Holmes <[email protected]>
* glib.h, gunicode.c : Fixing some compiler errors.
Contributed under MIT/X11 license.
2008-08-20 Mike Voorhees <[email protected]>
* Patch from Mike Voorhees to fix various problems with
g_utf8_validate compared to the glib implementation and unit tests
to ensure that there are no regressions.
From a mailing list post to mono-devel-list on August 19th, 2008
[Mono-dev] utf8 related patches. Please review.
2008-08-20 Mike Voorhees <[email protected]>
* src/glib.h : Adding declarations for g_utf8_strlen, g_utf8_get_char,
and g_utf8_next_char.
* src/gunicode.c : Adding implementation for g_utf8_strlen, g_utf8_get_char,
and g_utf8_next_char.
* src/gunicode.c : Rewrote g_utf8_validate.
* test/utf8.c Adding tests for g_utf8_strlen, g_utf8_get_char,
g_utf8_next_char, and g_utf8_validate.
Contributed under MIT/X11 license.
2008-08-05 Andreas Faerber <[email protected]>
* autogen.sh: Suppress arguments warning for NOCONFIGURE.
Contributed under MIT/X11 license.
2008-08-04 Bill Holmes <[email protected]>
* test/tests.h, test/Makefile.am, test/memory.c : Adding memory tests to test
allocation routines return NULL when 0 size is passed in.
Contributed under MIT/X11 license.
2008-08-04 Bill Holmes <[email protected]>
* src/glib.h : Changing the allocation routines to return null if 0 size is
@@ -1240,4 +1148,3 @@ Mon Oct 9 12:59:16 CEST 2006 Paolo Molaro <[email protected]>
untested at this point.
+5 -19
View File
@@ -18,31 +18,17 @@ no separate files, please try to follow the convetions in the source code
Please read the README in tests/
* Features
The source code is designed to allow for different operating
system builds of the eglib code.
Files in src that:
* Have a plain name: are cross platform, and should work on
every operating system.
* That end in -unix.c: These files contain Unix specific code.
* That end in -win32.c: These files contain Win32 specific code.
* That end in -posix.c: Will work on both Windows and Unix,
but should not be included for other operating systems.
* Plans: short and long term.
The short term plans for eglib is to allow Mono to optionally
build with it instead of using glib, gmodule and gthread, but
the default build will continue to be done against glib 2.0.
In the long-term we are considering dropping glib as a
dependency, considering that Mono requires a modern Unix
Our first target is to make this work with Linux, other
platforms will follow after that.
In the long-term (Mono 2.0) we are considering dropping glib
as a dependency, considering that Mono requires a modern Unix
system to run anyways (for its thread support) it would allow
us to fix some of the glib API limitations we have to live
with (explicit thread support for example), rework the API to
+1 -1
View File
@@ -82,7 +82,7 @@ if test "$DIE" -eq 1; then
exit 1
fi
if test x$NOCONFIGURE = x && test -z "$*"; then
if test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line."
+1 -1
View File
@@ -2,7 +2,7 @@ AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(eglib,0.2)
AM_INIT_AUTOMAKE(eglib,0.1)
AM_MAINTAINER_MODE
AC_PROG_CC
+6 -18
View File
@@ -1,19 +1,5 @@
noinst_LTLIBRARIES = libeglib.la
win_files = \
gdate-win32.c gdir-win32.c gfile-win32.c gmisc-win32.c \
gmodule-win32.c gtimer-win32.c
unix_files = \
gdate-unix.c gdir-unix.c gfile-unix.c gmisc-unix.c \
gmodule-unix.c gtimer-unix.c
if PLATFORM_WIN32
os_files = $(win_files)
else
os_files = $(unix_files)
endif
libeglib_la_SOURCES = \
eglib-config.h \
sort.frag.h \
@@ -22,6 +8,7 @@ libeglib_la_SOURCES = \
gerror.c \
ghashtable.c \
gmem.c \
gmodule.c \
gmodule.h \
goutput.c \
gstr.c \
@@ -29,18 +16,19 @@ libeglib_la_SOURCES = \
gstring.c \
gptrarray.c \
glist.c \
gmisc.c \
gqueue.c \
gpath.c \
gshell.c \
gspawn.c \
gtimer.c \
gdate.c \
gfile.c \
gfile-posix.c \
gpattern.c \
gdir.c \
gmarkup.c \
gutf8.c \
gunicode.c \
$(os_files)
gunicode.c
libeglib_la_CFLAGS = -Wall -D_FORTIFY_SOURCE=2
@@ -54,4 +42,4 @@ endif
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = eglib-config.h.in $(win_files) $(unix_files)
EXTRA_DIST = eglib-config.h.in
-44
View File
@@ -1,44 +0,0 @@
/*
* gdate-win32.c: Date and time utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected]
*
* (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
* "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 <stdio.h>
#include <glib.h>
#include <winsock2.h>
void
g_get_current_time (GTimeVal *result)
{
long int l;
g_return_if_fail (result != NULL);
l = GetTickCount();
g_return_if_fail (result != NULL);
result->tv_sec = l / 1000;
result->tv_usec = (l % 1000) * 1000;
}
+13 -1
View File
@@ -1,5 +1,5 @@
/*
* gdate-unix.c: Date and time utility functions.
* Date and time utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected]
@@ -28,16 +28,28 @@
#include <stdio.h>
#include <glib.h>
#ifdef G_OS_WIN32
#include <winsock2.h>
#else
#include <sys/time.h>
#endif
void
g_get_current_time (GTimeVal *result)
{
#ifdef G_OS_WIN32
long int l = GetTickCount();
g_return_if_fail (result != NULL);
result->tv_sec = l / 1000;
result->tv_usec = (l % 1000) * 1000;
#else
struct timeval tv;
g_return_if_fail (result != NULL);
gettimeofday (&tv, NULL);
result->tv_sec = tv.tv_sec;
result->tv_usec = tv.tv_usec;
#endif
}
-94
View File
@@ -1,94 +0,0 @@
/*
* Directory utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
*
* (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
* "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 <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
struct _GDir {
DIR *dir;
};
GDir *
g_dir_open (const gchar *path, guint flags, GError **error)
{
GDir *dir;
g_return_val_if_fail (path != NULL, NULL);
g_return_val_if_fail (error == NULL || *error == NULL, NULL);
(void) flags; /* this is not used */
dir = g_new (GDir, 1);
dir->dir = opendir (path);
if (dir->dir == NULL) {
if (error) {
gint err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
}
g_free (dir);
return NULL;
}
return dir;
}
const gchar *
g_dir_read_name (GDir *dir)
{
struct dirent *entry;
g_return_val_if_fail (dir != NULL && dir->dir != NULL, NULL);
do {
entry = readdir (dir->dir);
if (entry == NULL)
return NULL;
} while ((strcmp (entry->d_name, ".") == 0) || (strcmp (entry->d_name, "..") == 0));
return entry->d_name;
}
void
g_dir_rewind (GDir *dir)
{
g_return_if_fail (dir != NULL && dir->dir != NULL);
rewinddir (dir->dir);
}
void
g_dir_close (GDir *dir)
{
g_return_if_fail (dir != NULL && dir->dir != 0);
closedir (dir->dir);
dir->dir = NULL;
g_free (dir);
}
-147
View File
@@ -1,147 +0,0 @@
/*
* Directory utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
*
* (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
* "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 <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <io.h>
#include <winsock2.h>
struct _GDir {
HANDLE handle;
gchar* current;
gchar* next;
};
GDir *
g_dir_open (const gchar *path, guint flags, GError **error)
{
GDir *dir;
gunichar2* path_utf16;
gunichar2* path_utf16_search;
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);
dir->handle = FindFirstFile (path_utf16, &find_data);
if (dir->handle == INVALID_HANDLE_VALUE) {
if (error) {
gint err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
}
g_free (dir);
g_free (path_utf16);
return NULL;
}
/* now get files */
FindClose (dir->handle);
path_utf16_search = g_malloc ((wcslen(path_utf16) + 3)*sizeof(gunichar2));
wcscpy (path_utf16_search, path_utf16);
wcscat (path_utf16_search, L"\\*");
dir->handle = FindFirstFile (path_utf16_search, &find_data);
g_free (path_utf16_search);
while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0)) {
if (!FindNextFile (dir->handle, &find_data)) {
if (error) {
gint err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), strerror (err));
}
g_free (dir);
g_free (path_utf16);
return NULL;
}
}
dir->current = NULL;
dir->next = u16to8 (find_data.cFileName);
g_free (path_utf16);
return dir;
}
const gchar *
g_dir_read_name (GDir *dir)
{
WIN32_FIND_DATA find_data;
g_return_val_if_fail (dir != NULL && dir->handle != 0, NULL);
if (dir->current)
g_free (dir->current);
dir->current = NULL;
dir->current = dir->next;
if (!dir->current)
return NULL;
dir->next = NULL;
do {
if (!FindNextFile (dir->handle, &find_data)) {
dir->next = NULL;
return dir->current;
}
} while ((wcscmp (find_data.cFileName, L".") == 0) || (wcscmp (find_data.cFileName, L"..") == 0));
dir->next = u16to8 (find_data.cFileName);
return dir->current;
}
void
g_dir_rewind (GDir *dir)
{
}
void
g_dir_close (GDir *dir)
{
g_return_if_fail (dir != NULL && dir->handle != 0);
if (dir->current)
g_free (dir->current);
dir->current = NULL;
if (dir->next)
g_free (dir->next);
dir->next = NULL;
FindClose (dir->handle);
dir->handle = 0;
g_free (dir);
}
-146
View File
@@ -1,146 +0,0 @@
/*
* File utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
*
* (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
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <config.h>
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
#ifdef _MSC_VER
int mkstemp (char *tmp_template);
#endif
#ifndef O_LARGEFILE
#define OPEN_FLAGS (O_RDONLY)
#else
#define OPEN_FLAGS (O_RDONLY | O_LARGEFILE)
#endif
gboolean
g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **error)
{
gchar *str;
int fd;
struct stat st;
long offset;
int nread;
g_return_val_if_fail (filename != NULL, FALSE);
g_return_val_if_fail (contents != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
*contents = NULL;
if (length)
*length = 0;
fd = open (filename, OPEN_FLAGS);
if (fd == -1) {
if (error != NULL) {
int err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error opening file");
}
return FALSE;
}
if (fstat (fd, &st) != 0) {
if (error != NULL) {
int err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in fstat()");
}
close (fd);
return FALSE;
}
str = g_malloc (st.st_size + 1);
offset = 0;
do {
nread = read (fd, str + offset, st.st_size - offset);
if (nread > 0) {
offset += nread;
}
} while ((nread > 0 && offset < st.st_size) || (nread == -1 && errno == EINTR));
close (fd);
str [st.st_size] = '\0';
if (length) {
*length = st.st_size;
}
*contents = str;
return TRUE;
}
gint
g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
{
const static gchar *default_tmpl = ".XXXXXX";
gchar *t;
gint fd;
size_t len;
g_return_val_if_fail (error == NULL || *error == NULL, -1);
if (tmpl == NULL)
tmpl = default_tmpl;
if (strchr (tmpl, G_DIR_SEPARATOR) != NULL) {
if (error) {
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should not have any " G_DIR_SEPARATOR_S);
}
return -1;
}
len = strlen (tmpl);
if (len < 6 || strcmp (tmpl + len - 6, "XXXXXX")) {
if (error) {
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should end with XXXXXX");
}
return -1;
}
t = g_build_filename (g_get_tmp_dir (), tmpl, NULL);
fd = mkstemp (t);
if (fd == -1) {
if (error) {
int err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in mkstemp()");
}
g_free (t);
return -1;
}
if (name_used) {
*name_used = t;
} else {
g_free (t);
}
return fd;
}
-84
View File
@@ -1,84 +0,0 @@
/*
* File utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
*
* (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
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <config.h>
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
gboolean
g_file_test (const gchar *filename, GFileTest test)
{
struct stat st;
gboolean have_stat;
if (filename == NULL || test == 0)
return FALSE;
have_stat = FALSE;
if ((test & G_FILE_TEST_EXISTS) != 0) {
if (access (filename, F_OK) == 0)
return TRUE;
}
if ((test & G_FILE_TEST_IS_EXECUTABLE) != 0) {
if (access (filename, X_OK) == 0)
return TRUE;
}
if ((test & G_FILE_TEST_IS_SYMLINK) != 0) {
have_stat = (lstat (filename, &st) == 0);
if (have_stat && S_ISLNK (st.st_mode))
return TRUE;
}
if ((test & G_FILE_TEST_IS_REGULAR) != 0) {
if (!have_stat)
have_stat = (stat (filename, &st) == 0);
if (have_stat && S_ISREG (st.st_mode))
return TRUE;
}
if ((test & G_FILE_TEST_IS_DIR) != 0) {
if (!have_stat)
have_stat = (stat (filename, &st) == 0);
if (have_stat && S_ISDIR (st.st_mode))
return TRUE;
}
return FALSE;
}
-113
View File
@@ -1,113 +0,0 @@
/*
* File utility functions.
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
*
* (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
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <config.h>
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/types.h>
#include <sys/stat.h>
#ifdef G_OS_WIN32
#include <io.h>
#define open _open
#define S_ISREG(x) ((x & _S_IFMT) == _S_IFREG)
#define S_ISDIR(x) ((x & _S_IFMT) == _S_IFDIR)
#endif
int mkstemp (char *tmp_template)
{
int fd;
gunichar2* utf16_template;
utf16_template = u8to16 (tmp_template);
fd = -1;
utf16_template = _wmktemp( utf16_template);
if (utf16_template && *utf16_template) {
/* FIXME: _O_TEMPORARY causes file to disappear on close causing a test to fail */
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_EXCL, _S_IREAD | _S_IWRITE);
}
sprintf (tmp_template + strlen (tmp_template) - 6, "%S", utf16_template + wcslen (utf16_template) - 6);
g_free (utf16_template);
return fd;
}
#ifdef _MSC_VER
#pragma warning(disable:4701)
#endif
gboolean
g_file_test (const gchar *filename, GFileTest test)
{
struct _stat64 stat;
int ret = 0;
gunichar2* utf16_filename = NULL;
if (filename == NULL || test == 0)
return FALSE;
utf16_filename = u8to16 (filename);
ret = _wstati64 (utf16_filename, &stat);
g_free (utf16_filename);
if ((test & G_FILE_TEST_EXISTS) != 0) {
if (ret == 0)
return TRUE;
}
if (ret != 0)
return FALSE;
if ((test & G_FILE_TEST_IS_EXECUTABLE) != 0) {
if (stat.st_mode & _S_IEXEC)
return TRUE;
}
if ((test & G_FILE_TEST_IS_REGULAR) != 0) {
if (stat.st_mode & _S_IFREG)
return TRUE;
}
if ((test & G_FILE_TEST_IS_DIR) != 0) {
if (stat.st_mode & _S_IFDIR)
return TRUE;
}
/* make this last in case it is OR'd with something else */
if ((test & G_FILE_TEST_IS_SYMLINK) != 0) {
return FALSE;
}
return FALSE;
}
+232
View File
@@ -28,7 +28,22 @@
#include <config.h>
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#ifdef G_OS_WIN32
#include <io.h>
#define open _open
#define S_ISREG(x) ((x & _S_IFMT) == _S_IFREG)
#define S_ISDIR(x) ((x & _S_IFMT) == _S_IFDIR)
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
GFileError
g_file_error_from_errno (gint err_no)
@@ -91,4 +106,221 @@ g_file_error_from_errno (gint err_no)
}
}
#ifndef O_LARGEFILE
#define OPEN_FLAGS (O_RDONLY)
#else
#define OPEN_FLAGS (O_RDONLY | O_LARGEFILE)
#endif
gboolean
g_file_get_contents (const gchar *filename, gchar **contents, gsize *length, GError **error)
{
gchar *str;
int fd;
struct stat st;
long offset;
int nread;
g_return_val_if_fail (filename != NULL, FALSE);
g_return_val_if_fail (contents != NULL, FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
*contents = NULL;
if (length)
*length = 0;
fd = open (filename, OPEN_FLAGS);
if (fd == -1) {
if (error != NULL) {
int err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error opening file");
}
return FALSE;
}
if (fstat (fd, &st) != 0) {
if (error != NULL) {
int err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in fstat()");
}
close (fd);
return FALSE;
}
str = g_malloc (st.st_size + 1);
offset = 0;
do {
nread = read (fd, str + offset, st.st_size - offset);
if (nread > 0) {
offset += nread;
}
} while ((nread > 0 && offset < st.st_size) || (nread == -1 && errno == EINTR));
close (fd);
str [st.st_size] = '\0';
if (length) {
*length = st.st_size;
}
*contents = str;
return TRUE;
}
#ifdef _MSC_VER
int mkstemp (char *tmp_template)
{
int fd;
gunichar2* utf16_template;
utf16_template = u8to16 (tmp_template);
fd = -1;
utf16_template = _wmktemp( utf16_template);
if (utf16_template && *utf16_template) {
/* FIXME: _O_TEMPORARY causes file to disappear on close causing a test to fail */
fd = _wopen( utf16_template, _O_BINARY | _O_CREAT /*| _O_TEMPORARY*/ | _O_EXCL, _S_IREAD | _S_IWRITE);
}
sprintf (tmp_template + strlen (tmp_template) - 6, "%S", utf16_template + wcslen (utf16_template) - 6);
g_free (utf16_template);
return fd;
}
#endif
gint
g_file_open_tmp (const gchar *tmpl, gchar **name_used, GError **error)
{
const static gchar *default_tmpl = ".XXXXXX";
gchar *t;
gint fd;
size_t len;
g_return_val_if_fail (error == NULL || *error == NULL, -1);
if (tmpl == NULL)
tmpl = default_tmpl;
if (strchr (tmpl, G_DIR_SEPARATOR) != NULL) {
if (error) {
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should not have any " G_DIR_SEPARATOR_S);
}
return -1;
}
len = strlen (tmpl);
if (len < 6 || strcmp (tmpl + len - 6, "XXXXXX")) {
if (error) {
*error = g_error_new (G_LOG_DOMAIN, 24, "Template should end with XXXXXX");
}
return -1;
}
t = g_build_filename (g_get_tmp_dir (), tmpl, NULL);
fd = mkstemp (t);
if (fd == -1) {
if (error) {
int err = errno;
*error = g_error_new (G_LOG_DOMAIN, g_file_error_from_errno (err), "Error in mkstemp()");
}
g_free (t);
return -1;
}
if (name_used) {
*name_used = t;
} else {
g_free (t);
}
return fd;
}
#ifdef _MSC_VER
#pragma warning(disable:4701)
#endif
gboolean
g_file_test (const gchar *filename, GFileTest test)
{
#ifdef G_OS_WIN32
struct _stat64 stat;
int ret = 0;
gunichar2* utf16_filename = NULL;
if (filename == NULL || test == 0)
return FALSE;
utf16_filename = u8to16 (filename);
ret = _wstati64 (utf16_filename, &stat);
g_free (utf16_filename);
if ((test & G_FILE_TEST_EXISTS) != 0) {
if (ret == 0)
return TRUE;
}
if (ret != 0)
return FALSE;
if ((test & G_FILE_TEST_IS_EXECUTABLE) != 0) {
if (stat.st_mode & _S_IEXEC)
return TRUE;
}
if ((test & G_FILE_TEST_IS_REGULAR) != 0) {
if (stat.st_mode & _S_IFREG)
return TRUE;
}
if ((test & G_FILE_TEST_IS_DIR) != 0) {
if (stat.st_mode & _S_IFDIR)
return TRUE;
}
/* make this last in case it is OR'd with something else */
if ((test & G_FILE_TEST_IS_SYMLINK) != 0) {
return FALSE;
}
return FALSE;
#else
struct stat st;
gboolean have_stat;
if (filename == NULL || test == 0)
return FALSE;
have_stat = FALSE;
if ((test & G_FILE_TEST_EXISTS) != 0) {
if (access (filename, F_OK) == 0)
return TRUE;
}
if ((test & G_FILE_TEST_IS_EXECUTABLE) != 0) {
if (access (filename, X_OK) == 0)
return TRUE;
}
if ((test & G_FILE_TEST_IS_SYMLINK) != 0) {
have_stat = (lstat (filename, &st) == 0);
if (have_stat && S_ISLNK (st.st_mode))
return TRUE;
}
if ((test & G_FILE_TEST_IS_REGULAR) != 0) {
if (!have_stat)
have_stat = (stat (filename, &st) == 0);
if (have_stat && S_ISREG (st.st_mode))
return TRUE;
}
if ((test & G_FILE_TEST_IS_DIR) != 0) {
if (!have_stat)
have_stat = (stat (filename, &st) == 0);
if (have_stat && S_ISDIR (st.st_mode))
return TRUE;
}
return FALSE;
#endif
}
+1 -17
View File
@@ -38,7 +38,6 @@ typedef const void * gconstpointer;
typedef char gchar;
typedef unsigned char guchar;
#if !G_TYPES_DEFINED
#ifdef _MSC_VER
typedef __int8 gint8;
typedef unsigned __int8 guint8;
@@ -65,8 +64,6 @@ typedef float gfloat;
typedef double gdouble;
typedef uint16_t gunichar2;
#endif
#endif
/*
* Macros
@@ -125,7 +122,7 @@ static inline gpointer g_malloc0 (gsize x) {if (x) return calloc(1,x); else retu
#define g_alloca(size) alloca (size)
gpointer g_memdup (gconstpointer mem, guint byte_size);
static inline gchar *g_strdup (const gchar *str) { if (str) {return strdup (str);} return NULL; }
gchar *g_strdup (const gchar *str);
typedef struct {
gpointer (*malloc) (gsize n_bytes);
@@ -768,15 +765,6 @@ gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
/*
* 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.
*/
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,
gsize *bytes_read, gsize *bytes_written,
@@ -789,9 +777,6 @@ gchar *g_convert (const gchar *str, gssize len,
const gchar *to_codeset, const gchar *from_codeset,
gsize *bytes_read, gsize *bytes_written, GError **error);
gboolean g_utf8_validate (const gchar *str, gssize max_len, const gchar **end);
gunichar g_utf8_get_char (const gchar *src);
glong g_utf8_strlen (const gchar *str, gssize max);
#define g_utf8_next_char(p) p + (g_trailingBytesForUTF8[(guchar)(*p)] + 1)
/*
* Empty thread functions, not used by eglib
@@ -844,4 +829,3 @@ glong g_utf8_strlen (const gchar *str, gssize max);
#endif
+11 -11
View File
@@ -124,7 +124,7 @@ parse_value (const char *p, const char *end, char **value, GError **error)
return end;
l = (int)(p - start);
p++;
*value = g_malloc (l + 1);
*value = malloc (l + 1);
if (*value == NULL)
return end;
strncpy (*value, start, l);
@@ -144,7 +144,7 @@ parse_name (const char *p, const char *end, char **value)
return end;
l = (int)(p - start);
*value = g_malloc (l + 1);
*value = malloc (l + 1);
if (*value == NULL)
return end;
strncpy (*value, start, l);
@@ -183,24 +183,24 @@ parse_attributes (const char *p, const char *end, char ***names, char ***values,
p = skip_space (p, end);
if (p == end){
g_free (name);
free (name);
return p;
}
if (*p != '='){
set_error ("Expected an = after the attribute name `%s'", name);
g_free (name);
free (name);
return end;
}
p++;
p = skip_space (p, end);
if (p == end){
g_free (name);
free (name);
return end;
}
p = parse_value (p, end, &value, error);
if (p == end){
g_free (name);
free (name);
return p;
}
@@ -312,7 +312,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
goto fail;
}
l = (int)(element_end - element_start);
ename = g_malloc (l + 1);
ename = malloc (l + 1);
if (ename == NULL)
goto fail;
strncpy (ename, element_start, l);
@@ -331,7 +331,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
}
if (error != NULL && *error != NULL){
g_free (ename);
free (ename);
goto fail;
}
@@ -343,7 +343,7 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
goto fail;
}
}
g_free (ename);
free (ename);
} else {
context->level = g_slist_prepend (context->level, ename);
}
@@ -404,11 +404,11 @@ g_markup_parse_context_parse (GMarkupParseContext *context,
if (context->parser.end_element != NULL){
context->parser.end_element (context, text, context->user_data, error);
if (error != NULL && *error != NULL){
g_free (text);
free (text);
goto fail;
}
}
g_free (text);
free (text);
while (p < end && *p != '>')
p++;
-140
View File
@@ -1,140 +0,0 @@
/*
* gmisc.c: Misc functions with no place to go (right now)
*
* Author:
* Aaron Bockover ([email protected])
*
* (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
* "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>
#include <pthread.h>
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
const gchar *
g_getenv(const gchar *variable)
{
return getenv(variable);
}
gboolean
g_setenv(const gchar *variable, const gchar *value, gboolean overwrite)
{
return setenv(variable, value, overwrite) == 0;
}
void
g_unsetenv(const gchar *variable)
{
unsetenv(variable);
}
gchar*
g_win32_getlocale(void)
{
return NULL;
}
gboolean
g_path_is_absolute (const char *filename)
{
g_return_val_if_fail (filename != NULL, FALSE);
return (*filename == '/');
}
static pthread_mutex_t home_lock = PTHREAD_MUTEX_INITIALIZER;
static const gchar *home_dir;
/* Give preference to /etc/passwd than HOME */
const gchar *
g_get_home_dir (void)
{
if (home_dir == NULL){
pthread_mutex_lock (&home_lock);
if (home_dir == NULL){
#ifdef HAVE_GETPWENT_R
struct passwd pwbuf, *track;
char buf [4096];
uid_t uid;
uid = getuid ();
setpwent ();
while (getpwent_r (&pwbuf, buf, sizeof (buf), &track) == 0){
if (pwbuf.pw_uid == uid){
home_dir = g_strdup (pwbuf.pw_dir);
break;
}
}
endpwent ();
#endif
if (home_dir == NULL)
home_dir = g_getenv ("HOME");
pthread_mutex_unlock (&home_lock);
}
}
return home_dir;
}
const char *
g_get_user_name (void)
{
const char *retName = g_getenv ("USER");
return retName;
}
static const char *tmp_dir;
static pthread_mutex_t tmp_lock = PTHREAD_MUTEX_INITIALIZER;
const gchar *
g_get_tmp_dir (void)
{
if (tmp_dir == NULL){
pthread_mutex_lock (&tmp_lock);
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TMPDIR");
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TMP");
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TEMP");
if (tmp_dir == NULL)
tmp_dir = "/tmp";
}
}
}
pthread_mutex_unlock (&tmp_lock);
}
return tmp_dir;
}
+18 -61
View File
@@ -29,13 +29,14 @@
#include <stdlib.h>
#include <glib.h>
#ifdef G_OS_WIN32
#include <windows.h>
#include <direct.h>
#include <io.h>
#endif
const gchar *
g_getenv(const gchar *variable)
{
#ifdef G_OS_WIN32
gunichar2 *var, *buffer;
gchar* val = NULL;
gint32 buffer_size = 1024;
@@ -55,11 +56,15 @@ g_getenv(const gchar *variable)
g_free(var);
g_free(buffer);
return val;
#else
return getenv(variable);
#endif
}
gboolean
g_setenv(const gchar *variable, const gchar *value, gboolean overwrite)
{
#ifdef G_OS_WIN32
gunichar2 *var, *val;
gboolean result;
var = u8to16(variable);
@@ -68,83 +73,35 @@ g_setenv(const gchar *variable, const gchar *value, gboolean overwrite)
g_free(var);
g_free(val);
return result;
#else
return setenv(variable, value, overwrite) == 0;
#endif
}
void
g_unsetenv(const gchar *variable)
{
#ifdef G_OS_WIN32
gunichar2 *var;
var = u8to16(variable);
SetEnvironmentVariable(var, TEXT(""));
g_free(var);
#else
unsetenv(variable);
#endif
}
gchar*
g_win32_getlocale(void)
{
#ifdef G_OS_WIN32
/* FIXME: Use GetThreadLocale
* and convert LCID to standard
* string form, "en_US" */
return strdup ("en_US");
#else
return NULL;
#endif
}
gboolean
g_path_is_absolute (const char *filename)
{
g_return_val_if_fail (filename != NULL, FALSE);
if (filename[0] != '\0' && filename[1] != '\0' && filename[1] == ':' &&
filename[2] != '\0' && (filename[2] == '\\' || filename[2] == '/'))
return TRUE;
else
return FALSE;
}
const gchar *
g_get_home_dir (void)
{
/* FIXME */
const gchar *drive = g_getenv ("HOMEDRIVE");
const gchar *path = g_getenv ("HOMEPATH");
gchar *home_dir = NULL;
if (drive && path) {
home_dir = g_malloc(strlen(drive) + strlen(path) +1);
if (home_dir) {
sprintf(home_dir, "%s%s", drive, path);
}
}
return home_dir;
}
const char *
g_get_user_name (void)
{
const char * retName = g_getenv ("USER");
if (!retName)
retName = g_getenv ("USERNAME");
return retName;
}
static const char *tmp_dir;
const gchar *
g_get_tmp_dir (void)
{
if (tmp_dir == NULL){
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TMPDIR");
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TMP");
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TEMP");
if (tmp_dir == NULL)
tmp_dir = "C:\\temp";
}
}
}
}
return tmp_dir;
}
-185
View File
@@ -1,185 +0,0 @@
/*
* gmodule.c: dl* functions, glib style
*
* Author:
* Gonzalo Paniagua Javier ([email protected])
* Jonathan Chambers ([email protected])
* Robert Jordan ([email protected])
*
* (C) 2006 Novell, Inc.
* (C) 2006 Jonathan Chambers
*
* 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 <glib.h>
#include <gmodule.h>
#include <windows.h>
#include <psapi.h>
#define LIBSUFFIX ".dll"
#define LIBPREFIX ""
struct _GModule {
HMODULE handle;
int main_module;
};
GModule *
g_module_open (const gchar *file, GModuleFlags flags)
{
GModule *module;
module = g_malloc (sizeof (GModule));
if (module == NULL)
return NULL;
if (file != NULL) {
gunichar2 *file16;
file16 = u8to16(file);
module->main_module = FALSE;
module->handle = LoadLibrary (file16);
g_free(file16);
if (!module->handle) {
g_free (module);
return NULL;
}
} else {
module->main_module = TRUE;
module->handle = GetModuleHandle (NULL);
}
return module;
}
static gpointer
w32_find_symbol (const gchar *symbol_name)
{
HMODULE *modules;
DWORD buffer_size = sizeof (HMODULE) * 1024;
DWORD needed, i;
modules = (HMODULE *) g_malloc (buffer_size);
if (modules == NULL)
return NULL;
if (!EnumProcessModules (GetCurrentProcess (), modules,
buffer_size, &needed)) {
g_free (modules);
return NULL;
}
/* check whether the supplied buffer was too small, realloc, retry */
if (needed > buffer_size) {
g_free (modules);
buffer_size = needed;
modules = (HMODULE *) g_malloc (buffer_size);
if (modules == NULL)
return NULL;
if (!EnumProcessModules (GetCurrentProcess (), modules,
buffer_size, &needed)) {
g_free (modules);
return NULL;
}
}
for (i = 0; i < needed / sizeof (HANDLE); i++) {
gpointer proc = (gpointer)(intptr_t)GetProcAddress (modules [i], symbol_name);
if (proc != NULL) {
g_free (modules);
return proc;
}
}
g_free (modules);
return NULL;
}
gboolean
g_module_symbol (GModule *module, const gchar *symbol_name, gpointer *symbol)
{
if (module == NULL || symbol_name == NULL || symbol == NULL)
return FALSE;
if (module->main_module) {
*symbol = (gpointer)(intptr_t)GetProcAddress (module->handle, symbol_name);
if (*symbol != NULL)
return TRUE;
*symbol = w32_find_symbol (symbol_name);
return *symbol != NULL;
} else {
*symbol = (gpointer)(intptr_t)GetProcAddress (module->handle, symbol_name);
return *symbol != NULL;
}
}
const gchar *
g_module_error (void)
{
gchar* ret = NULL;
TCHAR* buf = NULL;
DWORD code = GetLastError ();
FormatMessage (FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER, NULL,
code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), buf, 0, NULL);
ret = u16to8 (buf);
LocalFree(buf);
return ret;
}
gboolean
g_module_close (GModule *module)
{
HMODULE handle;
int main_module;
if (module == NULL || module->handle == NULL)
return FALSE;
handle = module->handle;
main_module = module->main_module;
module->handle = NULL;
g_free (module);
return (main_module ? 1 : (0 == FreeLibrary (handle)));
}
gchar *
g_module_build_path (const gchar *directory, const gchar *module_name)
{
char *lib_prefix = "";
if (module_name == NULL)
return NULL;
if (strncmp (module_name, "lib", 3) != 0)
lib_prefix = LIBPREFIX;
if (directory && *directory){
return g_strdup_printf ("%s/%s%s" LIBSUFFIX, directory, lib_prefix, module_name);
}
return g_strdup_printf ("%s%s" LIBSUFFIX, lib_prefix, module_name);
}
@@ -285,4 +285,3 @@ g_module_build_path (const gchar *directory, const gchar *module_name)
}
return g_strdup_printf ("%s%s" LIBSUFFIX, lib_prefix, module_name);
}
-3
View File
@@ -27,7 +27,4 @@ const gchar *g_module_error (void);
gboolean g_module_close (GModule *module);
gchar * g_module_build_path (const gchar *directory, const gchar *module_name);
extern char *gmodule_libprefix;
extern char *gmodule_libsuffix;
#endif
+1 -4
View File
@@ -73,11 +73,8 @@ g_logv (const gchar *log_domain, GLogLevelFlags log_level, const gchar *format,
log_domain != NULL ? ": " : "",
msg);
free (msg);
if (log_level & fatal){
fflush (stdout);
fflush (stderr);
if (log_level & fatal)
abort ();
}
}
void
+143 -2
View File
@@ -29,15 +29,26 @@
#include <stdio.h>
#include <glib.h>
#include <errno.h>
#include <sys/types.h>
#ifdef G_OS_WIN32
#include <direct.h>
#ifdef G_OS_UNIX
#include <pthread.h>
#endif
#ifdef HAVE_PWD_H
#include <pwd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#ifdef G_OS_WIN32
#include <direct.h>
#include <io.h>
#endif
gchar *
g_build_path (const gchar *separator, const gchar *first_element, ...)
{
@@ -131,6 +142,21 @@ g_path_get_basename (const char *filename)
return g_strdup (&r[1]);
}
gboolean
g_path_is_absolute (const char *filename)
{
g_return_val_if_fail (filename != NULL, FALSE);
#ifdef G_OS_WIN32
if (filename[0] != '\0' && filename[1] != '\0' && filename[1] == ':' &&
filename[2] != '\0' && (filename[2] == '\\' || filename[2] == '/'))
return TRUE;
else
return FALSE;
#else
return (*filename == '/');
#endif
}
gchar *
g_find_program_in_path (const gchar *program)
{
@@ -182,6 +208,121 @@ g_get_current_dir (void)
return r;
}
#if defined (G_OS_UNIX)
static pthread_mutex_t home_lock = PTHREAD_MUTEX_INITIALIZER;
static const gchar *home_dir;
/* Give preference to /etc/passwd than HOME */
const gchar *
g_get_home_dir (void)
{
if (home_dir == NULL){
pthread_mutex_lock (&home_lock);
if (home_dir == NULL){
#ifdef HAVE_GETPWENT_R
struct passwd pwbuf, *track;
char buf [4096];
uid_t uid;
uid = getuid ();
setpwent ();
while (getpwent_r (&pwbuf, buf, sizeof (buf), &track) == 0){
if (pwbuf.pw_uid == uid){
home_dir = g_strdup (pwbuf.pw_dir);
break;
}
}
endpwent ();
#endif
if (home_dir == NULL)
home_dir = g_getenv ("HOME");
pthread_mutex_unlock (&home_lock);
}
}
return home_dir;
}
#elif defined (G_OS_WIN32)
#include <windows.h>
const gchar *
g_get_home_dir (void)
{
/* FIXME */
const gchar *drive = g_getenv ("HOMEDRIVE");
const gchar *path = g_getenv ("HOMEPATH");
gchar *home_dir = NULL;
if (drive && path) {
home_dir = malloc(strlen(drive) + strlen(path) +1);
if (home_dir) {
sprintf(home_dir, "%s%s", drive, path);
}
}
return home_dir;
}
#else
const gchar *
g_get_home_dir (void)
{
g_error ("%s", "g_get_home_dir not implemented on this platform");
return NULL;
}
#endif
static const char *tmp_dir;
#ifdef G_OS_UNIX
static pthread_mutex_t tmp_lock = PTHREAD_MUTEX_INITIALIZER;
#endif
const gchar *
g_get_tmp_dir (void)
{
if (tmp_dir == NULL){
#ifdef G_OS_UNIX
pthread_mutex_lock (&tmp_lock);
#endif
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TMPDIR");
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TMP");
if (tmp_dir == NULL){
tmp_dir = g_getenv ("TEMP");
if (tmp_dir == NULL)
#if defined (G_OS_WIN32)
tmp_dir = "C:\\temp";
#else
tmp_dir = "/tmp";
#endif
}
}
}
#ifdef G_OS_UNIX
pthread_mutex_unlock (&tmp_lock);
#endif
}
return tmp_dir;
}
const char *
g_get_user_name (void)
{
const char * retName = g_getenv ("USER");
#if defined (G_OS_WIN32)
if (!retName)
retName = g_getenv ("USERNAME");
#endif
return retName;
}
static char *name;
void
+2 -3
View File
@@ -37,8 +37,7 @@ typedef enum {
MATCH_LITERAL,
MATCH_ANYCHAR,
MATCH_ANYTHING,
MATCH_ANYTHING_END,
MATCH_INVALID = -1
MATCH_ANYTHING_END
} MatchType;
typedef struct {
@@ -57,7 +56,7 @@ compile_pattern (const gchar *pattern)
size_t i, len;
PData *data;
gchar c;
MatchType last = MATCH_INVALID;
MatchType last = -1;
GString *str;
gboolean free_str;
+10 -1
View File
@@ -40,7 +40,7 @@ g_strndup (const gchar *str, gsize n)
return strndup (str, n);
#else
if (str) {
char *retval = g_malloc(n+1);
char *retval = malloc(n+1);
if (retval) {
strncpy(retval, str, n)[n] = 0;
}
@@ -817,6 +817,15 @@ g_strescape (const gchar *source, const gchar *exceptions)
return result;
}
gchar *
g_strdup (const gchar *str)
{
if (str == NULL)
return NULL;
return strdup (str);
}
gint
g_ascii_xdigit_value (gchar c)
{
+1 -1
View File
@@ -159,7 +159,7 @@ g_string_append_printf (GString *string, const gchar *format, ...)
va_end (args);
g_string_append (string, ret);
g_free (ret);
free (ret);
}
void
-90
View File
@@ -1,90 +0,0 @@
/*
* Timer
*
* Author:
* Gonzalo Paniagua Javier ([email protected]
*
* (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
* "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 <glib.h>
#include <windows.h>
struct _GTimer {
guint64 start;
guint64 stop;
};
GTimer *g_timer_new (void)
{
GTimer *timer;
timer = g_new0 (GTimer, 1);
g_timer_start (timer);
return timer;
}
void
g_timer_destroy (GTimer *timer)
{
g_return_if_fail (timer != NULL);
g_free (timer);
}
void
g_timer_start (GTimer *timer)
{
g_return_if_fail (timer != NULL);
QueryPerformanceCounter ((LARGE_INTEGER*)&timer->start);
}
void
g_timer_stop (GTimer *timer)
{
g_return_if_fail (timer != NULL);
QueryPerformanceCounter ((LARGE_INTEGER*)&timer->stop);
}
gdouble
g_timer_elapsed (GTimer *timer, gulong *microseconds)
{
guint64 stop;
guint64 freq;
gdouble seconds;
if (timer->stop == 0) {
QueryPerformanceCounter ((LARGE_INTEGER*)&stop);
}
else {
stop = timer->stop;
}
QueryPerformanceFrequency ((LARGE_INTEGER*)&freq);
seconds = 1.0 * (stop - timer->start) / freq;
if (microseconds) {
*microseconds = (gulong)(1000000.0 * (stop - timer->start) / freq);
}
return seconds;
}
@@ -26,11 +26,20 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <glib.h>
#ifdef _MSC_VER
#include <windows.h>
#else
#include <sys/time.h>
#endif
struct _GTimer {
#ifdef _MSC_VER
guint64 start;
guint64 stop;
#else
struct timeval start;
struct timeval stop;
#endif
};
GTimer *g_timer_new (void)
@@ -53,20 +62,48 @@ void
g_timer_start (GTimer *timer)
{
g_return_if_fail (timer != NULL);
#ifdef _MSC_VER
QueryPerformanceCounter ((LARGE_INTEGER*)&timer->start);
#else
gettimeofday (&timer->start, NULL);
memset (&timer->stop, 0, sizeof (struct timeval));
#endif
}
void
g_timer_stop (GTimer *timer)
{
g_return_if_fail (timer != NULL);
#ifdef _MSC_VER
QueryPerformanceCounter ((LARGE_INTEGER*)&timer->stop);
#else
gettimeofday (&timer->stop, NULL);
#endif
}
gdouble
g_timer_elapsed (GTimer *timer, gulong *microseconds)
{
#ifdef _MSC_VER
guint64 stop;
guint64 freq;
gdouble seconds;
if (timer->stop == 0) {
QueryPerformanceCounter ((LARGE_INTEGER*)&stop);
}
else {
stop = timer->stop;
}
QueryPerformanceFrequency ((LARGE_INTEGER*)&freq);
seconds = 1.0 * (stop - timer->start) / freq;
if (microseconds) {
*microseconds = (gulong)(1000000.0 * (stop - timer->start) / freq);
}
return seconds;
#else
struct timeval tv;
gulong seconds;
long usec;
@@ -91,6 +128,7 @@ g_timer_elapsed (GTimer *timer, gulong *microseconds)
}
result = seconds * 1000000 + usec;
return (result / 1000000);
#endif
}
+52 -125
View File
@@ -50,35 +50,6 @@ typedef int iconv_t;
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)
{
@@ -254,105 +225,61 @@ g_locale_from_utf8 (const gchar *utf8string, gssize len, gsize *bytes_read, gsiz
* Return value: true if @utf is valid.
**/
gboolean
g_utf8_validate (const gchar *str, gssize max_len, const gchar **end)
g_utf8_validate (const gchar *utf, 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;
int ix;
g_return_val_if_fail (utf != NULL, 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 (max_len == -1)
max_len = strlen (utf);
/*
* utf is a string of 1, 2, 3 or 4 bytes. The valid strings
* are as follows (in "bit format"):
* 0xxxxxxx valid 1-byte
* 110xxxxx 10xxxxxx valid 2-byte
* 1110xxxx 10xxxxxx 10xxxxxx valid 3-byte
* 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx valid 4-byte
*/
for (ix = 0; ix < max_len;) { /* string is 0-terminated */
unsigned char c;
c = utf[ix];
if ((c & 0x80) == 0x00) { /* 1-byte code, starts with 10 */
ix++;
} else if ((c & 0xe0) == 0xc0) {/* 2-byte code, starts with 110 */
if (((ix+1) >= max_len) || (utf[ix+1] & 0xc0 ) != 0x80){
if (end != NULL)
*end = &utf [ix];
return FALSE;
}
ix += 2;
} else if ((c & 0xf0) == 0xe0) {/* 3-byte code, starts with 1110 */
if (((ix + 2) >= max_len) ||
((utf[ix+1] & 0xc0) != 0x80) ||
((utf[ix+2] & 0xc0) != 0x80)){
if (end != NULL)
*end = &utf [ix];
return FALSE;
}
ix += 3;
} else if ((c & 0xf8) == 0xf0) {/* 4-byte code, starts with 11110 */
if (((ix + 3) >= max_len) ||
((utf[ix+1] & 0xc0) != 0x80) ||
((utf[ix+2] & 0xc0) != 0x80) ||
((utf[ix+3] & 0xc0) != 0x80)){
if (end != NULL)
*end = &utf [ix];
return FALSE;
}
ix += 4;
} else {/* unknown encoding */
if (end != NULL)
*end = (gchar*) ptr;
lastRet = FALSE;
*end = &utf [ix];
return 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;
return TRUE;
}
+20 -20
View File
@@ -4,27 +4,27 @@
int vasprintf(char **ret, const char *fmt, va_list ap)
{
char *buf;
int len;
size_t buflen;
va_list ap2;
char *buf;
int len;
size_t buflen;
va_list ap2;
#ifdef _MSC_VER
ap2 = ap;
len = _vscprintf(fmt, ap2); // NOTE MS specific extension ( :-( )
ap2 = ap;
len = _vscprintf(fmt, ap2); // NOTE MS specific extension ( :-( )
#else
va_copy(ap2, ap);
len = vsnprintf(NULL, 0, fmt, ap2);
va_copy(ap2, ap);
len = vsnprintf(NULL, 0, fmt, ap2);
#endif
if (len > 0 && (buf = malloc((buflen = (size_t) (len + 1)))) != NULL) {
len = vsnprintf(buf, buflen, fmt, ap);
*ret = buf;
} else {
*ret = NULL;
len = -1;
}
va_end(ap2);
return len;
if (len > 0 && (buf = malloc((buflen = (size_t) (len + 1)))) != NULL) {
len = vsnprintf(buf, buflen, fmt, ap);
*ret = buf;
} else {
*ret = NULL;
len = -1;
}
va_end(ap2);
return len;
}
+1 -2
View File
@@ -23,8 +23,7 @@ SOURCES = \
markup.c \
utf8.c \
endian.c \
module.c \
memory.c
module.c
test_eglib_SOURCES = $(SOURCES)
-40
View File
@@ -1,40 +0,0 @@
#include <glib.h>
#include "test.h"
RESULT
test_memory_zero_size_allocations ()
{
gpointer p;
p = g_malloc (0);
if (p)
return FAILED ("Calling g_malloc with size zero should return NULL.");
p = g_malloc0 (0);
if (p)
return FAILED ("Calling g_malloc0 with size zero should return NULL.");
p = g_realloc (NULL, 0);
if (p)
return FAILED ("Calling g_realloc with size zero should return NULL.");
p = g_new (int, 0);
if (p)
return FAILED ("Calling g_new with size zero should return NULL.");
p = g_new0 (int, 0);
if (p)
return FAILED ("Calling g_new0 with size zero should return NULL.");
return OK;
}
static Test memory_tests [] = {
{ "zero_size_allocations", test_memory_zero_size_allocations},
{NULL, NULL}
};
DEFINE_TEST_GROUP_INIT(memory_tests_init, memory_tests)
-2
View File
@@ -21,7 +21,6 @@ DEFINE_TEST_GROUP_INIT_H(markup_tests_init);
DEFINE_TEST_GROUP_INIT_H(utf8_tests_init);
DEFINE_TEST_GROUP_INIT_H(endian_tests_init);
DEFINE_TEST_GROUP_INIT_H(module_tests_init);
DEFINE_TEST_GROUP_INIT_H(memory_tests_init);
static Group test_groups [] = {
{"string", string_tests_init},
@@ -45,7 +44,6 @@ static Group test_groups [] = {
{"utf8", utf8_tests_init},
{"endian", endian_tests_init},
{"module", module_tests_init},
{"memory", memory_tests_init},
{NULL, NULL}
};
-156
View File
@@ -483,158 +483,6 @@ test_utf16_to_ucs4 ()
return OK;
}
RESULT
test_utf8_strlen ()
{
gchar word1 [] = {0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,0xF1, 0x82, 0x82, 0x82,'\0'};//Valid, len = 5
gchar word2 [] = {0xF1, 0x82, 0x82, 0x82,0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,'\0'};//Valid, len = 5
gchar word3 [] = {'h','e',0xC2, 0x82,0x45,'\0'}; //Valid, len = 4
gchar word4 [] = {0x62,0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,'\0'}; //Valid, len = 5
glong len = 0;
//Test word1
len = g_utf8_strlen (word1,-1);
if (len != 5)
return FAILED ("Word1 expected length of 5, but was %i", len);
//Do tests with different values for max parameter.
len = g_utf8_strlen (word1,1);
if (len != 0)
return FAILED ("Word1, max = 1, expected length of 0, but was %i", len);
len = g_utf8_strlen (word1,2);
if (len != 1)
return FAILED ("Word1, max = 1, expected length of 1, but was %i", len);
len = g_utf8_strlen (word1,3);
if (len != 2)
return FAILED ("Word1, max = 2, expected length of 2, but was %i", len);
//Test word2
len = g_utf8_strlen (word2,-1);
if (len != 5)
return FAILED ("Word2 expected length of 5, but was %i", len);
//Test word3
len = g_utf8_strlen (word3,-1);
if (len != 4)
return FAILED ("Word3 expected length of 4, but was %i", len);
//Test word4
len = g_utf8_strlen (word4,-1);
if (len != 5)
return FAILED ("Word4 expected length of 5, but was %i", len);
//Test null case
len = g_utf8_strlen(NULL,0);
if (len != 0)
return FAILED ("Expected passing null to result in a length of 0");
return OK;
}
RESULT
test_utf8_get_char()
{
gchar word1 [] = {0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,0xF1, 0x82, 0x82, 0x82,'\0'}; //Valid, len = 5
gunichar value = g_utf8_get_char (&word1 [0]);
if (value != 0x82UL)
return FAILED ("Expected value of 0x82, but was %x", value);
value = g_utf8_get_char (&word1 [2]);
if (value != 0x45UL)
return FAILED ("Expected value of 0x45, but was %x", value);
value = g_utf8_get_char (&word1 [3]);
if (value != 0x1043UL)
return FAILED ("Expected value of 0x1043, but was %x", value);
value = g_utf8_get_char (&word1 [6]);
if (value != 0x58UL)
return FAILED ("Expected value of 0x58, but was %x", value);
value = g_utf8_get_char (&word1 [7]);
if (value != 0x42082UL)
return FAILED ("Expected value of 0x42082, but was %x", value);
return OK;
}
RESULT
test_utf8_next_char()
{
gchar word1 [] = {0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,0xF1, 0x82, 0x82, 0x82,'\0'}; //Valid, len = 5
gchar word2 [] = {0xF1, 0x82, 0x82, 0x82,0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,'\0'}; //Valid, len = 5
gchar word1ExpectedValues [] = {0xC2, 0x45,0xE1, 0x58, 0xF1};
gchar word2ExpectedValues [] = {0xF1, 0xC2, 0x45, 0xE1, 0x58};
gchar* ptr = word1;
gint count = 0;
//Test word1
while (*ptr != 0) {
if (count > 4)
return FAILED ("Word1 has gone past its expected length");
if (*ptr != word1ExpectedValues[count])
return FAILED ("Word1 has an incorrect next_char at index %i", count);
ptr = g_utf8_next_char (ptr);
count++;
}
//Test word2
count = 0;
ptr = word2;
while (*ptr != 0) {
if (count > 4)
return FAILED ("Word2 has gone past its expected length");
if (*ptr != word2ExpectedValues[count])
return FAILED ("Word2 has an incorrect next_char at index %i", count);
ptr = g_utf8_next_char (ptr);
count++;
}
return OK;
}
RESULT
test_utf8_validate()
{
gchar invalidWord1 [] = {0xC3, 0x82, 0xC1,0x90,'\0'}; //Invalid, 1nd oct Can't be 0xC0 or 0xC1
gchar invalidWord2 [] = {0xC1, 0x89, 0x60, '\0'}; //Invalid, 1st oct can not be 0xC1
gchar invalidWord3 [] = {0xC2, 0x45,0xE1, 0x81, 0x83,0x58,'\0'}; //Invalid, oct after 0xC2 must be > 0x80
gchar validWord1 [] = {0xC2, 0x82, 0xC3,0xA0,'\0'}; //Valid
gchar validWord2 [] = {0xC2, 0x82,0x45,0xE1, 0x81, 0x83,0x58,0xF1, 0x82, 0x82, 0x82,'\0'}; //Valid
const gchar* end;
gboolean retVal = g_utf8_validate (invalidWord1, -1, &end);
if (retVal != FALSE)
return FAILED ("Expected invalidWord1 to be invalid");
if (end != &invalidWord1 [2])
return FAILED ("Expected end parameter to be pointing to invalidWord1[2]");
end = NULL;
retVal = g_utf8_validate (invalidWord2, -1, &end);
if (retVal != FALSE)
return FAILED ("Expected invalidWord2 to be invalid");
if (end != &invalidWord2 [0])
return FAILED ("Expected end parameter to be pointing to invalidWord2[0]");
end = NULL;
retVal = g_utf8_validate (invalidWord3, -1, &end);
if (retVal != FALSE)
return FAILED ("Expected invalidWord3 to be invalid");
if (end != &invalidWord3 [0])
return FAILED ("Expected end parameter to be pointing to invalidWord3[1]");
end = NULL;
retVal = g_utf8_validate (validWord1, -1, &end);
if (retVal != TRUE)
return FAILED ("Expected validWord1 to be valid");
if (end != &validWord1 [4])
return FAILED ("Expected end parameter to be pointing to validWord1[4]");
end = NULL;
retVal = g_utf8_validate (validWord2, -1, &end);
if (retVal != TRUE)
return FAILED ("Expected validWord2 to be valid");
if (end != &validWord2 [11])
return FAILED ("Expected end parameter to be pointing to validWord2[11]");
return OK;
}
/*
* test initialization
@@ -648,10 +496,6 @@ static Test utf8_tests [] = {
{"g_unichar_xdigit_value", test_xdigit },
{"g_ucs4_to_utf16", test_ucs4_to_utf16 },
{"g_utf16_to_ucs4", test_utf16_to_ucs4 },
{"g_utf8_strlen", test_utf8_strlen },
{"g_utf8_get_char", test_utf8_get_char },
{"g_utf8_next_char", test_utf8_next_char },
{"g_utf8_validate", test_utf8_validate },
{NULL, NULL}
};
+2 -13
View File
@@ -14,17 +14,6 @@
GC_setspecific define. Unfold the define into a static inline on all platforms
except ppc where it is a static leaf function.
2008-08-10 Zoltan Varga <[email protected]>
* include/private/gc_locks.h: Add amd64 support so parallel mark works on
amd64 too.
2008-08-05 Andreas Färber <[email protected]>
* autogen.sh: Suppress arguments warning for NOCONFIGURE.
Contributed under MIT/X11 license.
2008-08-03 Zoltan Varga <[email protected]>
* pthread_support.c (GC_thread_exit_proc): Null out the tls key to prevent the
@@ -43,8 +32,8 @@
* include/gc.h: Add GC_DllMain.
* win32_threads.c: Rename DllMain to GC_DllMain.
Contributed under MIT/X11 license.
Contributed under MIT/X11 license.
2008-04-15 Jonathan Chambers <[email protected]>
* include/private/gcconfig.h: Backport GC7 code to support Win64.
+1 -1
View File
@@ -67,7 +67,7 @@ if test "$DIE" -eq 1; then
exit 1
fi
if test x$NOCONFIGURE = x && test -z "$*"; then
if test -z "$*"; then
echo "**Warning**: I am going to run \`configure' with no arguments."
echo "If you wish to pass any to it, please specify them on the"
echo \`$0\'" command line."
+22 -2
View File
@@ -112,9 +112,29 @@ case "$THREADS" in
AC_DEFINE(THREAD_LOCAL_ALLOC)
THREADDLLIBS="-lpthread -lrt"
;;
*-*-freebsd*)
*-*-freebsd4*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
if test "x$PTHREAD_CFLAGS" != "x"; then
if test "x$PTHREAD_CFLAGS" = "x"; then
INCLUDES="$INCLUDES -pthread"
else
INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
THREADDLLIBS=-pthread
else
THREADDLLIBS=$PTHREAD_LIBS
fi
;;
*-*-freebsd5*)
AC_MSG_WARN("FreeBSD does not yet fully support threads with Boehm GC.")
AC_DEFINE(GC_FREEBSD_THREADS)
INCLUDES="$INCLUDES -pthread"
THREADDLLIBS=-pthread
;;
*-*-freebsd6*)
AC_DEFINE(GC_FREEBSD_THREADS)
if test "x$PTHREAD_CFLAGS" != "x"; then
INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
fi
if test "x$PTHREAD_LIBS" = "x"; then
-23
View File
@@ -437,29 +437,6 @@
}
# endif /* I386 */
# if defined(X86_64)
# if !defined(GENERIC_COMPARE_AND_SWAP)
/* Returns TRUE if the comparison succeeded. */
inline static GC_bool GC_compare_and_exchange(volatile GC_word *addr,
GC_word old,
GC_word new_val)
{
char result;
__asm__ __volatile__("lock; cmpxchgq %2, %0; setz %1"
: "+m"(*(addr)), "=r"(result)
: "r" (new_val), "a"(old) : "memory");
return (GC_bool) result;
}
# endif /* !GENERIC_COMPARE_AND_SWAP */
inline static void GC_memory_barrier()
{
/* We believe the processor ensures at least processor */
/* consistent ordering. Thus a compiler barrier */
/* should suffice. */
__asm__ __volatile__("" : : : "memory");
}
# endif /* X86_64 */
# if defined(POWERPC)
# if !defined(GENERIC_COMPARE_AND_SWAP)
# if CPP_WORDSZ == 64
+1 -46
View File
@@ -1,60 +1,15 @@
2008-10-18 Jonathan Pryor <[email protected]>
* Makefile.am (man_MANS): Remove unpackaged files.
2008-10-18 Jonathan Pryor <[email protected]>
* mdvalidator.1: Rename to mdvalidater.1.
* Makefile.am (man_MANS): Rename to mdvalidator.1 to mdvalidater.1.
2008-10-18 Jonathan Pryor <[email protected]>
* Makefile.am (man_MANS): Add mdoc.5 and mono-config.5.
2008-10-18 Mark Probst <[email protected]>
* mono.1: Documentation for "--no-x86-stack-align" option.
2008-10-17 Jonathan Pryor <[email protected]>
* Makefile: Add man pages added from monodoc/man...
2008-10-12 Atsushi Enomoto <[email protected]>
* mono.1 : svn.myrealbox -> anonsvn.mono-project .
2008-10-10 Massimiliano Mantione <[email protected]>
* mono.1: Document the new "sas" option.
2008-09-11 Daniel Morgan <[email protected]>
* sqlsharp.1: added commands
\bcs, \cs, \listproviders, \p
2008-08-27 Zoltan Varga <[email protected]>
* mono-config.5: Fix a typo.
2008-08-22 Massimiliano Mantione <[email protected]>
* mono.1: Restore original nonvisible formatting (' ', '\-', and '"'
were added everywhere by mistake in r109428).
2008-08-21 Massimiliano Mantione <[email protected]>
* mono.1: Updated description of the logging profiler.
* mono.1: Updated description of the logging profiler from trunk.
2008-08-08 Zoltan Varga <[email protected]>
* mono.1: Remove no-dlsym aot option for now.
* mono.1: Document the 'static' aot option.
2008-08-01 Massimiliano Mantione <[email protected]>
* mono.1: Updated description of the logging profiler.
2008-04-22 Robert Jordan <[email protected]>
* mono.1: Document MONO_DEBUG=no-gdb-backtrace.
+5 -53
View File
@@ -1,55 +1,7 @@
man_MANS = \
al.1 \
cert2spc.1 \
certmgr.1 \
chktrust.1 \
cilc.1 \
csharp.1 \
disco.1 \
dtd2xsd.1 \
gacutil.1 \
genxs.1 \
httpcfg.1 \
ilasm.1 \
macpack.1 \
makecert.1 \
mconfig.1 \
mcs.1 \
mdassembler.1 \
mdoc.1 \
mdoc.5 \
mdoc-assemble.1 \
mdoc-export-html.1 \
mdoc-export-msxdoc.1 \
mdoc-update.1 \
mdoc-validate.1 \
mdvalidater.1 \
mkbundle.1 \
mono.1 \
mono-cil-strip.1 \
mono-config.5 \
monodocer.1 \
monodocs2html.1 \
monolinker.1 \
monop.1 \
mono-service.1 \
mono-shlib-cop.1 \
monostyle.1 \
mono-xmltool.1 \
mozroots.1 \
oldmono.1 \
permview.1 \
prj2make.1 \
resgen.1 \
secutil.1 \
setreg.1 \
sgen.1 \
signcode.1 \
sn.1 \
soapsuds.1 \
sqlsharp.1 \
vbnc.1 \
wsdl.1 \
xsd.1
man_MANS = mcs.1 mono.1 monostyle.1 mono-config.5 sqlsharp.1 oldmono.1 ilasm.1 \
cert2spc.1 cilc.1 genxs.1 wsdl.1 disco.1 soapsuds.1 makecert.1 \
chktrust.1 setreg.1 sn.1 secutil.1 signcode.1 certmgr.1 monop.1 xsd.1 gacutil.1 \
macpack.1 mkbundle.1 dtd2xsd.1 permview.1 prj2make.1 mono-service.1 mono-shlib-cop.1 \
al.1 mozroots.1 mono-xmltool.1 sgen.1 httpcfg.1 vbnc.1 resgen.1 monolinker.1 mconfig.1
EXTRA_DIST = $(man_MANS)
-322
View File
@@ -1,322 +0,0 @@
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH csharp 1 "4 September 2008"
.SH NAME
csharp \- Interactive C# Shell
.SH SYNOPSIS
.B csharp
[options]
.SH DESCRIPTION
The
.I csharp
is an interactive C# shell that allows the user to enter and evaluate
C# statements and expressions from the command line.
.PP
This command is a shortcut to invoke the
.I gmcs
command with the
.I \-\- shell
command line option. All of the regular compiler options available
to gmcs are available in the interactive shell.
.SH OPERATION
Once you launch the csharp command, you will be greeted with the
interactive prompt:
.PP
.nf
$ csharp
Mono C# Shell, type "help;" for help
Enter statements below.
csharp>
.fi
.PP
A number of namespaces are pre-defined with C# these include System,
System.Linq, System.Collections and System.Collections.Generic.
Unlike the compiled mode, it is possible to add new using statements
as you type code, for example:
.PP
.nf
csharp> new XmlDocument ();
<interactive>(1,6): error CS0246: The type or namespace name `XmlDocument' could not be found. Are you missing a using directive or an assembly reference?
csharp> using System.Xml;
csharp> new XmlDocument ();
System.Xml.XmlDocument
.fi
.PP
Every time a command is typed, the scope of that command is one of a
class that derives from the class Mono.CSharp.InteractiveBase. This
class defines a number of static properties and methods. To display
a list of available commands access the `help' property:
.nf
csharp> help;
"Static methods:
LoadPackage (pkg); - Loads the given Package (like -pkg:FILE)
[...]
ShowVars (); - Shows defined local variables.
ShowUsing (); - Show active using decltions.
help;
"
csharp>
.fi
.PP
When expressions are entered, the C# shell will display the result of
executing the expression:
.PP
.nf
csharp> Math.Sin (Math.PI/4);
0.707106781186547
csharp> 1+1;
2
csharp> "Hello, world".IndexOf (',');
5
.fi
.PP
The C# shell uses the ToString() method on the returned object to
display the object, this sometimes can be limiting since objects that
do not override the ToString() method will get the default behavior
from System.Object which is merely to display their type name:
.PP
.nf
csharp> var a = new XmlDocument ();
csharp> a;
System.Xml.Document
csharp> csharp> a.Name;
"#document"
csharp>
.fi
.PP
A few datatypes are handled specially by the C# interactive shell like
arrays, System.Collections.Hashtable, objects that implement
System.Collections.IEnumerable and IDictionary and are rendered
specially instead of just using ToString ():
.PP
.nf
csharp> var pages = new Hashtable () {
> { "Mono", "http://www.mono-project.com/" },
> { "Linux", "http://kernel.org" } };
csharp> pages;
{{ "Mono", "http://www.mono-project.com/" }, { "Linux", "http://kernel.org" }}
.fi
.PP
It is possible to use LINQ directly in the C# interactive shell since
the System.Linq namespace has been imported at startup. The
following sample gets a list of all the files that have not been
accessed in a week from /tmp:
.PP
.nf
csharp> using System.IO;
csharp> var last_week = DateTime.Now - TimeSpan.FromDays (7);
csharp> var old_files = from f in Directory.GetFiles ("/tmp")
> let fi = new FileInfo (f)
> where fi.LastAccessTime < LastWeek select f;
csharp>
.fi
.PP
You can of course print the results in a single statement as well:
.PP
.nf
csharp> using System.IO;
csharp> var last_week = DateTime.Now - TimeSpan.FromDays (7);
csharp> from f in Directory.GetFiles ("/tmp")
> let fi = new FileInfo (f)
> where fi.LastAccessTime < last_week select f;
[...]
csharp>
.fi
.PP
LINQ and its functional foundation produce on-demand code for
IEnumerable return values. For instance, the return value from a
using `from' is an IEnumerable that is evaluated on demand. The
automatic rendering of IEnumerables on the command line will trigger
the IEnumerable pipeline to execute at that point instead of having
its execution delayed until a later point.
.PP
If you want to avoid having the IEnumerable rendered at this point,
simply assign the value to a variable.
.PP
Unlike compiled C#, the type of a variable can be changed if a new
declaration is entered, for example:
.PP
.nf
csharp> var a = 1;
csharp> a.GetType ();
System.Int32
csharp> var a = "Hello";
csharp> a.GetType ();
System.String
csharp> ShowVars ();
string a = "Hello"
.fi
.PP
In the case that an expression or a statement is not completed in a
single line, a continuation prompt is displayed, for example:
.PP
.nf
csharp> var protocols = new string [] {
> "ftp",
> "http",
> "gopher"
> };
csharp> protocols;
{ "ftp", "http", "gopher" }
.fi
.PP
Long running computations can be interrupted by using the Control-C
sequence:
.PP
.nf
csharp> var done = false;
csharp> while (!done) { }
Interrupted!
System.Threading.ThreadAbortException: Thread was being aborted
at Class1.Host (System.Object& $retval) [0x00000]
at Mono.CSharp.InteractiveShell.ExecuteBlock (Mono.CSharp.Class host, Mono.CSharp.Undo undo) [0x00000]
csharp>
.fi
.PP
.SH INTERACTIVE EDITING
The C# interactive shell contains a line-editor that provides a more
advanced command line editing functionality than the operating system
provides.
.PP
The command set is similar to many other applications (cursor keys)
and incorporates some of the Emacs commands for editing as well as a
history mechanism to
.PP
.PP
The following keyboard input is supported:
.TP
.I Home Key, Control-a
Goes to the beginning of the line.
.TP
.I End Key, Control-e
Goes to the end of the line.
.TP
.I Left Arrow Key, Control-b
Moves the cursor back one character.
.TP
.I Right Arrow Key, Control-f
Moves the cursor forward one character.
.TP
.I Up Arrow Key, Control-p
Goes back in the history, replaces the current line with the previous
line in the history.
.TP
.I Down Arrow Key, Control-n
Moves forward in the history, replaces the current line with the next
lien in the history.
.TP
.I Return
Executes the current line if the statement or expression is complete,
or waits for further input.
.TP
.I Control-C
Cancel the current line being edited. This will kill any currently
in-progress edits or partial editing and go back to a toplevel
definition.
.TP
.I Backspace Key
Deletes the character before the cursor
.TP
.I Delete Key, Control-d
Deletes the character at the current cursor position.
.TP
.I Control-k
Erases the contents of the line until the end of the line and places
the result in the cut and paste buffer.
.TP
.I Alt-D
Deletes the word starting at the cursor position and appends into the
cut and paste buffer. By pressing Alt-d repeatedly, multiple words
can be appended into the paste buffer.
.TP
.I Control-Y
Pastes the content of the kill buffer at the current cursor position.
.TP
.I Control-Q
This is the quote character. It allows the user to enter
control-characters that are otherwise taken by the command editing
facility. Press Control-Q followed by the character you want to
insert, and it will be inserted verbatim into the command line.
.TP
.I Control-D
Terminates the program. This terminates the input for the program.
.SH STATIC PROPERTIES AND METHODS
Since the methods and properties of the base class from where the
statements and expressions are executed are static, they can be
invoked directly from the shell. These are the available properties
and methods:
.TP
.I void LoadAssembly(string assembly)
Loads the given assembly. This is equivalent to passing the compiler
the -r: flag with the specified string.
.TP
.I void LoadPackage(string package)
Imports the package specified. This is equivalent to invoking the
compiler with the -pkg: flag with the specified string.
.TP
.I string Prompt { get; set }
The prompt used by the shell. It defaults to the value "csharp> ".
.I string ContinuationPrompt { get; set; }
The prompt used by the shell when further input is required to
complete the expression or statement.
.TP
.I void ShowVars()
Displays all the variables that have been defined so far and their
types. In the csharp shell declaring new variables will shadow
previous variable declarations, this is different than C# when
compiled.
.I void ShowUsing()
Displays all the using statements in effect.
.I TimeSpan Time (Action a)
Handy routine to time the time that some code takes to execute. The
parameter is an Action delegate, and the return value is a TimeSpan.
For example:
.PP
.nf
csharp> Time (() => { for (int i = 0; i < 5; i++) Console.WriteLine (i);});
0
1
2
3
4
00:00:00.0043230
csharp>
.fi
.PP
The return value is a TimeSpan, that you can store in a variable for
benchmarking purposes.
.SH STARTUP FILES
The C# shell will load all the C# script files and Mono assemblies
located in the ~/.config/csharp directory on Unix. C# script files
are files that have the extension .cs and they should only contain
statements and expressions, they can not contain full class
definitions (at least not as of Mono 2.0). Full class definitions
should be compiled into dlls and stored in that directory.
.SH AUTHORS
The Mono C# Compiler was written by Miguel de Icaza, Ravi Pratap,
Martin Baulig, Marek Safar and Raja Harinath. The development was
funded by Ximian, Novell and Marek Safar.
.SH LICENSE
The Mono Compiler Suite is released under the terms of the GNU GPL or
the MIT X11. Please read the accompanying `COPYING' file for details.
Alternative licensing for the compiler is available from Novell.
.SH SEE ALSO
gmcs(1), mcs(1), mdb(1), mono(1), pkg-config(1)
.SH BUGS
To report bugs in the compiler, you must file them on our bug tracking
system, at:
http://www.mono-project.com/Bugs
.SH MAILING LIST
The Mono Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
.SH MORE INFORMATION
The Mono C# compiler was developed by Novell, Inc
(http://www.novell.com, http) and is based on the
ECMA C# language standard available here:
http://www.ecma.ch/ecma1/STAND/ecma-334.htm
.PP
The home page for the Mono C# compiler is at
http://www.mono-project.com/CSharp_Compiler information about the
interactive mode for C# is available in http://mono-project.com/CsharpRepl
+23 -17
View File
@@ -18,13 +18,12 @@ prepending the @ symbol to the response file name.
The
.I mcs
compiler is used to compile against the 1.x profile and implements
C# 1.0 and parts of C# 2.0 and C# 3.0 specification which do not depend
on generics.
C# 1.0 and 2.0 with the exception of generics and nullable types.
.PP
The
.I gmcs
compiler is used to compile against the 2.0 profile and implements
the complete C# 3.0 specification.
the complete C# 2.0 specification including generics.
.PP
The
.I smcs
@@ -33,7 +32,8 @@ This profile is designed to be used for creating Silverlight/Moonlight
applications that will run on a web browser. The API exposed by this
profile is a small subset of the 3.5 API (even if it is commonly
referred as the 2.1 API, this API is a small subset of 2.0 with a few
extensions).
extensions), in addition this profile by default runs with
-langversion:linq which turns on the C# 3.0 language by default.
.PP
See the section on packages for more information.
.PP
@@ -108,7 +108,7 @@ SYMBOL. This can be tested in the source code by the pre-processor,
or can be used by methods that have been tagged with the Conditional
attribute.
.TP
.I \-debug, \-debug+
.I \-debug, \-debug+, \-g
Generate debugging information. To obtain stack traces with debugging
information, you need to invoke the mono runtime with the `--debug'
flag. This debugging information is stored inside the assembly as a
@@ -136,6 +136,10 @@ precedence over the attributes.
Extracts the C#/XML documentation from the source code and stores in in
the given FILE.
.TP
.I \-\-expect-error X L
The compiler will expect the code to generate an error
named `X' in line `L'. This is only used by the test suite.
.TP
.I \-\-fatal
This is used for debugging the compiler. This makes the error emission
generate an exception that can be caught by a debugger.
@@ -165,7 +169,7 @@ The possible values are:
.TP
.I "Default"
Instruct compiler to use the latest version. Equivalent is to omit the
switch (this currently defaults to the C# 3.0 language specification).
switch (this currently defaults to the C# 2.0 language specification).
.TP
.I "ISO-1"
Restrict compiler to use only first ISO standardized features.
@@ -176,6 +180,11 @@ methods will lead to error.
Restrict compiler to use only the second ISO standardized features.
This allows the use of generics, static classes, iterators and
anonymous methods for example.
.TP
.I "linq"
This enables the C# 3.0 support. Only a few features of C# 3.0 have
been implemented in the Mono C# compiler, so not everything is
available.
.PP
Notice that this flag only controls the language features available to
the programmer, it does not control the kind of assemblies produced.
@@ -330,12 +339,6 @@ shell will perform globbing, so you might want to use it like this:
$ mcs -recurse:'*.cs'
.fi
.TP
.I \-\-shell
Starts up the compiler in interactive mode, providing a C# shell for
statements and expressions. A shortcut is to use the
.I csharp
command directly.
.TP
.I \-\-stacktrace
Generates a stack trace at the time the error is reported, useful for
debugging the compiler.
@@ -355,6 +358,9 @@ Enables compilation of unsafe code.
.I \-v
Debugging. Turns on verbose yacc parsing.
.TP
.I \-v2
Turns on C# 2.0 language features.
.TP
.I \-\-version
Shows the compiler version.
.TP
@@ -363,7 +369,7 @@ Treat warnings as errors.
.TP
.I \-warn:LEVEL
Sets the warning level. 0 is the lowest warning level, and 4 is the
highest. The default is 4.
highest. The default is 2.
.TP
.I \-win32res:FILE
Specifies a Win32 resource file (.res) to be bundled into the
@@ -499,12 +505,12 @@ Martin Baulig, Marek Safar and Raja Harinath. The development was
funded by Ximian, Novell and Marek Safar.
.PP
.SH LICENSE
The Mono Compiler Suite is released under the terms of the GNU GPL or
the MIT X11. Please read the accompanying `COPYING' file for details.
Alternative licensing for the compiler is available from Novell.
The Mono Compiler Suite is released under the terms of the GNU GPL.
Please read the accompanying `COPYING' file for details. Alternative
licensing for the compiler is available from Novell.
.PP
.SH SEE ALSO
csharp(1), mdb(1), mono(1), mopen(1), mint(1), pkg-config(1),sn(1)
mdb(1), mono(1), mopen(1), mint(1), sn(1)
.PP
.SH BUGS
To report bugs in the compiler, you must file them on our bug tracking
-259
View File
@@ -1,259 +0,0 @@
.\"
.\" mdassembler manual page.
.\" (C) 2006 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdassembler" 1
.SH NAME
mdassembler \- Compile documentation for use in monodoc browser
.SH SYNOPSIS
.B mdassembler
OPTIONS*
DIRS+
.SH DESCRIPTION
\fImdassembler\fR has been obsoleted by \fBmdoc\fR(1). See the
\fBmdoc-assemble\fR(1) man page.
.PP
.I mdassembler
is a program that creates
.I .tree
and
.I .zip
files for use in the
.B monodoc
documentation browser.
.PP
The
.I .tree
and
.I .zip
files are copied into monodoc's
.I sources
directory, and reside with a
.I .source
file which is used by
.B monodoc
to specify where the documentation should be displayed.
The
.I .source
file's
.I /monodoc/source/@basefile
attribute specifies the filename prefix for the documentation files. This
must be the same prefix as used with the
.B \-\-out
parameter.
.PP
.SH OPTIONS
.TP
.I \-\-ecma
The documentation found within
.I DIRS
is in the Mono ECMA documentation format.
See the
.B Mono ECMA Documentation Format
section below.
.TP
.I \-\-ecmaspec
The documentation found within
.I DIRS
is in the ECMA Specification documentation format.
See the
.B Mono ECMA Specification Documentation Format
section below.
.TP
.I \-\-error
The documentation found within
.I DIRS
is in "error" format.
See the
.B Error Documentation Format
section below.
.TP
.I \-\-help
Show program argument information.
.TP
.I \-\-man
The documentation found within
.I DIRS
is in man page format.
See the
.B Man Page Documentation Format
section below.
.TP
.I \-o, \-\-out PREFIX
Specify the output file prefix.
.B mdassembler
creates the files
.I PREFIX.zip
and
.I PREFIX.tree
\&.
.TP
.I \-\-simple
The documentation found within
.I DIRS
is in "simple" format.
See the
.B Simple Documentation Format
section below.
.TP
.I \-\-xhtml, \-\-hb
The documentation found within
.I DIRS
is in XHTML format.
See the
.B XHTML Documentation Format
section below.
.PP
.SH "FORMATS"
The following documentation formats are supported:
.SS Mono ECMA Documentation Format
An XML documentation format with one file per type.
.PP
See the \fBmdoc\fR(5) man page for more information.
.SS Mono ECMA Specification Documentation Format
This is not the format you're looking for.
.PP
This is the format used to represent the ECMA-334 (C#) standard within
\fBmonodoc\fR. It is not used to display class library documentation;
for class library
documentation, use the
.B \-\-ecma
format.
.SS Error Documentation Format
Used to present detailed error messages, and is used in
\fBmonodoc\fR's "C# Compiler Error Reference"
tree.
.I DIRS
is not a directory, but is instead a configuration file, containing the XML:
.nf
<ErrorProviderConfig>
<FilesPath>../../mcs/errors</FilesPath>
<Match>cs????*.cs</Match>
<ErrorNumSubstringStart>2</ErrorNumSubstringStart>
<ErrorNumSubstringLength>4</ErrorNumSubstringLength>
<FriendlyFormatString>CS{0:0###}</FriendlyFormatString>
</ErrorProviderConfig>
.fi
.I /ErrorProviderConfig/FilesPath
specifies where to look for files,
.I /ErrorProviderConfig/Match
specifies the filename pattern to look for within
\fI/ErrorProviderConfig/FilesPath\fR,
.I /ErrorProviderConfig/ErrorNumSubstringStart
and
.I /ErrorProviderConfig/ErrorNumSubstringLength
control which portion of the filename is used as the error number, and
.I /ErrorProviderConfig/FriendlyFormatString
controls how the formatting/display of the node in the
.B monodoc
tree.
.PP
For each file found, it is converted to HTML with C# syntax coloring applied.
.SS Simple Documentation Format
Converts text files into HTML by translating each newline into an HTML
.I <br>
element.
.SS Man Page Documentation Format
Converts man pages into HTML for display.
.SS XHTML Documentation Format
Copies the XHTML file as-is.
.SH EXAMPLES
To install your documenation for use with monodoc:
.TP
.I Create a PREFIX.source file
with the contents:
.nf
<?xml version="1.0"?>
<monodoc>
<source provider="FORMAT" basefile="PREFIX" path="PATH"/>
</monodoc>
.fi
where FORMAT is the documentation format contained within the
.I PREFIX.tree
file, e.g.
\fIecma\fR, or \fIsimple\fR.
.I PREFIX is the basename of the
.I .tree
and
.I .zip
files that
.B mdassembler
creates.
.I PATH
is the "path" in the monodoc tree that should contain the documentation.
See the
.I @prefix@/lib/monodoc/monodoc.xml
file for a list of PATH values
(the
.I //node/@name
values).
.sp
See also: http://www.mono-project.com/Generating_Documentation
.TP
.I Create your documentation
See also the
.BR monodocer (1)
man page, e.g.
.nf
monodocer -assembly:foo.dll -path:foo/en
.fi
.TP
.I Assemble the documentation
.nf
mdassembler --ecma foo/en PREFIX
.fi
Make sure that you use the same
.I PREFIX
here as you did above.
.TP
.I Install the documentation by using the command
.nf
cp PREFIX.source PREFIX.tree PREFIX.zip \\
`pkg-config monodoc --variable=sourcesdir`
.fi
(Note the backticks used in the
.B pkg-config
command!)
This copies the
.I .source
,
.I .tree
, and
.I .zip
files into the
.B monodoc
.I sources
directory, which will allow
.B monodoc
to display the documentation.
.SH SEE ALSO
\fBmdcs2ecma\fR(1),
\fBmdnormalizer\fR(1),
\fBmdoc\fR(1),
\fBmdoc-assemble\fR(1),
\fBmdvalidator\fR(1),
\fBmonodocer\fR(1),
\fBmonodocs2html\fR(1)
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
See also: http://www.mono-project.com
and
http://www.mono-project.com/Assembler
-41
View File
@@ -1,41 +0,0 @@
.\"
.\" mdcs2ecma manual page.
.\" (C) 2006 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdcs2ecma" 1
.SH NAME
mdcs2ecma \- Convert CSC /doc Documentation Into ECMA documentation.
.SH SYNOPSIS
.B mdcs2ecma
.I SLASHDOC-FILE
.I ASSEMBLY
.I OUTPUT
.I LIBRARY-TYPE
.SH DESCRIPTION
.I mdcs2ecma
is a program that converts
.I CSC /doc
generated XML documentation into single-file ECMA documentation.
.PP
Note that single-file ECMA documentation is the format used by the ECMA
standard,
.I NOT
the one-file-per-type ECMA format typically used by Mono.
.PP
This program is unmaintained. Use
.B monodocer -importslashdoc:SLASHDOC-FILE -assembly:ASSEMBLY -path:OUTPUT
instead.
.PP
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
.SH SEE ALSO
.BR monodocer(1)
-37
View File
@@ -1,37 +0,0 @@
.\"
.\" mdnormalizer manual page.
.\" (C) 2006 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdnormalizer" 1
.SH NAME
mdnormalizer \- Normalize XML Documents
.SH SYNOPSIS
.B mdnormalizer
[FILES]+
.SH DESCRIPTION
.I mdnormalizer
is a program that normalizes the XML within the input documents.
.PP
.I Normalization
consists of ensuring that the XML is well-formed. It is equivalent to the
following C# fragment:
.nf
XmlDocument doc = new XmlDocument ();
doc.Load (filename);
StreamWriter file = new StreamWriter (filename, false,
new System.Text.UTF8Encoding (false));
doc.Save (writer);
writer.Close ();
.fi
.PP
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
-190
View File
@@ -1,190 +0,0 @@
.\"
.\" mdoc assemble manual page.
.\" (C) 2008 Novell, Inc.
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc-assemble" 1
.SH NAME
mdoc assemble \- Compile documentation for use in \fBmonodoc\fR(1)
.SH SYNOPSIS
.B mdoc assemble
[OPTIONS]+
PATHS+
.SH DESCRIPTION
\fBmdoc assemble\fR creates \fI.tree\fR and \fI.zip\fR files from \fIPATHS\fR
for use in the \fBmonodoc\fR(1) documentation browser.
.PP
The input files must have a supported \fIformat\fR, specified with the
\fI--format\fR option.
.PP
The \fI.tree\fR and \fI.zip\fR files are copied into \fBmonodoc\fR's
\fIsources\fR directory, alongside a \fI.source\fR file which is used by
\fBmonodoc\fR(1) to specify where the documentation should be displayed.
.PP
The \fI.source\fR file has the following format:
.nf
<?xml version="1.0"?>
<monodoc>
<source provider="PROVIDER" basefile="BASEFILE" path="PATH" />
</monodoc>
.fi
The \fI/monodoc/source/@provider\fR attribute specifies which format provider
should be used when reading the \fI.tree\fR and \fI.zip\fR files; this
\fImust\fR correspond to one of the \fI--format\fR values.
.PP
The \fI/monodoc/source/@basefile\fR attribute specifies the filename prefix
for the documentation files. This must be the same prefix as used with the
\fI\-\-out\fR parameter. There should be \fIno\fR filename extension on this
value.
.PP
The \fI/monodoc/source/@path\fR attribute specifies the parent node in
\fBmonodoc\fR(1)'s tree view where the documentation will be inserted.
See the \fI$MONO_INSTALL_PREFIX/lib/monodoc/monodoc.xml\fR
file for a list of \fIPATH\fR values (the \fI//node/@name\fR values).
.PP
Once the \fIBASEFILE.source\fR has been written, the documentation can be
installed so that \fBmonodoc\fR(1) will display the documentation with the
command:
.nf
cp BASEFILE.source BASEFILE.tree BASEFILE.zip \\
`pkg-config monodoc --variable=sourcesdir`
.fi
.SH OPTIONS
.TP
\fB\-f\fR, \fB\-\-format\fR=\fIFORMAT\fR
Specifies the documentation format used within \fIPATHS\fR. Valid
\fIFORMAT\fR values include:
\fIecma\fR,
\fIecmaspec\fR,
\fIerror\fR,
\fIhb\fR,
\fIman\fR,
\fIsimple\fR, and
\fIxhtml\fR.
.Sp
See the \fIFORMATS\fR section below for more information about these formats.
.Sp
The default format (if none is specifed) is \fIecma\fR.
.Sp
The \fI\-\-format\fR option may be interleaved with \fIPATHS\fR to
change the format used for the remaining parameters (until the next
\fI\-\-format\fR option is seen), e.g.:
.nf
mdoc assemble -o PREFIX A B --format=man C D --format=xhtml E
.fi
will assemble directories \fIA\fR and \fIB\fR with the \fIecma\fR format,
files \fIC\fR and \fID\fR with the \fIman\fR formt, and directory
\fIE\fR with the \fIxhtml\fR format.
.TP
\fB\-o\fR, \fB\-\-out\fR=\fIPREFIX\fR
Specify the output file prefix. \fBmdoc assemble\fR creates the files
\fIPREFIX.zip\fR and \fIPREFIX.tree\fR.
.TP
\fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
Display a help message and exit.
.SH "FORMATS"
The following documentation formats are supported:
.SS ecma
The \fIMono ECMA Documentation Format\fR, an XML documentation format with one
file per type.
.PP
See the \fBmdoc\fR(5) man page for more information.
.SS ecmaspec
The \fIMono ECMA Specification Documentation Format\fR.
This is not the format you're looking for; it is the format used to represent
the ECMA-334 (C#) standard within \fBmonodoc\fR(1). It is not used to display
class library documentation; for class library documentation, use the
.B ecma
format.
.SS error
The \fIError Documentation Format\fR is used to present detailed error
messages, and is used in \fBmonodoc\fR(1)'s "C# Compiler Error Reference"
tree.
.PP
In this format, \fIPATHS\fR is a configuration file, containing the XML:
.nf
<ErrorProviderConfig>
<FilesPath>../../mcs/errors</FilesPath>
<Match>cs????*.cs</Match>
<ErrorNumSubstringStart>2</ErrorNumSubstringStart>
<ErrorNumSubstringLength>4</ErrorNumSubstringLength>
<FriendlyFormatString>CS{0:0###}</FriendlyFormatString>
</ErrorProviderConfig>
.fi
The elements mean:
.TP
.I /ErrorProviderConfig/FilesPath
Specifies where to look for files.
.TP
.I /ErrorProviderConfig/Match
Specifies the filename pattern to look for within the
\fI/ErrorProviderConfig/FilesPath\fR directory.
.TP
.I /ErrorProviderConfig/ErrorNumSubstringStart
Specifies where within the filename the error number starts.
.TP
.I /ErrorProviderConfig/ErrorNumSubstringLength
Specifies how many characters after
\fI/ErrorProviderConfig/ErrorNumSubstringStart\fR to use for the error number.
.TP
.I /ErrorProviderConfig/FriendlyFormatString
Specifies the formatting/display of the node in the \fBmonodoc\fR(1) tree.
.PP
For each file found, it is converted to HTML with C# syntax coloring applied.
.SS simple
The \fISimple Documentation Format\fR file format recursively adds all files
and directories underneath \fIPATHS\fR. When displayed, HTML files are
displayed as-is. Text files are converted into HTML by translating each
newline into an HTML \fI<br>\fR element. No other file type is supported.
.SS man
The \fIMan Page Documentation Format\fR displays groff man pages. (This is
\fInot\fR a full groff parser, and only handles the man page constructs used
within the mono man pages.)
.PP
\fIPATHS\fR is a set of XML files containing:
.nf
<?xml version="1.0"?>
<manpages>
<manpage name="NAME" page="FILE" />
</manpages>
.fi
There may be multiple \fI//manpage\fR elements within the root \fI/manpage\fR
element.
.PP
The \fI/manpages/manpage/@name\fR attribute contains the display name for the
tree view node, which is also the URL of the man page when using
\fBmonodoc\fR(1)'s \fILookup URL\fR command (before prefixing with a
\fIman:\fR prefix). Thus, if \fI/manpages/manpage/@name\fR contains
\fImono(1)\fR, then \fIman:mono(1)\fR can be used in the \fILookup URL\fR
command to view the \fImono(1)\fR man page.
.PP
The \fI/manpages/manpage/@page\fR attribute is the filename that contains the
man page. If this file does not exist, then \fI/manpages/manpage/@name\fR
will not be displayed within the tree view.
.SS xhtml
The XHTML provider interprets \fIPATHS\fR as a Windows Help file XHTML TOC
file and looks for referenced documents to create the help source.
.SH SEE ALSO
\fBmdoc\fR(1),
\fBmdoc\fR(5),
\fBmonodoc\fR(1)
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
See also: http://www.mono-project.com/mdoc
-122
View File
@@ -1,122 +0,0 @@
.\"
.\" mdoc-export-html manual page.
.\" (C) 2008 Novell, Inc.
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc-export-html" 1
.SH NAME
mdoc export-html \- Convert \fBmdoc\fR(5) XML to HTML.
.SH SYNOPSIS
\fBmdoc export-html\fR [OPTION]* DIRECTORIES
.SH DESCRIPTION
\fBmdoc export-html\fR creates HTML files from the \fBmdoc\fR(5)-formatted
documentation XML files within \fIDIRECTORIES\fR.
.SH OPTIONS
.TP
\fB\-\-ext\fR=\fIEXTENSION\fR
The file extension to use for created files.
.Sp
This defaults to \fIhtml\fR.
.TP
.B \-\-default\-template
Writes the default XSLT used to \fIstdout\fR.
.TP
\fB\-\-template\fR=\fIFILE\fR
An XSLT file to use to generate the created files.
.Sp
If not specified, uses the template produced by \fI\-\-dump\-template\fR.
.Sp
See the \fITEMPLATE FORMAT\fR section below for more information.
.TP
\fB\-o\fR, \fB\-\-out\fR=\fIDIRECTORY\fR
Write the created files within directory \fIDIRECTORY\fR.
.TP
\fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
Display a help message and exit.
.SH TEMPLATE FORMAT
The template file is an XSLT which needs to process the following input XML
document:
.nf
<Page>
<CollectionTitle>Collection Title</CollectionTitle>
<PageTitle>Page Title</PageTitle>
<Summary>Page Summary</Summary>
<Signature>Type Declaration</Signature>
<Remarks>Type Remarks</Remarks>
<Members>Type Members</Members>
<Copyright>Documentation Copyright</Copyright>
</Page>
.fi
The generated HTML also makes use of several CSS classes. You can either use
the \fIcreate-default-style\fR named template found within the
\fI\-\-default\-template\fR output to generate these classes, or explicitly
define the following CSS classes:
.RS
.ne 8
.TP
.I .CollectionTitle
.TP
.I .PageTitle
.TP
.I .Summary
.TP
.I .Signature
.TP
.I .Remarks
.TP
.I .Members
.TP
.I .Copyright
.TP
.I .Section
.TP
.I .SectionBox
.TP
.I .NamespaceName
.TP
.I .NamespaceSummary
.TP
.I .MemberName
.TP
.I .MemberSignature
.TP
.I .MemberBox
.TP
.I .Subsection
.TP
.I .SubsectionBox
.TP
.I .SignatureTable
.TP
.I .EnumerationsTable
.TP
.I .CodeExampleTable
.TP
.I .MembersListing
.TP
.I .TypesListing
.TP
.I .InnerSignatureTable
.TP
.I .TypePermissionsTable
.ne
.RE
.PP
.SH HTML LINKS
All members within the HTML file have an \fIid\fR
attribute to permit linking to a specific member. The value of the
\fIid\fR attribute is the String ID of the specified member.
.PP
See the \fICREF FORMAT\fR section of \fBmdoc\fR(5) for more information.
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com/mdoc for details
-37
View File
@@ -1,37 +0,0 @@
.\"
.\" mdoc-export-msxdoc manual page.
.\" (C) 2008 Novell, Inc.
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc-export-msxdoc" 1
.SH NAME
mdoc export-msxdoc \- Convert \fBmdoc\fR(5) XML to Microsoft XML Documentation
.SH SYNOPSIS
\fBmdoc export-msxdoc\fR [OPTION]* DIRECTORIES
.SH DESCRIPTION
\fBmdoc export-msxdoc\fR creates \fIMicrosoft XML Documentation\fR
(as produced by \fIcsc /doc\fR) from the
\fBmdoc\fR(5)-formatted documentation XML files within \fIDIRECTORIES\fR.
.SH OPTIONS
.TP
\fB\-o\fR, \fB\-\-out\fR=\fIFILE\fR
The XML file to generate.
.Sp
If not specified, a set of files matching the
\fI//AssemblyInfo/AssemblyName\fR values within the documentation will be
used.
.Sp
Use \fB-\fR to write to standard output.
.TP
\fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
Display a help message and exit.
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com/mdoc for details
-75
View File
@@ -1,75 +0,0 @@
.\"
.\" mdoc-update manual page.
.\" (C) 2008 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc-update" 1
.SH NAME
mdoc update \- \fBmdoc\fR(5) documentation format support
.SH SYNOPSIS
\fBmdoc update\fR [OPTIONS]* ASSEMBLIES
.SH DESCRIPTION
\fBmdoc update\fR is responsible for the following:
.TP
.B *
Creating documentation stubs based on \fIASSEMBLIES\fR. The stub-creation
process will create new \fBmdoc\fR(5) XML files for each type within
\fIASSEMBLIES\fR, and provide documentation stubs for each member of those
types.
.TP
.B *
Update documentation stubs based on \fIASSEMBLIES\fR. Existing \fBmdoc\fR(5)
documentation can be updated to reflect changes within \fIASSEMBLIES\fR, such
as added types and members, while preserving existing documentation.
.Sp
In some limited circumstances, renames will be tracked, minimizing the
documentation burden when e.g. a parameter is renamed.
circumstances,
creates stubs and updates documentation in the \fBmdoc\fR(5)
documentation format from \fIASSEMBLIES\fR.
.PP
\fBmdoc update\fR does not rely on documentation found within source code.
.PP
See \fBmdoc\fR(1) and \fBmdoc\fR(5) for more information.
.SH OPTIONS
.TP
.B \-\-delete
Allow \fBmdoc update\fR to delete members from documentation files.
The only members deleted are members which are no longer present within
\fIASSEMBLIES\fR and are not present in any other assembly versions.
.Sp
If a type is no longer present, the documentation file is \fInot\fR
deleted, but is instead \fIrenamed\fR to have a \fB.remove \fR extension.
.Sp
Version detection is done with the \fI//AssemblyVersion\fR elements; if there
are no \fI//AssemblyVersion\fR elements for a given \fI<Type>\fR or
\fI<Member/>\fR, then the \fI<Type>\fR will be renamed and/or the
\fI<Member/>\fR will be removed.
.TP
\fB\-i\fR, \fB\-\-import\fR=\fIFILE\fR
Import documentation found within \fIFILE\fR.
.Sp
\fIFILE\fR may contain either \fIcsc /doc\fR XML or \fIECMA-335\fR XML.
.TP
\fB\-o\fR, \fB\-\-out\fB=\fIDIRECTORY\fR
Place the generated stubs into \fIDIRECTORY\fR.
.Sp
When updating documentation, \fIDIRECTORY\fR is also the source directory.
.B \-h, \-?, \-\-help
Display a help message and exit.
.SH SEE ALSO
mdoc(1),
mdoc(5),
mdoc-assemble(1),
mdoc-export-html(1),
mdoc-validate(1),
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
-54
View File
@@ -1,54 +0,0 @@
.\"
.\" mdoc validate manual page.
.\" (C) 2008 Novell, Inc.
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc-validate" 1
.SH NAME
mdoc validate \- Validate XML documents against a schema
.SH SYNOPSIS
.B mdoc validate
[OPTIONS]*
PATHS+
.SH DESCRIPTION
\fBmdoc validate\fR validates the specified \fIPATHS\fR against a specified
format schema.
.SH OPTIONS
.TP
\fB\-\-format\fR=\fIFORMAT\fR
The documentation format to validate \fIPATHS\fR against. Supported formats
include: \fIecma\fR.
.Sp
See the \fIFORMATS\fR section below for more information about these formats.
.Sp
The default format (if none is specified) is \fIecma\fR.
.TP
\fB\-h\fR, \fB\-?\fR, \fB\-\-help\fR
Display a help message and exit.
.SH FORMATS
The following documentation formats are supported:
.SS ecma
The \fIMono ECMA Documentation Format\fR validates all output generated by
\fBmdoc-update\fR(1) against an XML schema, including the \fIindex.xml\fR,
\fIns-*.xml\fR, and \fINamespaceName/TypeName.xml\fR files.
.PP
See \fBmdoc\fR(5) for details about this file format.
.SH EXAMPLES
To validate the \fBmdoc-update\fR(1) output stored within a directory (and all
documentation within that directory, recursively), use:
.nf
mdoc validate /path/to/ecma/docs
.fi
.PP
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com/mdoc for details
-198
View File
@@ -1,198 +0,0 @@
.\"
.\" mdoc manual page.
.\" (C) 2008 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc" 1
.SH NAME
mdoc \- Mono documentation management tool
.SH SYNOPSIS
.B mdoc
.I command
[\fIoptions\fR] [\fIargs\fR]
.SH OVERVIEW
\fImdoc\fR is an assembly-based documentation management system.
.PP
\fImdoc\fR permits creating and updating documentation \fIstubs\fR based on
the contents of an assembly. It does not rely on documentation found within
the source code.
.PP
The advantages are:
.TP
.B *
.B Code readability.
Good documentation is frequently (a) verbose, and (b)
filled with examples. (For comparison, compare Microsoft .NET Framework
documentation, which is often a page or more of docs for each member, to
JavaDoc documentation, which can often be a sentence for each member.)
.Sp
Inserting good documentation into the source code can frequently bloat the
source file, as the documentation can be longer than the actual method that is
being documented.
.TP
.B *
.B Localization.
In-source documentation formats (such as \fIcsc /doc\fR)
have no support for multiple human languages. If you need to support more
than one human language for documentation purposes, \fImdoc\fR
is useful as it permits each language's output to reside in its own directory,
and \fImdoc\fR can add types/members for each separate documentation directory.
.TP
.B *
.B Administration.
It's not unusual to have separate documentation and development teams. It's
also possible that the documentation team will have minimal experience with
the programming language being used. In such circumstances, inline
documentation is not desirable as the documentation team could inadvertantly
insert an error into the source code while updating the documentation.
Alternatively, you may not want the documentation team to have access to the
source code for security reasons. \fImdoc\fR allows the documentation to be
kept \fIcompletely\fR separate and distinct from the source code used to
create the assembly.
.PP
Documentation can be generated using the \fBmdoc update\fR command:
.nf
mdoc update -o docs/en ProjectName.dll
.fi
Once the documentation stubs have been generated (and hopefully later filled
in with actual documentation), there are three ways to view the documentation:
.TP
.B *
To generate a simple directory of HTML pages (one HTML file per type), use
\fBmdoc export-html\fR:
.nf
mdoc export-html -o /srv/www/htdocs/ProjectName docs/en
.fi
.TP
.B *
To use an ASP.NET webapp to display the sources, see:
\fIhttp://anonsvn.mono-project.com/source/trunk/monodoc/engine/web/\fR.
.Sp
From a \fImonodoc\fR source checkout, you can do this:
.nf
cd engine
make web
.fi
This will use \fBxsp\fR(1) to serve the ASP.NET webapp;
Visit \fIhttp://localhost:8080/\fR to view the documentation.
.TP
.B *
To use the \fBmonodoc\fR(1) documentation browser, you must first
\fIassemble\fR the documentation:
.nf
mdoc assemble -o ProjectName docs/en
.fi
The above command creates the files \fIProjectName.tree\fR and
\fIProjectName.zip\fR. An additional \fIProjectName.sources\fR file
must be provided which describes where in the help system the documentation
should be hooked up; it is a very simple XML file, like this:
.nf
<?xml version="1.0"?>
<monodoc>
<source provider="ecma" basefile="ProjectName"
path="various" />
</monodoc>
.fi
The above configuration file describes that the documentation is in
ECMA format, that the base file name is \fIProjectName\fR and that it
should be hooked up in the \fI"various"\fR part of the documentation tree.
If you want to look at the various nodes defined in the
documentation, you can look at the \fImonodoc.xml\fR file which is typically
installed in \fI/usr/lib/monodoc/monodoc.xml\fR.
.Sp
Once you have all of the required files (.zip, .tree and .sources) you can
install them into the system with the following command:
.nf
cp ProjectName.tree ProjectName.zip ProjectName.source \\
`pkg-config monodoc --variable sourcesdir`
.fi
The above will copy the files into the directory that Monodoc has
registered; you might need root permissions to do this. The actual
directory is returned by the \fIpkg-config\fR invocation.
.SH MDOC COMMANDS
.PP
\fBmdoc assemble\fR
.RS 4
Compiles documentation for use within the \fBmonodoc\fR(1) browser.
.PP
See the \fBmdoc-assemble\fR(1) man page for details.
.RE
.PP
\fBmdoc export-html\fR
.RS 4
Exports documentation into a directory structure of HTML files.
.PP
See the \fBmdoc-export-html\fR(1) man page for details.
.RE
.PP
\fBmdoc export-msxdoc\fR
.RS 4
Exports documentation into the single-file
\fIMicrosoft XML Documentation\fR format.
.PP
See the \fBmdoc-export-msxdoc\fR(1) man page for details.
.RE
.PP
\fBmdoc help\fR
.RS 4
View internal help for a given command.
.nf
mdoc help assemble
.fi
is equivalent to:
.nf
mdoc assemble --help
.fi
Multiple sub-commands may be listed at once:
.nf
mdoc help assemble export-html update validate
.fi
.RE
.PP
\fBmdoc update\fR
.RS 4
Updates documentation, adding and removing members based upon a reference
assembly.
.PP
See the \fBmdoc-update\fR(1) man page for details.
.RE
.PP
\fBmdoc validate\fR
.RS 4
Validates the documentation against the Mono documentation schema.
.PP
See the \fBmdoc-validate\fR(1) man page for details.
.RE
.SH SEE ALSO
mdoc(5),
mdoc-assemble(1),
mdoc-export-html(1),
mdoc-update(1),
mdoc-validate(1)
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com/mdoc for details
-794
View File
@@ -1,794 +0,0 @@
.\"
.\" mdoc(5) manual page.
.\" (C) 2008 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdoc" 5
.SH NAME
mdoc \- Mono Documentation XML Format
.SH DESCRIPTION
The assorted Mono documentation programs generate or manipulate XML files
following the mono documentation schema:
.TP
.I mdoc update
Creates or updates mono documentation XML for a set of assemblies.
.TP
.I mdoc validate
Validates the mono documentation XML against the mono documentation XML
schema.
.TP
.I mdoc assemble
Converts the mono documentation XML within a directory structure into a set
of files for use with \fBmonodoc\fR(1).
.TP
.I mdoc export-html
Converts the mono documentation XML within a directory structure into a set
of HTML files that can be viewed with a web browser.
.PP
All of these tools (and more) use the common XML schema described in this man
page.
.SH FILE/DIRECTORY STRUCTURE
There are three sets of Mono documentation XML files:
.TP
.B *
.B index.xml:
contains a list of all assemblies within the containing directory, and all
types and namespaces within those assemblies.
.TP
.B *
.B ns\-*.xml:
There is one ns-*.xml file for each namespace within the assembly; these
files are siblings to
.I index.xml
\&.
.Sp
Examples of
.I ns\-*.xml
files include: \fIns-System.xml\fR, \fIns-System.Collections.xml\fR, and
\fIns-.xml\fR (for the root namespace, though it is recommended to NOT place
types into the root namespace, as \fBmonodoc\fR(1) doesn't display them).
.Sp
The
.I ns\-*.xml
files contain per-namespace documentation.
.TP
.B *
.B NamespaceName/TypeName.xml:
These files are within a dotted
.I NamespaceName
directory, and
.I TypeName
is the name of the type.
.Sp
Examples include:
.I RootType.xml
(if the type has no namespace),
\fISystem/String.xml\fR,
\fISystem.Collections/IEnumerable.xml\fR, and
\fISystem.Collections.Generic/List`1+Enumerator.xml\fR
(the
.I `1
is the number of generic type parameters the type accepts, and everything
after the
.I +
is a nested type).
.PP
Thus, typical directory contents would resemble:
.nf
index.xml
ns-System.xml
ns-System.Collections.Generic.xml
System/String.xml
System.Collections.Generic/List`1.xml
.fi
.SH DOCUMENTATION FORMAT
.SS "\fBindex.xml File Format\fR"
.PP
The
.I index.xml
file contains a list of the assemblies nested under the directory containing
.I index.xml
and all namespaces and types within those assemblies. It looks something like
this:
.nf
<Overview>
<Assemblies>
<Assembly Name="mscorlib" Version="2.0.0.0" />
<!-- other <Assembly/> elements... -->
</Assemblies>
<Remarks>To be added.</Remarks>
<Copyright>To be added.</Copyright>
<Types>
<Namespace Name="System">
<Type Name="String" />
<!-- Other <Type/> elements -->
</Namespace>
<Namespace Name="System.Collections.Generic">
<Type Name="List`1" DisplayName="List&lt;T&gt;" />
<!-- Other <Type/> elements -->
</Namespace>
<!-- other <Namespace/> elements -->
</Types>
<Title>DocTest</Title>
</Overview>
.fi
Most of this is maintained automatically, in particular the
.I /Overview/Assemblies
and
.I /Overview/Types
elements.
.PP
The
.I //Namespace/@Name
attribute corresponds to a directory which contains files named
\fI//Type/@Name\fR.xml, while the \fI//Type/@DisplayName\fR attribute contains
a C# type name (if \fI//Type/@DisplayName\fR isn't found, then
\fI//Type/@Name\fR is used as the display name). There should also be a
\fIns-[//Namespace/@Name].xml\fR file.
.PP
There are three elements of interest to authors:
\fI/Overview/Remarks\fR, \fI/Overview/Copyright\fR, and
\fI/Overview/Title\fR, which contain assembly-level documentation.
These elements can contain any of the following XML elements (documented in
the \fBDocumentation XML Elements\fR section):
\fIblock\fR,
\fIcode\fR,
\fIexample\fR,
\fIlist\fR,
\fIpara\fR,
\fIparamref\fR,
\fItypeparamref\fR,
\fIsee\fR, and
\fIul\fR.
.SS "\fBns-*.xml File Format\fR"
The \fIns-*.xml\fR files contain namespace documentation:
.nf
<Namespace Name="System">
<Docs>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Namespace>
.fi
The \fI/Namespace/Docs/summary\fR and \fI/Namespace/Docs/remarks\fR elements
should contain namespace documentation.
.PP
The \fIremarks\fR and \fIsummary\fR elements are documented in the
\fBDocumentation XML Elements\fR section.
.SS "\fBNamespaceName/TypeName.xml File Format\fR"
The
.I mono documentation format
is similar to the Ecma documentation format, as described
in ECMA-335 3rd Edition, Partition IV, Chapter 7.
The principal difference from the ECMA format is that each type gets its own
file, within a directory identical to the namespace of the type. There is a
lot of information that is maintained automatically by \fBmdoc\fR(1);
Most of the information within the documentation should
.I not
be edited. This includes the type name (\fI/Type/@FullName\fR), implemented
interfaces (\fI/Type/Interfaces\fR), member information
(\fI/Type/Members/Member/@MemberName\fR,
\fI/Type/Members/Member/MemberSignature\fR,
\fI/Type/Members/Member/MemberType\fR,
\fI/Type/Members/Member/Parameters\fR, etc.).
.nf
<Type Name="DocAttribute" FullName="Mono.DocTest.DocAttribute">
<TypeSignature Language="C#" Value="public class DocAttribute : Attribute" />
<AssemblyInfo>
<AssemblyName>DocTest</AssemblyName>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Attribute</BaseTypeName>
</Base>
<Interfaces />
<Attributes>
<Attribute>
<AttributeName>System.AttributeUsage(System.AttributeTargets.All)</AttributeName>
</Attribute>
</Attributes>
<Docs>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public DocAttribute (string docs);" />
<MemberType>Constructor</MemberType>
<AssemblyInfo>
<AssemblyVersion>0.0.0.0</AssemblyVersion>
</AssemblyInfo>
<Parameters>
<Parameter Name="docs" Type="System.String" />
</Parameters>
<Docs>
<param name="docs">To be added.</param>
<summary>To be added.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
</Type>
.fi
The only elements that normally need to be edited are children of the
\fI//Docs\fR elements, which usually contain the text
.I To be added.
The \fI/Type/Docs\fR element contains type-level documentation, while the
\fI/Type/Members/Member/Docs\fR element contains per-member documentation.
.PP
The \fI//Docs\fR elements can contain the following elements:
\fIaltcompliant\fR,
\fIaltmember\fR,
\fIexample\fR,
\fIexception\fR,
\fIparam\fR,
\fIpermission\fR,
\fIremarks\fR,
\fIreturns\fR,
\fIsince\fR,
\fIsummary\fR,
\fIthreadsafe\fR,
\fItypeparam\fR, and
\fIvalue\fR.
.PP
Nested types are not members; they are types, and are documented in their own
file. Consequently, the \fINamespaceName/TypeName.xml\fR files are not
recursive; you do not store a \fI<Type/>\fR element within a \fI<Type/>\fR
element.
.SS "\fBDocumentation XML Elements\fR"
The contents of the \fIDocs\fR element is \fIidentical\fR
in semantics and structure to the inline C# documentation format, consisting
of these elements (listed in ECMA-334 3rd Edition, Annex E, Section 2). The
following are used within the element descriptions:
.TP
.I CREF
Refers to a class (or member) reference, and is a string in the format
described below in the \fBCREF FORMAT\fR section.
.TP
.I TEXT
Non-XML text, and XML should not be nested.
.I
.TP
.I XML
Only XML elements should be nested (which indirectly may contain text), but
non-whitespace text should not be an immediate child node.
.TP
.I XML_TEXT
Free-form text and XML, so that other XML elements may be nested.
.PP
The following elements are used in documentation:
.TP
.I <altmember cref="CREF" />
.I <altmember/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Allows an entry to be generated for the \fISee Also\fR section. Use
\fI<see/>\fR to specify a link from within text.
.nf
<altmember cref="P:System.Exception.Message" />
.fi
.TP
.I <block subset="SUBSET" type="TYPE">XML_TEXT</block>
Create a block of text, similar in concept to a paragraph, but is used to
create divisions within the text. To some extent, a <block/> is equivalent to
the HTML <h2/> tag.
.Sp
.I SUBSET
should always be the value \fI"none"\fR.
.Sp
.I TYPE
specifies the heading and formatting to use. Recognized types are:
.Sp
.I behaviors
Creates a section with the heading \fIOperation\fR.
.Sp
.I note
Creates a section with the heading \fINote:\fR.
.Sp
.I overrides
Creates a section with the heading \fINote to Inheritors\fR.
.Sp
.I usage
Creates a section with the heading \fIUsage\fR.
.Sp
The \fIblock\fR element can contain the following elements:
\fIblock\fR,
\fIc\fR,
\fIcode\fR,
\fIlist\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR,
\fIsubscript\fR,
\fIsup\fR, and
\fItypeparamref\fR.
.TP
.I <c>XML_TEXT</c>
Set text in a code-like font (similar to the HTML <tt/> element).
.Sp
The \fIc\fR element can contain the following elements:
\fIcode\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <code lang="LANGUAGE">TEXT</code>
Display multiple lines of text in a code-like font (similar to the HTML <pre/>
element).
.I LANGUAGE
is the language this code block is for. For example, if \fILANGUAGE\fR is
\fBC#\fR, then \fITEXT\fR will get syntax highlighting for the C# language
within the Mono Documentation Browser.
.TP
.I <example>XML_TEXT</example>
Indicates an example that should be displayed specially. For example:
.nf
<example>
<para>An introductory paragraph.</para>
<code lang="C#">
class Example {
public static void Main ()
{
System.Console.WriteLine ("Hello, World!");
}
}
</code>
</example>
.fi
The \fIexample\fR element can contain the following elements:
\fIc\fR,
\fIcode\fR,
\fIlist\fR,
\fIpara\fR, and
\fIsee\fR.
.TP
.I <exception cref="CREF">XML_TEXT</exception>
Identifies an exception that can be thrown by the documented member.
.Sp
.I <exception/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
.I CREF
is the exception type that is thrown, while
.I XML_TEXT
contains the circumstances that would cause
.I CREF
to be thrown.
.nf
<exception cref="T:System.ArgumentNullException">
<paramref name="foo" /> was <see langword="null" />.
</exception>
.fi
The \fIexception\fR element can contain the following elements:
\fIblock\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <list>XML</list>
Create a list or table of items.
.I <list/>
makes use of nested \fI<item>XML</item>\fR, \fI<listheader>XML</listheader>\fR,
\fI<term>XML_TEXT</term>\fR, and \fI<description>XML_TEXT</description>\fR
elements.
.Sp
\fILists\fR have the syntax:
.nf
<list type="bullet"> <!-- or type="number" -->
<item><term>Bullet 1</term></item>
<item><term>Bullet 2</term></item>
<item><term>Bullet 3</term></item>
</list>
.fi
.Sp
.I Tables
have the syntax:
.nf
<list type="table">
<listheader> <!-- listheader bolds this row -->
<term>Column 1</term>
<description>Column 2</description>
<description>Column 3</description>
</listheader>
<item>
<term>Item 1-A</term>
<description>Item 1-B</description>
<description>Item 1-C</description>
</item>
<item>
<term>Item 2-A</term>
<description>Item 2-B</description>
<description>Item 2-C</description>
</item>
</list>
.fi
The \fIitem\fR and \fIdescription\fR elements can each contain text and
the following elements:
\fIblock\fR,
\fIc\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR,
\fIsup\fR, and
\fItypeparamref\fR.
.TP
.I <para>XML_TEXT</para>
Insert a paragraph of \fIXML_TEXT\fR.
For example,
.nf
<para>
This is a paragraph of text.
</para>
.fi
The \fIpara\fR element can contain the following elements:
\fIblock\fR,
\fIc\fR,
\fIexample\fR,
\fIlink\fR,
\fIlist\fR,
\fIonequarter\fR,
\fIparamref\fR,
\fIsee\fR,
\fIsub\fR,
\fIsup\fR,
\fItypeparamref\fR, and
\fIul\fR.
.TP
.I <param name="NAME">XML_TEXT</param>
.I <param/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Describes the parameter \fINAME\fR of the current constructor, method, or
property:
.nf
<param name="count">
A <see cref="T:System.Int32" /> containing the number
of widgets to process.
</param>
.fi
The \fIparam\fR element can contain the following elements:
\fIblock\fR,
\fIc\fR,
\fIexample\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <paramref name="NAME" />
Indicates that \fINAME\fR is a parameter.
.Sp
This usually renders \fINAME\fR as italic text, so it is frequently
(ab)used as an equivalent to the HTML <i/> element. See the
\fI<exception/>\fR documentation (above) for an example.
.Sp
.TP
.I <permission cref="CREF">XML_TEXT</permission>
Documents the security accessibility requirements of the current member.
.Sp
.I <permission/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
\fICREF\fR is a type reference to the security permission required, while
\fIXML_TEXT\fR is a description of why the permission is required.
.nf
<permission cref="T:System.Security.Permissions.FileIOPermission">
Requires permission for reading and writing files. See
<see cref="F:System.Security.Permissions.FileIOPermissionAccess.Read" />,
<see cref="F:System.Security.Permissions.FileIOPermissionAccess.Write" />.
</permission>
.fi
The \fIpermission\fR element can contain the following elements:
\fIblock\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <remarks>XML_TEXT</remarks>
Contains detailed information about a member.
.Sp
.I <remarks/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.nf
<remarks>
Insert detailed information here.
</remarks>
.fi
The \fIremarks\fR element can contain the following elements:
\fIblock\fR,
\fIc\fR,
\fIcode\fR,
\fIexample\fR,
\fIlist\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <returns>XML_TEXT</returns>
.Sp
.I <returns/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Describes the return value of a method:
.nf
<returns>
A <see cref="T:System.Boolean" /> specifying whether
or not the process can access
<see cref="P:Mono.Unix.UnixFileSystemInfo.FullName" />.
</returns>
.fi
The \fIreturns\fR element can contain the following elements:
\fIlist\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
\fI<see cref="CREF" />\fR, \fI<see langword="LANGWORD" />\fR
Creates a link to the specified member within the current text:
.nf
<see cref="M:Some.Namespace.With.Type.Method" />
.fi
or specifies that \fILANGWORD\fR is a language keyword:
.nf
<see langword="null" />
.fi
.TP
.I <seealso cref="CREF" />
Do not use \fIseealso\fR, use \fIaltmember\fR.
.TP
.I <since version="VERSION" />
.Sp
.I <since/>
is a top-level element, and should be nested directly under the
\fI<Docs/>\fR element.
.Sp
Permits specification of which version introduced the specified type or
member.
.nf
<since version="Gtk# 2.4" />
.fi
This generally isn't required, as the \fI//AssemblyInfo/AssemblyVersion\fR
elements track which assembly versions contain type or member.
.TP
.I <summary>XML_TEXT</summary>
.Sp
.I <summary/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Provides a (brief!) overview about a type or type member.
.Sp
This is usually displayed as part of a class declaration, and should be a
reasonably short description of the type/member. Use
.I <remarks/>
for more detailed information.
.Sp
The \fIsummary\fR element can contain the following elements:
\fIblock\fR,
\fIlist\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <typeparam name="NAME">XML_TEXT</typeparam>
.I <typeparam/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
This is used to document a type parameter for a generic type or generic method.
.Sp
.I NAME
is the name of the type parameter, while
.I XML_TEXT
contains a description of the parameter (what it's used for, what restrictions
it must meet, etc.).
.nf
<typeparam name="T">
The type of the underlying collection
</typeparam>
.fi
The \fItypeparam\fR element can contain the following elements:
\fIblock\fR,
\fIc\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.TP
.I <typeparamref name="NAME">
Used to indicate that \fINAME\fR is a type parameter.
.TP
.I <value>XML_TEXT</value>
.I <value/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Allows a property to be described.
.nf
<value>
A <see cref="T:System.String" /> containing a widget name.
</value>
.fi
The \fIvalue\fR element can contain the following elements:
\fIblock\fR,
\fIc\fR,
\fIexample\fR,
\fIlist\fR,
\fIpara\fR,
\fIparamref\fR,
\fIsee\fR, and
\fItypeparamref\fR.
.PP
.SH CREF FORMAT
String IDs (\fICREF\fRs) are used to refer to a type or member of a type.
String IDs are documented in ECMA-334 3rd Edition, Annex E.3.1. They consist
of a \fImember type prefix\fR, the full type name (namespace + name, separated
by \fI.\fR), possibly followed by the member name and other information.
.PP
Member type prefixes:
.TP
.I "C:"
The CREF refers to a constructor. The (optional) parameter list is
enclosed in parenthesis and follows the type name:
\fIC:System.String(System.Char,System.Int32)\fR.
.TP
.I "E:"
The CREF refers to an event. The event name follows the type name:
\fIE:System.AppDomain.AssemblyLoad\fR.
.TP
.I "F:"
The CREF refers to a field. The field name follows the type name:
\fIF:System.Runtime.InteropServices.DllImportAttribute.SetLastError\fR.
.TP
.I "M:"
Refers to a constructor or method. Constructors may append
.I .ctor
to the type name (instead of using the above
.I C:
constructor format), while methods append the method name and an (optional)
count of the number of generic parameters. Both constructors and methods
may append the method parameter list enclosed in parenthesis.
.Sp
Examples:
\fIM:System.Object..ctor\fR,
\fIM:System.String..ctor(System.Char[])\fR,
\fIM:System.String.Concat(System.Object)\fR,
\fIM:System.Array.Sort``1(``0[])\fR,
\fIM:System.Collections.Generic.List`1..ctor\fR,
\fIM:System.Collections.Generic.List`1.Add(`0)\fR.
.TP
.I "N:"
Refers to a namespace, e.g. \fIN:System\fR.
.TP
.I "P:"
Refers to a property. If the property is an indexer or takes parameters,
the parameter types are appended to the property name and enclosed with
paranthesis:
\fIP:System.String.Length\fR,
\fIP:System.String.Chars(System.Int32)\fR.
.TP
.I "T:"
The CREF refers to a type, with the number of generic types appended:
\fIT:System.String\fR,
\fIT:System.Collections.Generic.List`1\fR,
\fIT:System.Collections.Generic.List`1.Enumerator\fR.
.PP
To make matters more interesting, generic types & members have two
representations: the "unbound" representation (shown in examples above), in
which class names have the count of generic parameters appended to their name.
There is also a "bound" representation, in which the binding of generic
parameters is listed within '{' and '}' or '<' and '>'.
(Use of '<' and '>' is less common, as within an XML document their escaped
character entities must instead be used, leading to '&lt;' and '&gt;'.)
.PP
.B Unbound:
.TP
.B *
.I T:System.Collections.Generic.List`1
.TP
.B *
.I T:System.Collections.Generic.Dictionary`2
.PP
.B Bound:
.TP
.B *
.I T:System.Collections.Generic.List{System.Int32}
.TP
.B *
.I T:System.Collections.Generic.List<System.Int32>
.TP
.B *
.I T:System.Collections.Generic.List&lt;System.Int32&gt;
.TP
.B *
.I T:System.Predicate{System.Action{System.String}}
.PP
As you can see, bound variants can be arbitrarily complex (just like
generics).
.PP
Furthermore, if a generic parameter is bound to the generic parameter of a
type or method, the "index" of the type/method's generic parameter is used
as the binding, so given
.nf
class FooType {
public static void Foo<T> (System.Predicate<T> predicate)
{
}
}
.fi
The CREF for this method is
\fIM:FooType.Foo``1(System.Predicate{``0})\fR,
.I ``0
is the 0th generic parameter index which is bound to
\fISystem.Predicate<T>\fR.
.SH SEE ALSO
mdoc(1), monodocer(1)
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
-56
View File
@@ -1,56 +0,0 @@
.\"
.\" mdvalidator manual page.
.\" (C) 2006 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "mdvalidator" 1
.SH NAME
mdvalidator \- Validate XML Documents against the ECMA Documentation Schema
.SH SYNOPSIS
.B mdvalidator
PROVIDER
[FILES]+
.SH DESCRIPTION
\fImdvalidator\fR has been obsoleted by \fBmdoc\fR(1). See the
\fBmdoc-validate\fR(1) man page.
.PP
.I mdvalidator
is a program that validates the specified
.I FILES
against the ECMA Documentation Schema.
.PP
The Schema also supports the
.I index.xml
and
.I namespace-name.xml
files generated by
.I monodocer
, so all output produced by
.I monodocer
can be validated.
.PP
.SH PROVIDER
The following providers are supported:
.TP
.I ecma
Validate the input files against the ECMA Documentation Schema.
.PP
.SH EXAMPLES
To validate the
.I monodocer
output stored within a directory (and all ECMA documentation within all
sub-directories, recursively), use:
.nf
mdvalidator ecma /path/to/ecma/docs
.fi
.PP
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
-19
View File
@@ -1,19 +0,0 @@
.TH "mono-cil-strip" 1
.SH NAME
Mono CIL strip
.SH SYNOPSIS
.B mono-cil-strip assembly [output-assembly]
.SH DESCRIPTION
mono-cil-strip is a tool which takes an assembly, and empty its method bodies.
This is useful to reduce an assembly size when an assembly has already been
compiled using Mono's Ahead Of Time compiler (AOT), where the CIL code is no
longer necessary, but the metadata still is.
.SH COPYRIGHT
Copyright (C) 2008 Novell, Inc (http://www.novell.com)
.SH MAILING LISTS
Mailing lists are listed at http://www.mono-project.com/Mailing_Lists
.SH LICENSE
mono-cil-strip is licensed under the MIT/X11 license. Please read the accompayning
MIT.X11 file for details.
.SH SEE ALSO
.BR monolinker(1),mkbundle(1),mono(1),mcs(1).
+1 -6
View File
@@ -81,12 +81,7 @@ Allowed values are: linux, osx, solaris, freebsd, openbsd, netbsd, windows, aix,
.TP
.I cpu
This is the name of the architecture for which the mapping should be applied.
Allowed values are: x86, x86-64, sparc, ppc, s390, s390x, arm, mips,
alpha, hppa, ia64.
.TP
.I wordsize
This is the size of registers on the target architecture, it can be
either 32 or 64.
Allowed values are: x86, x86-64, sparc, ppc, s390, s390x, arm, mips, alpha, hppa, ia64.
.PP
The attribute value for both attributes can be a comma-separated list of the allowed
values. Additionally, the first character may be a
+13 -69
View File
@@ -5,7 +5,11 @@
.\" Author:
.\" Miguel de Icaza ([email protected])
.\"
.TH Mono "Mono 2.2"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH Mono "Mono 2.0"
.SH NAME
mono \- Mono's ECMA-CLI native code generator (Just-in-Time and Ahead-of-Time)
.SH SYNOPSIS
@@ -116,20 +120,14 @@ be registered with the embedded runtime using the mono_aot_register_module funct
which takes as its argument the mono_aot_module_<ASSEMBLY NAME>_info global symbol
from the object file:
.nf
extern void *mono_aot_module_hello_info;
mono_aot_register_module (mono_aot_module_hello_info);
.fi
.ne
.PP
For more information about AOT, see: http://www.mono-project.com/AOT
.ne
.RE
.TP
\fB--attach=[options]\fR
Currently the only option supported by this command line argument is
\fBdisable\fR which disables the attach functionality.
.Sp
For more information about AOT, see: http://www.mono-project.com/AOT
.TP
\fB--full-aot\fR
This is an experimental flag that instructs the Mono runtime to not
@@ -250,9 +248,6 @@ Unsafe code is not allowed but P/Invoke is. This mode should
not allow managed code to crash mono. The verification is not as
strict as ECMA 335 standard in order to stay compatible with the MS
runtime.
.PP
The security system acts on user code: code contained in mscorlib or
the global assembly cache is always trusted.
.ne
.RE
.TP
@@ -260,15 +255,6 @@ the global assembly cache is always trusted.
Configures the virtual machine to be better suited for server
operations (currently, a no-op).
.TP
\fB--verify-all\fR
Verifies mscorlib and assemblies in the global
assembly cache for valid IL, and all user code for IL
verifiability.
This is different from \fB--security\fR's verifiable
or validil in that these options only check user code and skip
mscorlib and assemblies located on the global assembly cache.
.TP
\fB-V\fR, \fB--version\fR
Prints JIT version information (system configuration, release number
and branch names if available).
@@ -291,9 +277,7 @@ much larger and slower code at runtime.
The following options are supported:
.TP
.I casts
Produces a detailed error when throwing a InvalidCastException. This
option needs to be enabled as this generates more verbose code at
execution time.
Produces a detailed error when throwing a InvalidCastException.
.TP
.I mdb-optimizations
Disable some JIT optimizations which are usually only disabled when
@@ -362,13 +346,6 @@ Finally, namespaces can be specified using the N: prefix:
mono --trace=N:System.Xml
.fi
.TP
\fB--no-x86-stack-align\fR
Don't align stack frames on the x86 architecture. By default, Mono
aligns stack frames to 16 bytes on x86, so that local floating point
and SIMD variables can be properly aligned. This option turns off the
alignment, which usually saves one intruction per call, but might
result in significantly lower floating point and SIMD performance.
.SH JIT MAINTAINER OPTIONS
The maintainer options are only used by those developing the runtime
itself, and not typically of interest to runtime users or developers.
@@ -429,22 +406,6 @@ hps will list the currently used handles.
Increases the verbosity level, each time it is listed, increases the
verbosity level to include more information (including, for example,
a disassembly of the native code produced, code selector info etc.).
.SH ATTACH SUPPORT
The Mono runtime allows external processes to attach to a running
process and load assemblies into the running program. To attach to
the process, a special protocol is implemented in the Mono.Management
assembly.
.PP
With this support it is possible to load assemblies that have an entry
point (they are created with -target:exe or -target:winexe) to be
loaded and executed in the Mono process.
.PP
The code is loaded into the root domain, and it starts execution on
the special runtime attach thread. The attached program should
create its own threads and return after invocation.
.PP
This support allows for example debugging applications by having the
csharp shell attach to running processes.
.SH PROFILING
The mono runtime includes a profiler that can be used to explore
various performance related problems in your application. The
@@ -624,15 +585,6 @@ performed during JIT time).
These information are also available when combining the "a" and "c" options,
but since "c" is much more intrusive "ts" should be preferred.
.TP
\fIsave-allocation-stack\fR, \fIsas\fR
Save the execution stack at each allocation. While the "ts" option saves the
direct caller, this one records the whole stack trace. Note that for technical
reasons the decoder will correctly ignore wrapper methods only using the data
saved by the "ts" option (the stack traces still contain all the wrappers).
Anyway the "ts" and "sas" options can be combined, and the decoder will
attribute the allocation to the correct method even if the wrapper is at the
top of the stack trace.
.TP
\fIallocations-summary\fR or \fIas\fR
At each collection dump a summary
of the heap contents (for each class, the number and collective size of all
@@ -762,7 +714,7 @@ profiler.
To install you must download the profiler
from Mono's SVN:
.nf
svn co svn://anonsvn.mono-project.com/source/trunk/heap-shot
svn co svn://svn.myrealbox.com/source/trunk/heap-shot
cd heap-shot
./autogen
make
@@ -775,7 +727,7 @@ The Live Type profiler shows at every GC iteration all of the live
objects of a given type. To install you must download the profiler
from Mono's SVN:
.nf
svn co svn://anonsvn.mono-project.com/source/trunk/heap-prof
svn co svn://svn.myrealbox.com/source/trunk/heap-prof
cd heap-prof
./autogen
make
@@ -892,11 +844,7 @@ The offsets displayed are IL offsets.
.PP
A more powerful coverage tool is available in the module `monocov'.
See the monocov(1) man page for details.
.SH DEBUGGING AIDS
To debug managed applications, you can use the
.B mdb
command, a command line debugger.
.PP
.SH DEBUGGING
It is possible to obtain a stack trace of all the active threads in
Mono by sending the QUIT signal to Mono, you can do this from the
command line, like this:
@@ -916,10 +864,6 @@ integrity of the runtime after sending this signal is not guaranteed
and the application might crash or terminate at any given point
afterwards.
.PP
The \fB--debug=casts\FR option can be used to get more detailed
information for Invalid Cast operations, it will provide information
about the types involved.
.PP
You can use the MONO_LOG_LEVEL and MONO_LOG_MASK environment variables
to get verbose debugging output about the execution of your
application within Mono.
@@ -1455,7 +1399,7 @@ http://www.mono-project.com/Mailing_Lists
http://www.mono-project.com
.SH SEE ALSO
.PP
certmgr(1), csharp(1), mcs(1), mdb(1), monocov(1), monodis(1), mono-config(5), mozroots(1), xsp(1).
certmgr(1), mcs(1), monocov(1), monodis(1), mono-config(5), mozroots(1), xsp(1).
.PP
For more information on AOT:
http://www.mono-project.com/AOT
-692
View File
@@ -1,692 +0,0 @@
.\"
.\" monodocer manual page.
.\" (C) 2006 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "monodocer" 1
.SH NAME
monodocer \- ECMA Documentation Format Support
.SH SYNOPSIS
.B monodocer
[OPTIONS]*
.SH OPTIONS
.TP
.I \-assembly:ASSEMBLY
.I ASSEMBLY
is a .NET assembly to generate documentation stubs for.
.Sp
Specify a file path or the name of a GAC'd assembly.
.TP
.I \-delete
Allow monodocer to delete members from documentation files.
The only members deleted are for members which are no longer present within
the assembly.
.Sp
If a type is no longer present, the documentation file is
.I not
deleted, but is instead
.I renamed
to have a
.B .remove
extension.
.TP
.I \-?, \-help
Show program argument information.
.TP
.I \-ignoremembers
Do not update members.
.Sp
This will add documentation stubs for added types, but will
.I not
add or remove documentation for any members of any type (including any added
types).
.TP
.I \-importslashdoc:FILE
.I FILE
is an XML file generated with the
.B /doc:FILE
C# compiler flag (e.g.
.I mcs -doc:foo.xml foo.cs
). Import the member documentation contained within
.I FILE
into the documentation format used by monodoc.
.TP
.I \-name:NAME
.I NAME
is the name of the project this documentation is for.
.Sp
This sets the
.I /Overview/Title
element within the
.I index.xml
file created at the directory specified by
.I -path
\&.
This is used by some programs for title information (e.g.
.I monodocs2html
).
.TP
.I \-namespace:NAMESPACE
Only update the types within the namespace
.I NAMESPACE
\&.
.TP
.I \-overrides
Include overridden methods in documentation.
.Sp
This normally isn't necessary, as the Mono Documentation Browser will provide a
link to the base type members anyway, as will
.I monodocs2html
if the base type is within the same assembly.
.TP
.I \-path:OUTPUT_DIR
.I OUTPUT_DIR
is the directory which will contain the new/updated documentation stubs.
.TP
.I \-pretty
Indent the XML files nicely.
.TP
.I \-since:SINCE
Create a <since/> element for added types and members with the value
.I SINCE
\&.
.Sp
For example, when given
.I -since:"Gtk# 2.4"
an element will be inserted into the
.I Docs
element for all added types and type members:
.nf
<since version="Gtk# 2.4" />
.fi
The Mono Documentation Browser and
.I monodocs2html
will use this element to specify in which version a member was added.
.TP
.I \-type:TYPE
Only create/update documentation for the type
.I TYPE
\&.
.TP
.I \-updateto:PATH
When updating documentation, write the updated documentation files into the
directory
.I PATH
\&.
.TP
.I \-V, \-version
Display version and licensing information.
.PP
.SH DESCRIPTION
\fBmonodocer\fR has been obsoleted by \fBmdoc\fR(1). See the
\fBmdoc-update\fR(1) man page.
.PP
.I monodocer
is a program that creates XML documentation stubs in the ECMA Documentation
Format. It does not rely on documentation found within the source code.
.PP
The advantages are:
.TP
.I *
.B Code readability.
Good documentation is frequently (a) verbose, and (b)
filled with examples. (For comparison, compare Microsoft .NET Framework
documentation, which is often a page or more of docs for each member, to
JavaDoc documentation, which can often be a sentence for each member.)
.Sp
Inserting good documentation into the source code can frequently bloat the
source file, as the documentation can be longer than the actual method that is
being documented.
.TP
.I *
.B Localization.
In-source documentation formats (such as
.B /doc
) have no support for multiple human languages. If you need to support more
than one human language for documentation purposes,
.I monodocer
is useful as it permits each language to get its own directory, and
.I monodocer
can add types/members for each separate documentation directory.
.TP
.I *
.B Administration.
It's not unusual to have separate documentation and development teams. It's
also possible that the documentation team will have minimal experience with
the programming language being used. In such circumstances, inline
documentation is not desirable as the documentation team could inadvertantly
insert an error into the source code while updating the documentation.
Alternatively, you may not want the documentation team to have access to the
source code for security reasons.
.I monodocer
allows the documentation to be kept
.I completely
separate and distinct from the source code used to create the assembly.
.PP
To turn the
.I monodocer
documentation into something that can be consumed by the Mono
Documentation Browser (the desktop help browser, or the web interface
for it) it is necessary to compile the documentation into a packed
format. This is done with the mdassembler tool, for example, you
could use this toolchain like this:
.nf
$ monodocer -assembly:MyWidgets -path:generated_docs
$ mdassembler --ecma generated_docs -out:MyWidgets
.fi
The above would generate a MyWidgets.zip and a MyWidgets.tree that can
then be installed in the system. In addition to the two files (.zip
and .tree) you must provide a .sources file which describes where in
the help system the documentation should be hooked up, it is a very
simple XML file, like this:
.nf
<?xml version="1.0"?>
<monodoc>
<source provider="ecma" basefile="MyWidgets" path="classlib-gnome"/>
</monodoc>
.fi
The above configuration file describes that the documentation is in
ECMA format (the compiled version) that the base file name is
MyWidgets and that it should be hooked up in the "classlib-gnome" part
of the tree. If you want to look at the various nodes defined in the
documentation, you can look at monodoc.xml file which is typically
installed in /usr/lib/monodoc/monodoc.xml.
.PP
Once you have all of your files (.zip, .tree and .sources) you can
install them into the system with the following command:
.nf
$ cp MyWidgets.tree MyWidgets.zip MyWidgets.source `pkg-config monodoc --variable sourcesdir`
.fi
The above will copy the files into the directory that Monodoc has
registered (you might need root permissions to do this). The actual
directory is returned by the
.I pkg-config
invocation.
.SH STRING ID FORMAT
String IDs are used to refer to a type or member of a type. String IDs are
documented in ECMA-334 3rd Edition, Annex E.3.1. They consist of a
.I member type prefix
, the full type name (namespace + name, separated by '.'), possibly followed
by the member name and other information.
.PP
Member type prefixes:
.TP
.I "E:"
The String ID refers to an event. The event name follows the type name:
.I E:System.AppDomain.AssemblyLoad
.TP
.I "F:"
The String ID refers to a field. The field name follows the type name:
.I F:System.Runtime.InteropServices.DllImportAttribute.SetLastError
.TP
.I "M:"
Refers to a constructor or method. Constructors append
.I .ctor
to the type name, while methods append the method name (with an optional count
of the number of generic parameters).
.Sp
If the constructor or method take arguments, these are listed within
paranthesis after the constructor/method name:
.Sp
.I M:System.Object..ctor
,
.I M:System.String..ctor(System.Char[])
,
.I M:System.String.Concat(System.Object)
,
.I M:System.Array.Sort``1(``0[])
,
.I M:System.Collections.Generic.List`1..ctor
,
.I M:System.Collections.Generic.List`1.Add(`0)
\&.
.TP
.I "N:"
Refers to a namespace, e.g.
.I N:System
.TP
.I "P:"
Refers to a property. If the property is an indexer or takes parameters,
the parameter types are appended to the property name and enclosed with
paranthesis:
.I P:System.String.Length
,
.I P:System.String.Chars(System.Int32)
\&.
.TP
.I "T:"
The String ID refers to a type, with the number of generic types appended:
.I T:System.String
,
.I T:System.Collections.Generic.List`1
.PP
To make matters more interesting, generic types & members have two
representations: the "unbound" representation (shown in examples above), in
which class names have the count of generic parameters appended to their name.
There is also a "bound" representation, in which the binding of generic
parameters is listed within '{' and '}'.
.PP
.B Unbound:
.I T:System.Collections.Generic.List`1
,
.I T:System.Collections.Generic.Dictionary`2
\&.
.PP
.B Bound:
.I T:System.Collections.Generic.List{System.Int32}
.I T:System.Collections.Generic.Dictionary{System.String,System.Collections.Generic.List{System.Predicate{System.String}}}
\&.
.PP
As you can see, bound variants can be arbitrarily complex (just like
generics).
.PP
Furthermore, if a generic parameter is bound to the generic parameter of a
type or method, the "index" of the type/method's generic parameter is used
as the binding, so given
.nf
class FooType {
public static void Foo<T> (System.Predicate<T> predicate) {}
}
.fi
The String ID for this method is
.I M:FooType.Foo``1(System.Predicate{``0})
, as
.I ``0
is the 0th generic parameter index which is bound to
.I System.Predicate<T>
\&.
.SH DOCUMENTATION FORMAT
.I monodocer
generates documentation similar to the Ecma documentation format, as described
in ECMA-335 3rd Edition, Partition IV, Chapter 7.
.PP
The principal difference from the ECMA format is that each type gets its own
file, within a directory identical to the namespace of the type.
.PP
Most of the information within the documentation should
.I not
be edited. This includes the type name (
.I /Type/@FullName
), implemented interfaces (
.I /Type/Interfaces
), member information (
.I /Type/Members/Member/@MemberName
,
.I /Type/Members/Member/MemberSignature
,
.I /Type/Members/Member/MemberType
,
.I /Type/Members/Member/Parameters
, etc.).
.PP
What
.I should
be modified are all elements with the text
.I To be added.
, which are present under the
.I //Docs
elements (e.g.
.I /Type/Docs
,
.I /Type/Members/Member/Docs
). The contents of the
.I Docs
element is
.I identical
in semantics and structure to the inline C# documentation format, consisting
of these elements (listed in ECMA-334 3rd Edition, Annex E, Section 2). The
following are used within the element descriptions:
.TP
.I CREF
Refers to a class (or member) reference, and is a string in the format
described above in the
.I STRING ID FORMAT
section.
.TP
.I TEXT
Non-XML text, and XML should not be nested.
.I
.TP
.I XML
Only XML elements should be nested (which indirectly may contain text), but
non-whitespace text should not be an immediate child node.
.TP
.I XML_TEXT
Free-form text and XML, so that other XML elements may be nested.
.PP
The following elements are used in documentation:
.TP
.I <block subset="SUBSET" type="TYPE">XML_TEXT</block>
Create a block of text, similar in concept to a paragraph, but is used to
create divisions within the text. To some extent, a <block/> is equivalent to
the HTML <h2/> tag.
.Sp
.I SUBSET
should always be the value
.I "none"
\&.
.Sp
.I TYPE
specifies the heading and formatting to use. Recognized types are:
.Sp
.I behaviors
Creates a section with the heading
.I Operation
\&.
.Sp
.I note
Creates a section with the heading
.I Note:
\&.
.Sp
.I overrides
Creates a section with the heading
.I Note to Inheritors
\&.
.Sp
.I usage
Creates a section with the heading
.I Usage
\&.
.TP
.I <c>XML_TEXT</c>
Set text in a code-like font (similar to the HTML <tt/> element).
.TP
.I <code lang="LANGUAGE">TEXT</code>
Display multiple lines of text in a code-like font (similar to the HTML <pre/>
element).
.I LANGUAGE
is the language this code block is for. For example, if
.I LANGUAGE
is
.B C#
, then
.I TEXT
will get syntax highlighting for the C# language within the Mono Documentation
Browser.
.TP
.I <example>XML_TEXT</example>
Indicates an example that should be displayed specially. For example:
.nf
<example>
<para>An introductory paragraph.</para>
<code lang="C#">
class Example {
public static void Main ()
{
System.Console.WriteLine ("Hello, World!");
}
}
</code>
</example>
.fi
.TP
.I <exception cref="CREF">XML_TEXT</exception>
Identifies an exception that can be thrown by the documented member.
.Sp
.I <exception/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
.I CREF
is the exception type that is thrown, while
.I XML_TEXT
contains the circumstances that would cause
.I CREF
to be thrown.
.nf
<exception cref="T:System.ArgumentNullException">
<paramref name="foo" /> was <see langword="null" />.
</exception>
.fi
.TP
.I <list>XML</list>
Create a list or table of items.
.I <list/>
makes use of nested
.I <item>XML</item>
,
.I <listheader>XML</listheader>
,
.I <term>XML_TEXT</term>
, and
.I <description>XML_TEXT</description>
elements.
.Sp
.I Lists
have the syntax:
.nf
<list type="bullet"> <!-- or type="number" -->
<item><term>Bullet 1</term></item>
<item><term>Bullet 2</term></item>
<item><term>Bullet 3</term></item>
</list>
.fi
.Sp
.I Tables
have the syntax:
.nf
<list type="table">
<listheader> <!-- listheader bolds this row -->
<term>Column 1</term>
<description>Column 2</description>
<description>Column 3</description>
</listheader>
<item>
<term>Item 1-A</term>
<description>Item 1-B</description>
<description>Item 1-C</description>
</item>
<item>
<term>Item 2-A</term>
<description>Item 2-B</description>
<description>Item 2-C</description>
</item>
</list>
.fi
.TP
.I <para>XML_TEXT</para>
Insert a paragraph of
.I XML_TEXT
.
This is for use within other tags, such as
.I <example/>
,
.I <remarks/>
,
.I <returns/>
,
.I <term/>
and
.I <description/>
(see
.I <list/>
, above), and most other elements.
.Sp
For example,
.nf
<para>This is a paragraph of text.</para>
.fi
.TP
.I <param name="NAME">XML_TEXT</param>
.I <param/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Describes the parameter
.I NAME
of the current constructor, method, or property:
.nf
<param name="count">
A <see cref="T:System.Int32" /> containing the number
of widgets to process.
</param>
.fi
.TP
.I <paramref name="NAME" />
Indicates that
.I NAME
is a parameter.
.Sp
This usually renders
.I NAME
as italic text, so it is frequently (ab)used as an equivalent to the
HTML <i/> element. See the
.I <exception/>
documentation (above) for an example.
.TP
.I <permission cref="CREF">XML_TEXT</permission>
Documentes the security accessibility requirements of the current member.
.Sp
.I <permission/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
.I CREF
is a type reference to the security permission required, while
.I XML_TEXT
is a description of why the permission is required.
.nf
<permission cref="T:System.Security.Permissions.FileIOPermission">
Requires permission for reading and writing files. See
<see cref="F:System.Security.Permissions.FileIOPermissionAccess.Read" />,
<see cref="F:System.Security.Permissions.FileIOPermissionAccess.Write" />.
</permission>
.fi
.TP
.I <remarks>XML_TEXT</remarks>
Contains detailed information about a member.
.Sp
.I <remarks/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.nf
<remarks>Insert detailed information here.</remarks>
.fi
.TP
.I <returns>XML_TEXT</returns>
.Sp
.I <remarks/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Describes the return value of a method:
.nf
<returns>
A <see cref="T:System.Boolean" /> specifying whether
or not the process can access
<see cref="P:Mono.Unix.UnixFileSystemInfo.FullName" />.
</returns>
.fi
.TP
.I <see cref="CREF" />
Creates a link to the specified member within the current text:
.nf
<see cref="M:Some.Namespace.With.Type.Method" />
.fi
.TP
.I <seealso cref="CREF" />
.Sp
.I <seealso/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Allows an entry to be generated for the
.I See Also
subclause. Use
.I <see/>
to specify a link from within text.
.nf
<seealso cref="P:System.Exception.Message" />
.fi
.TP
.I <since version="VERSION" />
.Sp
.I <since/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Permits specification of which version introduced the specified type or
member.
.nf
<since version="Gtk# 2.4" />
.fi
.TP
.I <summary>DESCRIPTION</summary>
.Sp
.I <summary/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Provides a (brief!) overview about a type or type member.
.Sp
This is usually displayed as part of a class declaration, and should be a
reasonably short description of the type/member. Use
.I <remarks/>
for more detailed information.
.TP
.I <typeparam name="NAME">DESCRPITION</typeparam>
.I <typeparam/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
This is used to describe type parameter for a generic type or generic method.
.Sp
.I NAME
is the name of the type parameter, while
.I DESCRIPTION
contains a description of the parameter (what it's used for, what restrictions
it must meet, etc.).
.nf
<typeparam name="T">The type of the underlying collection</typeparam>
.fi
.TP
.I <typeparamref>
Used to indicate that a word is a type parameter, for use within other text
blocks (e.g. within
.I <para/>
).
.nf
<para>If <typeparamref name="T" /> is a struct, then...</para>
.fi
.TP
.I <value>DESCRIPTION</value>
.I <value/>
is a top-level element, and should be nested directly under the
.I <Docs/>
element.
.Sp
Allows a property to be described.
.nf
<value>
A <see cref="T:System.String" /> containing a widget name.
</value>
.fi
.PP
.SH SEE ALSO
mdassembler(1), mdcs2ecma(1), mdnormalizer(1), mdvalidator(1), monodocs2html(1)
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
-156
View File
@@ -1,156 +0,0 @@
.\"
.\" monodocs2html manual page.
.\" (C) 2006 Jonathan Pryor
.\" Author:
.\" Jonathan Pryor ([email protected])
.\"
.de Sp \" Vertical space (when we can't use .PP)
.if t .sp .5v
.if n .sp
..
.TH "monodocs2html" 1
.SH NAME
monodocs2html \- Translate Monodoc XML to HTML
.SH SYNOPSIS
.B monodocs2html
\-source:SOURCE_DIR \-dest:DEST_DIR
[OPTIONS]*
.SH DESCRIPTION
\fImonodocs2html\fR has been obsoleted by \fBmdoc\fR(1). See the
\fBmdoc-export-html\fR(1) man page.
.PP
.I monodocs2html
is a program that creates HTML documentation from the Monodoc documentation
XML files.
.SH OPTIONS
.TP
.I \-dest:DEST_DIR
Write the HTML files into the directory
.I DEST_DIR
\&.
.TP
.I \-dumptemplate
Dump the default page template to standard output so that you can use it as a
base for a new template for use with the
.I \-template
option.
.TP
.I \-ext:FILE_EXTENSION
.I FILE_EXTENSION
is the file extension for generated files.
.Sp
This defaults to
.I html
\&.
.TP
.I \-?, \-help
Show program argument information.
.TP
.I \-onlytype:TYPE
Only generate HTML for the type
.I TYPE
\&.
.TP
.I \-source:SOURCE_DIR
.I SOURCE_DIR
is the base directory containing the Monodoc XML documentation.
.Sp
This directory should contain an
.I index.xml
file, the
.I namespace-name.xml
files (one for each namespace), and
.I namespace-name
directories (one for each namespace), which will contain the
.I type.xml
files holding the monodoc documentation.
.TP
.I \-template:TEMPLATE
Generate HTML using the page template
.I TEMPLATE
\&.
.TP
.I \-V, \-version
Display version and licensing information.
.SH TEMPLATE FORMAT
The template file is an XSLT which needs to process the following input XML
document:
.nf
<Page>
<CollectionTitle>Collection Title</CollectionTitle>
<PageTitle>Page Title</PageTitle>
<Summary>Page Summary</Summary>
<Signature>Type Declaration</Signature>
<Remarks>Type Remarks</Remarks>
<Members>Type Members</Members>
<Copyright>Documentation Copyright</Copyright>
</Page>
.fi
The generated HTML also makes use of the following CSS classes, which should
be defined so that output is nicely formatted:
.RS
.ne 8
.TP
.I .CollectionTitle
.TP
.I .PageTitle
.TP
.I .Summary
.TP
.I .Signature
.TP
.I .Remarks
.TP
.I .Members
.TP
.I .Copyright
.TP
.I .Section
.TP
.I .SectionBox
.TP
.I .NamespaceName
.TP
.I .NamespaceSummary
.TP
.I .MemberName
.TP
.I .MemberSignature
.TP
.I .MemberBox
.TP
.I .Subsection
.TP
.I .SubsectionBox
.TP
.I .SignatureTable
.TP
.I .EnumerationsTable
.TP
.I .CodeExampleTable
.TP
.I .MembersListing
.TP
.I .TypesListing
.TP
.I .InnerSignatureTable
.TP
.I .TypePermissionsTable
.ne
.RE
.SH HTML LINKS
All members within the HTML file have a
.I id
attribute to permit linking to a specific member. The value of the
.I id
attribute is the String ID of the specified member.
See the
.B STRING ID FORMAT
section of the
.B monodocer
man page for more information.
.SH MAILING LISTS
.TP
Visit http://lists.ximian.com/mailman/listinfo/mono-docs-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
+2 -9
View File
@@ -46,13 +46,6 @@ Specify the output directory, default is 'output'.
If you specify the directory `.', please ensure that you won't write over
important assemblies of yours.
.TP
.I "-b true | false"
Specify whether to generate debug symbols or not, default is false.
.TP
.I "-g true | false"
Specify whether to generate a new guid for each linked module or reuse the
existing one, default is true.
.TP
.I "-l i18n_assemblies"
Specify what to do with the region specific assemblies
.Sp
@@ -93,8 +86,8 @@ their size.
.ne
.RE
.Sp
.TP
.I "-p action assembly"
.TP "-p action assembly"
.I
Specify per assembly which action to apply.
.TP
.I "-x descriptor"
+28 -91
View File
@@ -1,4 +1,4 @@
.TH sqlsharp 1 "9 September 2008"
.TH sqlsharp 1 "25 December 2005"
.SH NAME
sqlsharp \- Mono SQL Query command-line tool
.SH SYNOPSIS
@@ -69,8 +69,6 @@ Sets the Connection String
Example:
SQL# \\ConnectionString Database=testdb
or
SQL# \\cs Database=testdb
For more examples, see section CONNECTION STRING EXAMPLES.
@@ -82,58 +80,10 @@ Sets the Provider of the Data Source. For list of Providers, see section PROVID
Example: to set the provider for MySQL:
SQL# \\provider mysql
or
SQL# \\p mysql
Note: if you need to load an external provider in SQL#,
see the SQL# command \\loadextprovider
.fi
.TP
.I "ListProviders"
List ADO.NET 2.0 Providers available
.nf
Example:
SQL# \\ListProviders
or
SQL# \\listp
.fi
.TP
.I "BCS"
Prompts you for building each connection parameter and builds the connection string
and also allows you to enter a password wich does not echo.
.nf
Example:
SQL# \\bcs
ConnectionString Option: Data Source [] SQL# blazer
ConnectionString Option: Persist Security Info [False] SQL#
ConnectionString Option: Integrated Security [False] SQL#
ConnectionString Option: User ID [] SQL# scott
Password: *****
ConnectionString Option: Enlist [False] SQL#
ConnectionString Option: Pooling [True] SQL#
ConnectionString Option: Min Pool Size [0] SQL#
ConnectionString Option: Max Pool Size [100] SQL#
ConnectionString Option: Unicode [False] SQL#
ConnectionString Option: Load Balance Timeout [0] SQL#
ConnectionString Option: Omit Oracle Connection Name [False] SQL#
ConnectionString is set.
.fi
.TP
.I "LoadExtProvider"
@@ -394,30 +344,32 @@ ption defaulting to true.
PROVIDER NAME NAMESPACE ASSEMBLY
oracle Oracle 8i-11g System.Data.OracleClient System.Data.OracleClient
oracle Oracle 8i System.Data.OracleClient System.Data.OracleClient
postgresql NetPostgreSQL Npgsql Npgsql
bytefx ByteFX MySQL ByteFX.Data.MySqlClient ByteFX.Data
sqlclient MS SQL 7-2008 System.Data.SqlClient System.Data
sqlclient MS SQL 7/2000 System.Data.SqlClient System.Data
odbc ODBC System.Data.Odbc System.Data
sqlite SQL Lite Mono.Data.SqliteClient Mono.Data.SqliteClient
sybase Sybase Mono.Data.SybaseClient Mono.Data.SybaseClient
olebb OLE DB System.Data.OleDb System.Data
tds TDS Generic Mono.Data.TdsClient Mono.Data.TdsClient
msodbc MS ODBC Microsoft.Data.Odbc Microsoft.Data.Odbc
firebird Firebird SQL FirebirdSql.Data.FirebirdSql FirebirdSql.Data.Firebird
mysql MySQL AB MySql.Data.MySqlClient MySql.Data
NOTES:
Ngsql is the .Net Data Provider for PosgreSQL. The
latest verison can be downloaded from
http://npgsql.projects.postgresql.org/
npgsql maps to postgresql above.
mysqlnet maps to mysql above.
odbc is treated as an external provider for .NET 1.1 and above.
msodbc is an external provider for compatibility with .NET 1.0
MySql.Data is the MySQL Connector/Net for connecting to MySql databases.
For MySQL, it is strongly recommend to use MySql.Data instead of the old
ByteFX.Data provider. Unfortunately, MySql.Data is not included with Mono.
You can download the latest MySQL Connector/Net from MySQL AB at
http://dev.mysql.com/downloads/
MySql.Data has replaced the mysql provider. If you still need to use ByteFX.Data, then
use bytefx.
FirebirdSql.Data.Firebird can be downloaded from here:
http://www.firebirdsql.org/index.php?op=files&id=netprovider
MySql.Data is not included with Mono. You need to
download the MySQL Connector/Net from MySQL AB at
http://dev.mysql.com/downloads/connector/net/1.0.html
.fi
.SH CONNECTION STRING SAMPLES
@@ -433,17 +385,10 @@ Connection String examples:
Microsoft SQL Server via System.Data.SqlClient
or Mono.Data.TdsClient provider:
Server=DANPC;Database=pubs;User ID=saPassword=;
Server=DANPC;Database=pubs;User ID=saPassword=
For Integrated Security, bear in mind that Mono is not
integrated with Windows, SQL Server client nor server, nor
Windows Server. Therefore, you must provide the Windows Domain
name and domain user name and password for this user.
Server=DANPC;Database=pubs;User ID=DOMAIN\user;Password=pass;Integrated Security=SSPI
For a server locally, you can use localhost.
ODBC via System.Data.Odbc provider using
a DSN named "MSSQLDSN" I set up
@@ -452,8 +397,6 @@ which connects to Microsoft SQL Server 2000:
DSN=MSSQLDSN;UID=danmorg;PWD=freetds
To use ODBC ON Unix, consider unixODBC from http://www.unixodbc.org/
or use iODBC from http://www.iodbc.org/
SQL Lite via Mono.Data.SqliteClient
provider which connects to the
@@ -462,21 +405,17 @@ the file is created:
URI=file:SqliteTest.db
OLE DB via System.Data.OleDb provider
which connects to a PostgreSQL database:
Provider=PostgreSQL;Addr=127.0.0.1;Database=rodrigo
Oracle via System.Data.OracleClient
Data Source=testdb;User ID=scott;Password=tiger
If you prefer to not use a tnsnames.ora file, you can
use a connection string which allows a
TNS network description that is parentheses delimited
like the following which has the host, port, and
service name. For host, you can specify an IP address
instead of a hostname.
User ID=SCOTT;
Password=TIGER;
Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=192.168.1.101)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=TESTDB)))
Npgsql (.NET PostgreSQL) from
http://gborg.postgresql.org/project/npgsql/projdisplay.php
@@ -486,17 +425,15 @@ http://gborg.postgresql.org/project/npgsql/projdisplay.php
ByteFX (ByteFX MySQL) from
Please use MySql.Data instead.
Server=localhost;Database=test;User ID=mysql;Password=
FirebirdSql via FirebirdSql.Data.Firebird (download latest form FirebirdSql.org)
FirebirdSql via FirebirdSql.Data.Firebird (not included with Mono)
Database=C:\\FIREBIRD\\EXAMPLES\\EMPLOYEE.FDB;User=SYSDBA;Password=masterkey;Dialect=3;Server=localhost
MySQL via (MySql.Data) MySQL Connector/Net from http://www.mysql.com/
MySQL (MySQL AB) from http://www.mysql.com/
Server=localhost;Database=test;User ID=mysql;Password=mypass;Pooling=false
@@ -507,7 +444,7 @@ No support for tracing right now.
.SH AUTHORS
The Mono SQL Query Tool was written
.nf
by Daniel Morgan <[email protected]>
by Daniel Morgan <[email protected]>
.fi
.PP
.SH LICENSE
@@ -533,5 +470,5 @@ http://www.mono-project.com
.fi
.PP
.SH SEE ALSO
mono(1)
mono(1), mint(1)
-31
View File
@@ -1,34 +1,3 @@
2008-10-18 Jonathan Pryor <[email protected]>
* docs/Makefile (MONODOC_INSTALL_DIR): Prefix path with $(DESTDIR) so
that it installs properly under the buildbot.
2008-10-18 Raja R Harinath <[email protected]>
* docs/Makefile (DISTFILES): Don't use 'find' to list files.
2008-10-18 Raja R Harinath <[email protected]>
* Makefile (net_2_0_SUBDIRS): Add 'docs'.
* docs/Makefile: Build documentation only in the net_2_0 profile.
2008-10-17 Jonathan Pryor <[email protected]>
* docs/Makefile: Add install/uninstall support.
2008-10-17 Jonathan Pryor <[email protected]>
* docs/Makefile: Assemble documentation.
* docs/cs-errors.config: Update to refer to correct directory.
* docs/mono-tools.config: Man pages are in mono/man now...
2008-10-08 Zoltan Varga <[email protected]>
* README: Update after the profile changes.
* Makefile */Makefile build/profiles/*.make: Rename the 'default'
profile to 'net_1_1'.
2008-05-14 Marek Safar <[email protected]>
* Makefile: Enabled more tests.
+6 -6
View File
@@ -5,7 +5,7 @@ SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
basic_SUBDIRS := build jay mcs class
net_1_1_bootstrap_SUBDIRS := build jay mcs class ilasm tools
net_2_0_bootstrap_SUBDIRS := build jay mcs class ilasm tools
net_2_0_SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors docs
net_2_0_SUBDIRS := build jay mcs class nunit20 ilasm tools tests errors
net_2_1_bootstrap_SUBDIRS := build mcs class
net_2_1_raw_SUBDIRS := build mcs class tools
net_2_1_SUBDIRS := tools tests errors
@@ -49,7 +49,7 @@ net_2_0_centum_tests := \
class/Microsoft.Build.Utilities \
class/Microsoft.Build.Engine \
class/Mono.C5
# class/System.Web.Extensions
# class/Microsoft.Build.Tasks
@@ -78,7 +78,7 @@ dir-check:
# fun specialty targets
PROFILES = net_1_1 net_2_0 net_3_5
PROFILES = default net_2_0 net_3_5
.PHONY: all-profiles $(STD_TARGETS:=-profiles)
all-profiles $(STD_TARGETS:=-profiles): %-profiles: profiles-do--%
@@ -102,8 +102,8 @@ $(_boot_:%=profile-do--net_2_1--%): profile-do--net_2_1--%:
$(_boot_:%=profile-do--net_2_1_raw--%): profile-do--net_2_1_raw--%: profile-do--net_2_1_bootstrap--%
$(_boot_:%=profile-do--net_2_1_bootstrap--%): profile-do--net_2_1_bootstrap--%: profile-do--net_2_0--%
$(_boot_:%=profile-do--net_2_0--%): profile-do--net_2_0--%: profile-do--net_2_0_bootstrap--%
$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--net_1_1--%
$(_boot_:%=profile-do--net_1_1--%): profile-do--net_1_1--%: profile-do--net_1_1_bootstrap--%
$(_boot_:%=profile-do--net_2_0_bootstrap--%): profile-do--net_2_0_bootstrap--%: profile-do--default--%
$(_boot_:%=profile-do--default--%): profile-do--default--%: profile-do--net_1_1_bootstrap--%
$(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
testcorlib:
@@ -113,7 +113,7 @@ compiler-tests:
$(MAKE) TEST_SUBDIRS="tests errors" run-test-profiles
test-installed-compiler:
$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_1_1 TEST_RUNTIME=mono MCS=mcs run-test
$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=default TEST_RUNTIME=mono MCS=mcs run-test
$(MAKE) TEST_SUBDIRS="tests errors" PROFILE=net_2_0 TEST_RUNTIME=mono MCS=gmcs run-test
package := mcs-$(VERSION)
+6 -11
View File
@@ -56,28 +56,23 @@ package module which drives the compilation of this directory.
You can build individual components in the hierarchy by running the command
"make", and to install it use "make install".
By default, the 2.x profile is built, if you want to build the net 1.1 profile,
use the following command:
If you need to build a given component on the 2.x profile, you must use
the following command:
make PROFILE=net_1_1
make PROFILE=net_2_0
And to install:
make PROFILE=net_1_1 install
To turn on verbose mode in the build (for example to diagnose a
problem), you can use the V=1 flag, like this:
make V=1
make PROFILE=net_2_0 install
* Running Unit tests
====================
You can run unit tests in individual components by running the command
"make run-test". If you want to run tests for a different profile (say
'net_1_1')
'net_2_0')
make run-test PROFILE=net_1_1
make run-test PROFILE=net_2_0
If you want to only run the tests in a single fixture (say
'MonoTests.System.TypeTest'), you can use
-55
View File
@@ -1,58 +1,3 @@
2008-10-18 Jonathan Pryor <[email protected]>
* rules.make (dist-default): Distribute the Documentation directory,
if present.
2008-10-18 Jonathan Pryor <[email protected]>
* rules.make (MDOC): MONO_PATH needs to include net_1_1 so monodoc.dll
can be found.
2008-10-17 Jonathan Pryor <[email protected]>
* README.makefiles: Add documentation about the new doc-update target.
2008-10-18 Raja R Harinath <[email protected]>
* rules.make (MDOC): Pass a proper MONO_PATH.
2008-10-17 Jonathan Pryor <[email protected]>
* build.rules: doc-update is now a standard target; provide a $(MDOC)
variable to simplify running the `mdoc` updater program.
* executable.make: Add doc-update target support (does nothing).
* library.make: Add doc-update target support; runs `mdoc update` on
the assembly, updating the documentation within Documentation/en.
* Makefile: Add doc-update target support.
2008-09-14 Zoltan Varga <[email protected]>
* library.make: Allow FIXTURE make variable to be passed to nunit.
2008-08-29 Raja R Harinath <[email protected]>
* rules.make (do-%): Revert change below. We need the recursion
to ensure ordering of %-local after %-recursive. IOW, we
want to ensure strict linearity even with a 'make -j'.
2008-08-28 Zoltan Varga <[email protected]>
* rules.make (Q_MCS): Use 5 spaces instead of -e '\\t'.
* library.make: Make some command quiet.
* rules.make: Avoid some needless recursive make invocations.
* rules.make: Print the profile in the quiet commands.
* rules.make: Make the build process quiet similarly to the runtime build
process. Use the V=1 argument to make to make it verbose again.
2008-08-04 Zoltan Varga <[email protected]>
* rules.make (PROFILE): If no profile is passed on the command line, make
net_2_0 the default.
2008-06-30 Marek Safar <[email protected]>
* platforms/linux.make: Enable mcs optimizations.
+2 -2
View File
@@ -4,7 +4,7 @@ include ../build/rules.make
BUILT_FILES = common/Consts.cs
all-local install-local test-local run-test-local run-test-ondotnet-local uninstall-local doc-update-local: $(BUILT_FILES)
all-local install-local test-local run-test-local run-test-ondotnet-local uninstall-local: $(BUILT_FILES)
@:
clean-local:
@@ -18,7 +18,7 @@ PLATFORMS = linux win32
PROFILES = \
basic \
net_1_1_bootstrap \
net_1_1 \
default \
net_2_0_bootstrap \
net_2_0 \
net_2_1_bootstrap \
+3 -34
View File
@@ -11,7 +11,6 @@ build system needs to let us do, specifically:
* Make distributions easily
* Provide a framework for testing
* Build platform-independently whenever possible
* Generate, update, and build monodoc documentation.
@@ -48,22 +47,20 @@ DISTFILES = myfile.txt my_test_source.cs
dist-local: dist-default
doc-update-local:
my_test_program.exe: my_test_source.cs
$(CSCOMPILE) /target:exe /out:$@ $<
========================================
Each makefile follows the same pattern: it does some setup, includes
the standard make rules, and provides rules for eight standard targets:
all, install, test, run-test, clean, dist, and doc-update.
the standard make rules, and provides rules for seven standard targets:
all, install, test, run-test, clean, and dist.
"Some setup" is defining two variables: $(thisdir) and
$(SUBDIRS). $(thisdir) is the directory that the makefile lives in,
relative to the top directory (ie, class/corlib) and $(SUBDIRS)
defines the subdirectories that should be built in.
The eight targets do the following:
The seven targets do the following:
* all-local builds whatever someone would expect to be built
when they just type 'make'. Most likely Foo.dll or Foo.exe
@@ -91,11 +88,6 @@ true that all files that go into a tarball need to be left after a make clean.)
given by the variable $(distdir). dist-local always depends on the
target 'dist-default'. See ** 'make dist' below.
* doc-update-local should generate or update monodoc documentation,
if appropriate. This is usually only appropriate for libraries. It's
defined as a standard target so that it can easily be run recursively
across all libraries within the module.
@@ -373,14 +365,6 @@ If you're building a library, library.make is highly recommended; the
only DLL that doesn't use it is corlib, because building corlib is a
fair bit more complicated than it should be. Oh well.
library.make also automatically supports generating and updating
monodoc documentation. Documentation is stored within the
Documentation directory (a sibling to the Test directory), and is
generated/updated whenever the doc-update target is executed.
Assembling of the documentation so that the monodoc browser can
display the documentation is handled separately within the mcs/docs
all-local target; see mcs/docs/Makefile for details.
@@ -424,21 +408,6 @@ variable $(CFLAGS) will automatically be included on the command line.
* Documentation-related needs? Use $(MDOC)
$(MDOC) is a front-end to the monodoc documentation system, supporting
documentation generation, updating, importing from Microsoft XML
Documentation and ECMA documentation formats, assembling documentation
for use within the monodoc documentation browser, and exporting
documentation to various other output formats such as static HTML.
It is currently only used for library.make's doc-update-local target
and for assembling documentation within $topdir/docs.
* Installing files? Use $(MKINSTALLDIRS), $(INSTALL_DATA) or
$(INSTALL_BIN), $(prefix), and $(DESTDIR).
-8
View File
@@ -1,11 +1,3 @@
2008-08-20 Jb Evain <[email protected]>
* Consts.cs.in: add NET_3_0 case for wcf.
2008-07-24 Gert Driesen <[email protected]>
* Consts.cs.in; Update FxFileVersion and VsFileVersion for 2.0 SP1.
2008-04-13 Jb Evain <[email protected]>
* Consts.cs.in: update the 2.1 profile versions.
+2 -7
View File
@@ -57,11 +57,6 @@ internal
public const string FxFileVersion = "3.5.21022.8";
public const string VsVersion = "0.0.0.0"; // Useless ?
#elif NET_3_0
public const string FxVersion = "3.0.0.0";
public const string VsVersion = "8.0.0.0";
public const string FxFileVersion = "3.0.4506.648";
public const string VsFileVersion = "6.0.6001.17014";
#elif NET_2_1
// Versions of .NET Framework for SilverLight
public const string FxVersion = "2.0.5.0";
@@ -72,8 +67,8 @@ internal
// Versions of .NET Framework 2.0 RTM
public const string FxVersion = "2.0.0.0";
public const string VsVersion = "8.0.0.0";
public const string FxFileVersion = "2.0.50727.1433";
public const string VsFileVersion = "8.0.50727.1433";
public const string FxFileVersion = "2.0.50727.42";
public const string VsFileVersion = "8.0.50727.42";
#elif NET_1_1
// Versions of .NET Framework 1.1 SP1
public const string FxVersion = "1.0.5000.0";
-4
View File
@@ -120,7 +120,3 @@ ifneq ($(response),$(sourcefile))
$(response): $(topdir)/build/executable.make $(depsdir)/.stamp
endif
$(makefrag): $(topdir)/build/executable.make $(depsdir)/.stamp
doc-update-local:
@:
+5 -28
View File
@@ -94,7 +94,7 @@ ifdef NO_SIGN_ASSEMBLY
SN = :
else
sn = $(topdir)/class/lib/net_1_1_bootstrap/sn.exe
SN = $(Q) MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
SN = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(sn)
SNFLAGS = -q -R
endif
@@ -210,14 +210,10 @@ TEST_HARNESS_POSTPROC = (echo ''; cat TestResult-$(PROFILE).log) | sed '1,/^Test
TEST_HARNESS_POSTPROC_ONDOTNET = (echo ''; cat TestResult-ondotnet-$(PROFILE).log) | sed '1,/^Tests run: /d'
endif
ifdef FIXTURE
FIXTURE_ARG = /fixture:MonoTests.$(FIXTURE)
endif
## FIXME: i18n problem in the 'sed' command below
run-test-lib: test-local
ok=:; \
MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) /xml:TestResult-$(PROFILE).xml $(test_assemblies) $(FIXTURE_ARG) || ok=false; \
MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) /xml:TestResult-$(PROFILE).xml $(test_assemblies) || ok=false; \
$(TEST_HARNESS_POSTPROC) ; $$ok
run-test-ondotnet-lib: test-local
@@ -301,9 +297,9 @@ $(build_lib): $(response) $(sn) $(BUILT_SOURCES) $(build_libdir:=/.stamp)
ifdef LIBRARY_USE_INTERMEDIATE_FILE
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$(LIBRARY_NAME) $(BUILT_SOURCES_cmdline) @$(response)
$(SN) $(SNFLAGS) $(LIBRARY_NAME) $(LIBRARY_SNK)
$(Q) mv $(LIBRARY_NAME) $@
$(Q) test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb [email protected]
$(Q) test ! -f $(LIBRARY_NAME:.dll=.pdb) || mv $(LIBRARY_NAME:.dll=.pdb) $(dir $@)$(LIBRARY_NAME:.dll=.pdb)
mv $(LIBRARY_NAME) $@
test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb [email protected]
test ! -f $(LIBRARY_NAME:.dll=.pdb) || mv $(LIBRARY_NAME:.dll=.pdb) $(dir $@)$(LIBRARY_NAME:.dll=.pdb)
else
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
@@ -366,22 +362,3 @@ ifneq ($(response),$(sourcefile))
$(response): $(topdir)/build/library.make $(depsdir)/.stamp
endif
$(makefrag) $(test_response) $(test_makefrag) $(btest_response) $(btest_makefrag): $(topdir)/build/library.make $(depsdir)/.stamp
## Documentation stuff
Q_MDOC_UP=$(if $(V),,@echo "MDOC-UP [$(PROFILE)] $(notdir $(@))";)
MDOC_UP =$(Q_MDOC_UP) \
if `echo $(PROFILE) | grep ^net_1_ > /dev/null 2>/dev/null` ; then \
$(RUNTIME) $(topdir)/tools/mdoc/monodocer1.exe \
-path:Documentation/en -assembly:$(the_lib) ; \
else \
$(RUNTIME) $(topdir)/tools/mdoc/mdoc.exe update --delete \
-o Documentation/en $(the_lib) ; \
fi
doc-update-local: $(the_libdir)/.doc-stamp
$(the_libdir)/.doc-stamp: $(the_lib)
$(MDOC_UP)
@echo "doc-stamp" > $@
-5
View File
@@ -22,11 +22,6 @@ NO_TEST = yes
NO_INSTALL = yes
FRAMEWORK_VERSION = 1.0
#
# Copy from rules.make because I don't know how to unset MCS_FLAGS
#
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS)
.PHONY: profile-check do-profile-check
profile-check:
@:
-28
View File
@@ -1,28 +0,0 @@
# -*- makefile -*-
#
# The default 'bootstrap' profile -- builds so that we link against
# the libraries as we build them.
#
# We use the platform's native C# runtime and compiler if possible.
# Note that we have sort of confusing terminology here; BOOTSTRAP_MCS
# is what allows us to bootstrap ourselves, but when we are bootstrapping,
# we use INTERNAL_MCS.
# When bootstrapping, compile against our new assemblies.
# (MONO_PATH doesn't just affect what assemblies are loaded to
# run the compiler; /r: flags are by default loaded from whatever's
# in the MONO_PATH too).
BOOTSTRAP_PROFILE = net_1_1_bootstrap
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS)
MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MBAS)
# nuttzing!
profile-check:
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1
PROFILE_MBAS_FLAGS = -d:NET_1_1 -d:ONLY_1_1
FRAMEWORK_VERSION = 1.0
@@ -8,11 +8,6 @@ NO_SIGN_ASSEMBLY = yes
NO_TEST = yes
NO_INSTALL = yes
#
# Copy from rules.make because I don't know how to unset MCS_FLAGS
#
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS)
profile-check:
@:
+1 -2
View File
@@ -4,8 +4,7 @@
# Note that we're using the .NET 1.1 MCS but MONO_PATH points to the net_2_0_bootstrap directory.
# We do it this way to get assembly version references right.
#
BOOTSTRAP_PROFILE = net_1_1
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/$(BOOTSTRAP_PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(BOOTSTRAP_PROFILE)/mcs.exe
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/default$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/default/mcs.exe
MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/$(PROFILE)/gmcs.exe
profile-check:
+4 -19
View File
@@ -15,17 +15,13 @@ topdir := $(dots)
VERSION = 0.93
Q=$(if $(V),,@)
# echo -e "\\t" does not work on some systems, so use 5 spaces
Q_MCS=$(if $(V),,@echo "MCS [$(PROFILE)] $(notdir $(@))";)
USE_MCS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MCS_FLAGS) $(PLATFORM_MCS_FLAGS) $(PROFILE_MCS_FLAGS) $(MCS_FLAGS)
USE_MBAS_FLAGS = /codepage:$(CODEPAGE) $(LOCAL_MBAS_FLAGS) $(PLATFORM_MBAS_FLAGS) $(PROFILE_MBAS_FLAGS) $(MBAS_FLAGS)
USE_CFLAGS = $(LOCAL_CFLAGS) $(CFLAGS)
CSCOMPILE = $(Q_MCS) $(MCS) $(USE_MCS_FLAGS)
CSCOMPILE = $(MCS) $(USE_MCS_FLAGS)
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
CCOMPILE = $(CC) $(USE_CFLAGS)
BOOT_COMPILE = $(Q_MCS) $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
BOOT_COMPILE = $(BOOTSTRAP_MCS) $(USE_MCS_FLAGS)
INSTALL = $(SHELL) $(topdir)/../mono/install-sh
INSTALL_DATA = $(INSTALL) -c -m 644
INSTALL_BIN = $(INSTALL) -c -m 755
@@ -93,7 +89,7 @@ endif
# Rest of the configuration
ifndef PROFILE
PROFILE = net_2_0
PROFILE = default
endif
include $(topdir)/build/profiles/$(PROFILE).make
@@ -112,7 +108,7 @@ gacutil = $(topdir)/class/lib/net_1_1_bootstrap/gacutil.exe
GACUTIL = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(gacutil)
endif
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall doc-update
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
$(STD_TARGETS): %: do-%
@@ -172,11 +168,6 @@ dist-default:
dest=`dirname $(distdir)/$$f` ; \
$(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
done
if test -d Documentation ; then \
find . -name '*.xml' > .files ; \
tar cTf .files - | (cd $(distdir); tar xf -) ; \
rm .files ; \
fi
%/.stamp:
$(MKINSTALLDIRS) $(@D)
@@ -186,9 +177,3 @@ dist-default:
withmcs:
$(MAKE) MCS='$(INTERNAL_MCS)' BOOTSTRAP_MCS='$(INTERNAL_MCS)' all
## Documentation stuff
Q_MDOC =$(if $(V),,@echo "MDOC [$(PROFILE)] $(notdir $(@))";)
MDOC =$(Q_MDOC) MONO_PATH="$(topdir)/class/lib/net_2_0$(PLATFORM_PATH_SEPARATOR)$(topdir)/class/lib/net_1_1$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(topdir)/tools/mdoc/mdoc.exe
-62
View File
@@ -1,65 +1,3 @@
2008-10-17 Jonathan Pryor <[email protected]>
* I18N/Makefile: Add doc-update target support.
2008-10-13 Jonathan Pryor <[email protected]>
* Makefile (net_2_0_dirs): Add Mono.Options.
2008-10-09 Atsushi Enomoto <[email protected]>
* Makefile: add System.Web.Abstractions and System.Web.Routing.
2008-10-07 Atsushi Enomoto <[email protected]>
* Makefile : changed some net_2_0_dirs orders; Sys.Web.Extensions
will depend on Sys.Data.Linq (LinqDataSource).
2008-10-07 Zoltan Varga <[email protected]>
* Makefile (net_2_0_dirs): Add Mono.Simd.
2008-09-30 Marek Habersack <[email protected]>
* Makefile (net_2_0_dirs): added System.Web.Extensions_1.0 and
System.Web.Extensions.Design_1.0
(net_3_5_dirs): removed System.Web.Extensions, the 3.5 version is
now built in the 2.0 profile.
2008-09-24 Zoltan Varga <[email protected]>
* Makefile (net_2_0_dirs): Add Mono.Management.
2008-09-23 Marek Safar <[email protected]>
* Makefile: Build Mono.CompilerServices.SymbolWriter before it's
used.
2008-09-23 Jb Evain <[email protected]>
* Makefile: compile the SymbolWriter during net_2_1_raw.
2008-09-12 Jb Evain <[email protected]>
* Makefile: add System.ServiceModel.Web to the net_2_1_raw build.
2008-09-12 Jb Evain <[email protected]>
* Makefile: add System.ServiceModel to the net_2_1_raw build.
2008-09-09 Jb Evain <[email protected]>
* Makefile: build System.Runtime.Serialization
during the net_2_1_raw profile.
2008-08-21 Jb Evain <[email protected]>
* Makefile: add wcf and cardspace to the build.
2008-07-31 Jb Evain <[email protected]>
* Makefile: update net_2_1_bootstrap_SUBDIRS to only build
corlib and System.
2008-05-22 Andreia Gaita <[email protected]>
* Makefile, Mono.Mozilla, Mono.WebBrowser: Long overdue rename of
@@ -1,50 +0,0 @@
<Type Name="Nvdl" FullName="Commons.Xml.Nvdl.Nvdl">
<TypeSignature Language="C#" Value="public class Nvdl" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Object</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName="Namespace">
<MemberSignature Language="C#" Value="public const string Namespace;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>Represents the namespace URI for NVDL grammar.</summary>
<remarks>The value is http://purl.oclc.org/dsdl/nvdl/ns/structure/1.0 .</remarks>
</Docs>
</Member>
<Member MemberName="BuiltInValidationNamespace">
<MemberSignature Language="C#" Value="public const string BuiltInValidationNamespace;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>Represents the namespace URI for built-in NVDL validation.</summary>
<remarks>The value is http://purl.oclc.org/dsdl/nvdl/ns/predefinedSchema/1.0 .</remarks>
</Docs>
</Member>
<Member MemberName="InstanceNamespace">
<MemberSignature Language="C#" Value="public const string InstanceNamespace;" />
<MemberType>Field</MemberType>
<ReturnValue>
<ReturnType>System.String</ReturnType>
</ReturnValue>
<Docs>
<summary>Represents the namespace URI for NVDL instance.</summary>
<remarks>The value is http://purl.oclc.org/dsdl/nvdl/ns/instance/1.0 .</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Holds constants for several NVDL related namespace URIs.</summary>
<remarks>To be added.</remarks>
</Docs>
</Type>
@@ -1,26 +0,0 @@
<Type Name="NvdlAction" FullName="Commons.Xml.Nvdl.NvdlAction">
<TypeSignature Language="C#" Value="public abstract class NvdlAction : Commons.Xml.Nvdl.NvdlAttributable" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>Commons.Xml.Nvdl.NvdlAttributable</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="protected NvdlAction ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>Default constructor for NVDL "action" element.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Represents "action" element of NVDL grammar object model.</summary>
<remarks>This class represents NVDL "action" element. For the entire NVDL grammar, see http://www.asahi-net.or.jp/~eb2m-mrt/dsdl/fcd/nvdl-fcd.pdf .</remarks>
</Docs>
</Type>
@@ -1,77 +0,0 @@
<Type Name="NvdlActionList" FullName="Commons.Xml.Nvdl.NvdlActionList">
<TypeSignature Language="C#" Value="public class NvdlActionList : System.Collections.CollectionBase" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>System.Collections.CollectionBase</BaseTypeName>
</Base>
<Interfaces />
<Attributes>
<Attribute>
<AttributeName>System.Reflection.DefaultMember(MemberName="Item")</AttributeName>
</Attribute>
</Attributes>
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public NvdlActionList ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>The default constructor.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Add">
<MemberSignature Language="C#" Value="public void Add (Commons.Xml.Nvdl.NvdlAction item);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="item" Type="Commons.Xml.Nvdl.NvdlAction" />
</Parameters>
<Docs>
<param name="item">NVDL "action" element to add.</param>
<summary>Adds an "action" to this collection.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Remove">
<MemberSignature Language="C#" Value="public void Remove (Commons.Xml.Nvdl.NvdlAction item);" />
<MemberType>Method</MemberType>
<ReturnValue>
<ReturnType>System.Void</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="item" Type="Commons.Xml.Nvdl.NvdlAction" />
</Parameters>
<Docs>
<param name="item">Target NVDL "action" item to remove.</param>
<summary>Removes an NVDL "action" from this collection.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Item">
<MemberSignature Language="C#" Value="public Commons.Xml.Nvdl.NvdlAction Item[int i] { set; get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>Commons.Xml.Nvdl.NvdlAction</ReturnType>
</ReturnValue>
<Parameters>
<Parameter Name="i" Type="System.Int32" />
</Parameters>
<Docs>
<param name="i">Index to the target "action".</param>
<summary>Gets or sets the target "action" element.</summary>
<value>The target "action" element.</value>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Typed collection for <see cref="T:Commons.Xml.Nvdl.NvdlAction" />.</summary>
<remarks>This class is a collection for <see cref="T:Commons.Xml.Nvdl.NvdlAction" />.</remarks>
</Docs>
</Type>
@@ -1,26 +0,0 @@
<Type Name="NvdlAllow" FullName="Commons.Xml.Nvdl.NvdlAllow">
<TypeSignature Language="C#" Value="public class NvdlAllow : Commons.Xml.Nvdl.NvdlNoResultAction" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>Commons.Xml.Nvdl.NvdlNoResultAction</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public NvdlAllow ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>The default constructor.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Represents an NVDL "allow" element.</summary>
<remarks>This class represents NVDL "allow" element. For the entire NVDL grammar, see http://www.asahi-net.or.jp/~eb2m-mrt/dsdl/fcd/nvdl-fcd.pdf .</remarks>
</Docs>
</Type>
@@ -1,26 +0,0 @@
<Type Name="NvdlAnyNamespace" FullName="Commons.Xml.Nvdl.NvdlAnyNamespace">
<TypeSignature Language="C#" Value="public class NvdlAnyNamespace : Commons.Xml.Nvdl.NvdlRule" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>Commons.Xml.Nvdl.NvdlRule</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public NvdlAnyNamespace ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>The default constructor.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Represents an NVDL "anyNamespace" element.</summary>
<remarks>This class represents NVDL "allow" element. For the entire NVDL grammar, see http://www.asahi-net.or.jp/~eb2m-mrt/dsdl/fcd/nvdl-fcd.pdf .</remarks>
</Docs>
</Type>
@@ -1,26 +0,0 @@
<Type Name="NvdlAttach" FullName="Commons.Xml.Nvdl.NvdlAttach">
<TypeSignature Language="C#" Value="public class NvdlAttach : Commons.Xml.Nvdl.NvdlResultAction" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>Commons.Xml.Nvdl.NvdlResultAction</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public NvdlAttach ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>The default constructor.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Represents an NVDL "attach" element.</summary>
<remarks>This class represents NVDL "attach" element. For the entire NVDL grammar, see http://www.asahi-net.or.jp/~eb2m-mrt/dsdl/fcd/nvdl-fcd.pdf .</remarks>
</Docs>
</Type>
@@ -1,26 +0,0 @@
<Type Name="NvdlAttachPlaceHolder" FullName="Commons.Xml.Nvdl.NvdlAttachPlaceHolder">
<TypeSignature Language="C#" Value="public class NvdlAttachPlaceHolder : Commons.Xml.Nvdl.NvdlResultAction" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>Commons.Xml.Nvdl.NvdlResultAction</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public NvdlAttachPlaceHolder ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>The default constructor.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Represents an NVDL "attachPlaceHolder" element.</summary>
<remarks>This class represents NVDL "attachPlaceHolder" element. For the entire NVDL grammar, see http://www.asahi-net.or.jp/~eb2m-mrt/dsdl/fcd/nvdl-fcd.pdf .</remarks>
</Docs>
</Type>
@@ -1,38 +0,0 @@
<Type Name="NvdlAttributable" FullName="Commons.Xml.Nvdl.NvdlAttributable">
<TypeSignature Language="C#" Value="public class NvdlAttributable : Commons.Xml.Nvdl.NvdlElementBase" />
<AssemblyInfo>
<AssemblyName>Commons.Xml.Relaxng</AssemblyName>
<AssemblyVersion>1.0.5000.0</AssemblyVersion>
</AssemblyInfo>
<Base>
<BaseTypeName>Commons.Xml.Nvdl.NvdlElementBase</BaseTypeName>
</Base>
<Interfaces />
<Members>
<Member MemberName=".ctor">
<MemberSignature Language="C#" Value="public NvdlAttributable ();" />
<MemberType>Constructor</MemberType>
<Parameters />
<Docs>
<summary>The default constructor.</summary>
<remarks>To be added.</remarks>
</Docs>
</Member>
<Member MemberName="Foreign">
<MemberSignature Language="C#" Value="public System.Collections.ArrayList Foreign { get; };" />
<MemberType>Property</MemberType>
<ReturnValue>
<ReturnType>System.Collections.ArrayList</ReturnType>
</ReturnValue>
<Docs>
<summary>Holds the all foreign attributes.</summary>
<value>A list that holds the entire foreign attributes.</value>
<remarks>This list holds the entire foreign attributes. Here "foreign" means those attributes whose namespace URI is neither empty nor NVDL structure namespace (see <see cref="F:Commons.Xml.Nvdl.Nvdl.NvdlNamespace" />). </remarks>
</Docs>
</Member>
</Members>
<Docs>
<summary>Represents an abstract NVDL element that can hold foreign attribute.</summary>
<remarks>This class represents an abstract NVDL element that can hold foreign attribute. Here "foreign" means those attributes whose namespace URI is neither empty nor NVDL structure namespace (see <see cref="F:Commons.Xml.Nvdl.Nvdl.NvdlNamespace" />). For the entire NVDL grammar, see http://www.asahi-net.or.jp/~eb2m-mrt/dsdl/fcd/nvdl-fcd.pdf .</remarks>
</Docs>
</Type>
Loaded 100 of 12536 files, more files were not shown because too many files have changed in this diff. Show more