Compare commits

...
87 Commits
Author SHA1 Message Date
Sebastien Pouliot 939994df00 Security fix for CVE-2009-0217
svn path=/branches/mono-1-1-7/mcs/; revision=137892
2009-07-14 18:45:45 +00:00
Marek Habersack ed260f19c0 Second part of fix for bug #416620
svn path=/branches/mono-1-1-7/mcs/; revision=111125
2008-08-20 14:25:57 +00:00
Marek Habersack d6f416c95c Security fix for bug #418620
svn path=/branches/mono-1-1-7/mcs/; revision=111116
2008-08-20 13:17:33 +00:00
Marek Habersack e1a3756f40 Fix for CVE-2008-3422
svn path=/branches/mono-1-1-7/mcs/; revision=110136
2008-08-11 18:14:00 +00:00
Wade Berrier 59b851169a * TempFileCollection.cs: Bring in changes from HEAD for serialization
security fix:
       * r51229: Added a call to GC.SuppressFinalize in Dispose.
       * r52181: Changed BasePath property to use Path.
       GetTempPath (Environment check) and added the PathDiscovery check on
       the combined result. Fixed TempDir so it's value never change (i.e.
       imply that it doesn't need any permissions). Fixed SyncRoot to always
       return null.
       * r57836: Implement explicitly some interface methods to get rid of
       the "!" errors on CorCompare.
       * r60253: Make sure generated file names are unique. Fixes bug #76125
       and #78230.
       * r65441: Create files in a temporary subdirectory, for security reasons.


svn path=/branches/mono-1-1-7/mcs/; revision=66301
2006-10-05 18:14:24 +00:00
Zoltan Varga 41a166ca3b Fix uses of thread_id.
svn path=/branches/mono-1-1-7/mcs/; revision=60969
2006-05-22 22:19:52 +00:00
Zoltan Varga c0d4f65464 2006-05-22 Zoltan Varga <[email protected]>
* Thread.cs: Change thread_id to int64 to match the unmanaged structure.

svn path=/branches/mono-1-1-7/mcs/; revision=60968
2006-05-22 21:09:55 +00:00
Zoltan Varga e852497fec 2006-05-22 Zoltan Varga <[email protected]>
* threads.c (start_wrapper): Fix a missed guint32 tid declaration.

svn path=/branches/mono-1-1-7/mono/; revision=60967
2006-05-22 20:31:24 +00:00
Wade Berrier da175f964d version bump
svn path=/branches/mono-1-1-7/mono/; revision=60864
2006-05-19 15:18:07 +00:00
Dick Porter 3356b8ef5b The rest of the guint32 -> gsize thread ID changes, merged from head.
svn path=/branches/mono-1-1-7/mono/; revision=60785
2006-05-17 16:02:38 +00:00
Dick Porter e7a9cf4290 Merge thread ID size (guint32 to gsize) changes from HEAD, that should
have happened when I upgraded io-layer.


svn path=/branches/mono-1-1-7/mono/; revision=60755
2006-05-16 21:06:19 +00:00
Wade Berrier 2dd8006e8e version bump
svn path=/branches/mono-1-1-7/mono/; revision=60747
2006-05-16 19:10:42 +00:00
Gonzalo Paniagua Javier 5e91900f3f follow redirect for POST/PUT. Backported
svn path=/branches/mono-1-1-7/mcs/; revision=60053
2006-04-28 19:49:25 +00:00
Gonzalo Paniagua Javier e1ff2e3273 2006-04-27 Gonzalo Paniagua Javier <[email protected]>
* WebConnection.cs: reset the challenge and the status code when
	creating the tunnel and sending the proxy auth. headers. Improve error
	message when there's an error creating the tunnel.
	* HttpWebRequest.cs: don't trigger an early throw for a POST that gets
	a 401 or 407 response.


svn path=/branches/mono-1-1-7/mcs/; revision=60024
2006-04-28 00:49:46 +00:00
Gonzalo Paniagua Javier 82a073d1fd 2006-04-26 Gonzalo Paniagua Javier <[email protected]>
* WebConnectionData.cs:
	* WebConnection.cs:
	* HttpWebRequest.cs: when tunneling an ssl conneciton through a proxy,
	we were not handling a proxy authentication request. Fixes bug #78150
	take 2.


svn path=/branches/mono-1-1-7/mcs/; revision=59954
2006-04-26 21:18:46 +00:00
Sebastien Pouliot f36935c25f 2006-04-21 Sebastien Pouliot <[email protected]>
* SslCipherSuite.cs: Enable abbreviated handshakes for SSL3 too.


svn path=/branches/mono-1-1-7/mcs/; revision=59748
2006-04-21 12:57:07 +00:00
Gonzalo Paniagua Javier 6dcaf35e8d 2006-04-20 Gonzalo Paniagua Javier <[email protected]>
* WebProxy.cs: a .ctor was not forwarding the 'credentials' argument.
	This fixes bug #78150. Also fix the bypass check for local requests.


svn path=/branches/mono-1-1-7/mcs/; revision=59717
2006-04-20 22:51:04 +00:00
Sebastien Pouliot 51518c4512 fixes to server code and to the bad cache problem (#78085) from HEAD
svn path=/branches/mono-1-1-7/mcs/; revision=59404
2006-04-12 15:45:17 +00:00
Wade Berrier 5ae7b4d5a6 commit the rest of 52792 for relocation (fix build error)
svn path=/branches/mono-1-1-7/mono/; revision=58678
2006-03-28 21:30:00 +00:00
Gonzalo Paniagua Javier 72f709e2e9 backport of r52816
svn path=/branches/mono-1-1-7/mono/; revision=58675
2006-03-28 20:40:18 +00:00
Sebastien Pouliot 3660c95005 backport of the latest SSL changes in 1.1.7.x
svn path=/branches/mono-1-1-7/mcs/; revision=58621
2006-03-27 21:26:07 +00:00
Dick Porter ef18e88bb5 2006-03-27 Dick Porter <[email protected]>
* shared.c (_wapi_shm_file_open): Break out of a loop if the
        shared file is smaller than expected.  (We loop a few times in
        case another process is in the middle of creating the file.)



svn path=/branches/mono-1-1-7/mono/; revision=58567
2006-03-27 11:37:48 +00:00
Dick Porter 18459ec2fc Put the semaphore fix on this branch
svn path=/branches/mono-1-1-7/mono/; revision=58463
2006-03-24 17:53:10 +00:00
Dick Porter 95e7382eac Bring io-layer up to date on this branch. Fixes bug 77881 (and many
more)


svn path=/branches/mono-1-1-7/mono/; revision=58389
2006-03-23 21:14:00 +00:00
Wade Berrier c467ec2b80 Oops
svn path=/branches/mono-1-1-7/mono/; revision=52362
2005-10-28 23:48:55 +00:00
Wade Berrier f16a7dac65 Make wrappers and .pc files relocatable.
Also bump version

svn path=/branches/mono-1-1-7/mono/; revision=52334
2005-10-28 16:36:28 +00:00
Wade Berrier e58091343c Miguel's patch to allow mono to be relocatable.
svn path=/branches/mono-1-1-7/mono/; revision=52333
2005-10-28 16:34:39 +00:00
Wade Berrier e8db9d08c0 Bump version for tagging
svn path=/branches/mono-1-1-7/mono/; revision=51535
2005-10-10 22:40:54 +00:00
Gonzalo Paniagua Javier daeb7fea07 svn path=/branches/mono-1-1-7/mcs/; revision=51376 2005-10-06 21:55:11 +00:00
Gonzalo Paniagua Javier 8dc6646de1 svn path=/branches/mono-1-1-7/mcs/; revision=51375 2005-10-06 21:54:22 +00:00
Gonzalo Paniagua Javier 5cc9a85197 svn path=/branches/mono-1-1-7/mcs/; revision=51361 2005-10-06 19:24:11 +00:00
Gonzalo Paniagua Javier 50b479ee20 svn path=/branches/mono-1-1-7/mcs/; revision=51360 2005-10-06 19:23:09 +00:00
Gonzalo Paniagua Javier 61f495df7d 2005-09-05 Gonzalo Paniagua Javier <[email protected]>
* mini.c: ignore SIGPIPE.


svn path=/branches/mono-1-1-7/mono/; revision=49501
2005-09-05 18:37:16 +00:00
Wade Berrier 9fe352c95d Version bump for 1.1.7.10
svn path=/branches/mono-1-1-7/mono/; revision=47728
2005-07-27 00:00:43 +00:00
Gonzalo Paniagua Javier b0b51607e6 forms cookie from HEAD
svn path=/branches/mono-1-1-7/mcs/; revision=47703
2005-07-26 14:50:10 +00:00
Wade Berrier db8b68eb75 Version bump
svn path=/branches/mono-1-1-7/mono/; revision=47442
2005-07-19 22:07:48 +00:00
Ben Maurer 12e29d9432 merge from head
svn path=/branches/mono-1-1-7/mono/; revision=47438
2005-07-19 21:29:27 +00:00
Atsushi Eno d983140876 2005-07-09 Atsushi Enomoto <[email protected]>
backporting culture-info-table bugfixes from trunk.


svn path=/branches/mono-1-1-7/mono/; revision=47131
2005-07-09 05:11:28 +00:00
Wade Berrier 4163439d14 Bump version for 1.1.7.8
svn path=/branches/mono-1-1-7/mono/; revision=47120
2005-07-08 20:36:16 +00:00
Miguel de Icaza 0ad160d0c4 2005-06-21 Dick Porter <[email protected]>
* mutex-private.h:
        * thread-private.h:
        * mutexes.c: 
        * threads.c: Keep a list of owned mutexes in each thread handle,
        so that it is easier to abandon them when the thread exits.
        Removes a bottleneck when multiple threads are finishing in
        parallel.


svn path=/branches/mono-1-1-7/mono/; revision=47119
2005-07-08 20:28:01 +00:00
Miguel de Icaza c0b161af97 2005-05-16 Gonzalo Paniagua Javier <[email protected]>
* FileStream.cs: make WriteByte work in all cases when no buffer
	is being used. Fixes bug #74971.
 
ue May 17 10:54:18 CEST 2005 Paolo Molaro <[email protected]>
 
	* FileStream.cs: complete fix for #74971.

svn path=/branches/mono-1-1-7/mcs/; revision=47118
2005-07-08 20:26:42 +00:00
Ben Maurer 6d6fe902e3 2005-07-05 Ben Maurer <[email protected]>
* pthread_stop_world.c (pthread_start_world, _GC_suspend_handler):
	Make sure that all threads have been started before releasing the
	GC_lock. Otherwise, the thread table can be corrupt in the restart
	handler, causing deadlocks and segfaults.


svn path=/branches/mono-1-1-7/mono/; revision=46964
2005-07-05 18:46:47 +00:00
Wade Berrier 475bb6ed37 Bump revision
svn path=/branches/mono-1-1-7/mono/; revision=46388
2005-06-22 20:11:00 +00:00
Ben Maurer 00ac514d08 2005-06-22 Ben Maurer <[email protected]>
* reflection.c (mono_reflection_create_runtime_class): Backport
	from head. Prevents deadlocks by taking the domain lock outside of
	the loader lock.


svn path=/branches/mono-1-1-7/mono/; revision=46386
2005-06-22 19:52:49 +00:00
Wade Berrier 212070688a Version bump
svn path=/branches/mono-1-1-7/mono/; revision=46330
2005-06-21 21:38:56 +00:00
Gonzalo Paniagua Javier 1d125695a2 2005-06-21 Gonzalo Paniagua Javier <[email protected]>
* WebConnection.cs: SslClientStream.BeginRead might not be asynchronous
	if there's no record available to read. This is a workaround that makes
	the call to BeginRead itself asynchronous. Fixes bug #75342.


svn path=/branches/mono-1-1-7/mcs/; revision=46329
2005-06-21 21:30:08 +00:00
Wade Berrier cb211e4e89 Version bump for tag
svn path=/branches/mono-1-1-7/mono/; revision=46257
2005-06-20 19:19:59 +00:00
Gonzalo Paniagua Javier 723e38c82c 2005-06-20 Gonzalo Paniagua Javier <[email protected]>
* domain.c:
	* appdomain.c:
	* domain-internals.h:
	* reflection.c: 'domain_assemblies' field is now protected by its own
	lock. Don't call into managed code to run the AssemblyLoad event if we
	now there are no registered delegates for it.


svn path=/branches/mono-1-1-7/mono/; revision=46252
2005-06-20 18:07:16 +00:00
Wade Berrier 669e1211f9 Version bump
svn path=/branches/mono-1-1-7/mono/; revision=46173
2005-06-17 20:33:38 +00:00
Miguel de Icaza a121bd210e Backport to 1-1-7 branch\n 2005-06-17 Zoltan Varga <[email protected]>
* pthread_support.c: Workaround gcc-3.3 compiler bug.

svn path=/branches/mono-1-1-7/mono/; revision=46169
2005-06-17 19:40:10 +00:00
Gonzalo Paniagua Javier 354e6526a6 r45082 from HEAD. Fixes bug #75273
svn path=/branches/mono-1-1-7/mono/; revision=46013
2005-06-15 06:26:19 +00:00
Miguel de Icaza 930459baa1 2005-06-03 Zoltan Varga <[email protected]>
* mini-amd64.c (emit_call): Fix yet another bug in the near call
	optimization.

svn path=/branches/mono-1-1-7/mono/; revision=45868
2005-06-13 14:07:37 +00:00
Gonzalo Paniagua Javier 01ce78e62b 2005-06-10 Gonzalo Paniagua Javier <[email protected]>
* WebConnection.cs:
	* HttpWebRequest.cs:
	* WebConnectionStream.cs: initiate the polling for input data after
	sending the header so that we detect any response that the server sends
	back even if we're still trying to write the request for a POST/PUT.
	If we get the response (or an error) before any one calls GetResponse(),
	keep it around instead of ignoring it.

2005-05-23 Gonzalo Paniagua Javier <[email protected]>

	* WebConnection.cs: prevent 2 nullrefs when the aborting during
	Connect() and reset the status to Success before starting a new
	request.


svn path=/branches/mono-1-1-7/mcs/; revision=45786
2005-06-10 17:58:24 +00:00
Paolo Molaro eb5faf4ab7 Wed Jun 8 19:26:38 CEST 2005 Paolo Molaro <[email protected]>
* object.c: add proper locking in mono_remote_class_vtable(),
	fixes possible memory corruption.


svn path=/branches/mono-1-1-7/mono/; revision=45648
2005-06-08 16:46:05 +00:00
Paolo Molaro 50678d6f8c More bugfixes backport.
2005-06-06  Michael Meeks  <[email protected]>

	* object.c (extend_interface_array): fix really silly
	memory corrupting / comparison bug.


svn path=/branches/mono-1-1-7/mono/; revision=45645
2005-06-08 16:23:58 +00:00
Paolo Molaro 34a6c90b23 Backport some more debug locking changes.
svn path=/branches/mono-1-1-7/mono/; revision=45644
2005-06-08 16:21:05 +00:00
Ben Maurer 8dd4410b05 bump
svn path=/branches/mono-1-1-7/mono/; revision=45392
2005-06-03 22:36:10 +00:00
Gonzalo Paniagua Javier d2cccf33e6 2005-06-03 Gonzalo Paniagua Javier <[email protected]>
* HttpWebRequest.cs: send the right header/user/password in
	PreAuthenticate in presence of a proxy.


svn path=/branches/mono-1-1-7/mcs/; revision=45391
2005-06-03 22:16:07 +00:00
Gonzalo Paniagua Javier 1afaea4eba 2005-06-03 Zoltan Varga <[email protected]>
* mini-amd64.c (emit_call): Fix yet another bug in the near call
	optimization.

	* mini-amd64.c (amd64_patch): Add an assert to check that the
	destination of a call is callable by a near call.


svn path=/branches/mono-1-1-7/mono/; revision=45388
2005-06-03 21:59:03 +00:00
Gonzalo Paniagua Javier 0812c95b98 2005-05-31 Gonzalo Paniagua Javier <[email protected]>
* Win32Exception.cs: add 10049 WSAEADDRNOTAVAIL. Fixes bug #75106.


svn path=/branches/mono-1-1-7/mcs/; revision=45363
2005-06-03 10:36:28 +00:00
Gonzalo Paniagua Javier e415615e81 changelog
svn path=/branches/mono-1-1-7/mcs/; revision=45362
2005-06-03 10:09:52 +00:00
Gonzalo Paniagua Javier 3f03ba2025 2005-06-03 Gonzalo Paniagua Javier <[email protected]>
* ServicePointManager.cs: when going through a proxy, use 2 different
	service points depending on the scheme. Fixes bug #75135.


svn path=/branches/mono-1-1-7/mcs/; revision=45361
2005-06-03 10:09:39 +00:00
Miguel de Icaza 8dbf91bf20 Fix from Dick for 75016
svn path=/branches/mono-1-1-7/mono/; revision=45031
2005-05-26 04:13:53 +00:00
Miguel de Icaza de2c90c4e0 Update on the branch
svn path=/branches/mono-1-1-7/mcs/; revision=44717
2005-05-18 20:08:57 +00:00
Miguel de Icaza f2b7e542a0 Backport of Martin's fixes:
2005-01-24  Martin Baulig  <[email protected]>

	Fix #74978.

	* flowanalysis.cs
	(FlowBranching.Reachability): Add non-static public And() and Or()
	methods.
	(FlowBranchingSwitch): New class; do the `break_origins' thing
	like in FlowBranchingLoop.
	(FlowBranching.UsageVector.MergeBreakOrigins): Also merge the
	reachability, not just locals and parameters.
	(FlowBranching.MergeChild): Remove some of the hacks for loop and
	switch; MergeBreakOrigins() now takes care of that.

2005-05-18  Martin Baulig  <[email protected]>

	* flowanalysis.cs (FlowBranching.UsageVector.MergeChild): If we're
	a loop and may leave it, reset the barrier; fixes #74974.



svn path=/branches/mono-1-1-7/mcs/; revision=44691
2005-05-18 16:43:22 +00:00
Dick Porter 5dc8ca409d 2005-05-17 Dick Porter <[email protected]>
* io.c (file_getfilesize): Clear the error value, so that files
	with sizes with the low bits 0xFFFFFFFF can be distinguished from
	a genuine error.



svn path=/branches/mono-1-1-7/mono/; revision=44641
2005-05-17 19:44:25 +00:00
Ben Maurer ce91af0332 bump
svn path=/branches/mono-1-1-7/mono/; revision=44454
2005-05-12 17:38:46 +00:00
Gonzalo Paniagua Javier 6706112e8b 2005-05-11 Gonzalo Paniagua Javier <[email protected]>
* shared.c: forgot to ignore a warning.


svn path=/branches/mono-1-1-7/mono/; revision=44425
2005-05-12 04:31:14 +00:00
Miguel de Icaza d9162c6073 Backport the Obsolete fix from Marek
svn path=/branches/mono-1-1-7/mcs/; revision=44401
2005-05-11 18:01:45 +00:00
Miguel de Icaza 5bd902eb2f Backport
svn path=/branches/mono-1-1-7/mcs/; revision=44353
2005-05-10 20:48:00 +00:00
Gonzalo Paniagua Javier 899c06b166 2005-05-10 Gonzalo Paniagua Javier <[email protected]>
* SslClientStream.cs: check for the dispose in NetworkReadCallback.
	Patch by Sebastien "Cryptoman" Pouliot.


svn path=/branches/mono-1-1-7/mcs/; revision=44342
2005-05-10 18:36:09 +00:00
Gonzalo Paniagua Javier 98b125bc4e 2005-05-10 Gonzalo Paniagua Javier <[email protected]>
* shared.c: don't display warnings after reboots.


svn path=/branches/mono-1-1-7/mono/; revision=44340
2005-05-10 18:27:18 +00:00
Gonzalo Paniagua Javier 0304982471 r44204 from HEAD. fixes set/getsockopt on windows
svn path=/branches/mono-1-1-7/mono/; revision=44308
2005-05-10 00:50:22 +00:00
Ben Maurer 0e3bb5c75d 2005-05-09 Ben Maurer <[email protected]>
* configure.in: 1.1.7.1


svn path=/branches/mono-1-1-7/mono/; revision=44293
2005-05-09 19:10:54 +00:00
Miguel de Icaza 01e00f43cf 2005-05-05 Gonzalo Paniagua Javier <[email protected]>
* ProcessStringDictionary.cs: on non-windows system, don't make the
	hashtable case-insensitive. Fixes bug #74796.

svn path=/branches/mono-1-1-7/mcs/; revision=44291
2005-05-09 18:05:51 +00:00
Gonzalo Paniagua Javier a04f30944b Last patches on io-layer from Lluis and Dick in HEAD
svn path=/branches/mono-1-1-7/mono/; revision=44210
2005-05-07 22:22:47 +00:00
Miguel de Icaza 85d8b97aa5 From trunk, fixes VB build on Windows 2005-05-06 Zoltan Varga <[email protected]>
* main.c: Respect MONO_PATH when loading assemblies.

svn path=/branches/mono-1-1-7/mono/; revision=44152
2005-05-06 17:43:34 +00:00
Ben Maurer 84c0ba0211 Thu May 5 17:14:27 CEST 2005 Paolo Molaro <[email protected]>
* mono-debug.c: unlock properly: the interface with the debugger will likely
	need to change.

Thu May 5 16:24:43 CEST 2005 Paolo Molaro <[email protected]>

	* mono-debug-debugger.c, mono-debug-debugger.h, mono-debug.c: remove thread
	unsafe code in the debugger lock/unlock functions and always init the debugger
	lock since it's use also when the debugger is not connected.

2005-05-05  Zoltan Varga  <[email protected]>

	* assembly.c (mono_assembly_load_reference): Fix warning.


svn path=/branches/mono-1-1-7/mono/; revision=44089
2005-05-05 15:50:38 +00:00
Miguel de Icaza 7ef2afa6a8 Apply r44061, r44062 from trunk
svn path=/branches/mono-1-1-7/mono/; revision=44063
2005-05-05 05:25:11 +00:00
Miguel de Icaza f7f844aa64 2005-05-04 Miguel de Icaza <[email protected]>
* Enum.cs (MonoEnumInfo): Based on a patch from James Willcox,
	initialize cache as a static method.  Fixes #74828.

svn path=/branches/mono-1-1-7/mcs/; revision=44059
2005-05-05 02:28:20 +00:00
Miguel de Icaza ea0d5e5a7e Apply r44048 and r4405 which fix a multi-app-domain remoting app that might be jitting the same method at the same time
svn path=/branches/mono-1-1-7/mono/; revision=44051
2005-05-04 21:47:19 +00:00
Miguel de Icaza aae51015d3 Apply patch from r44043 to 1-1-7 branch
svn path=/branches/mono-1-1-7/mcs/; revision=44045
2005-05-04 20:32:53 +00:00
Miguel de Icaza 999eedbde2 Apply patch from r44008 fixes, 74817
svn path=/branches/mono-1-1-7/mcs/; revision=44025
2005-05-04 13:40:39 +00:00
Miguel de Icaza 22812f2442 Update
svn path=/branches/mono-1-1-7/mcs/; revision=43998
2005-05-04 03:22:23 +00:00
Miguel de Icaza 40c96c75f8 Update
svn path=/branches/mono-1-1-7/mcs/; revision=43997
2005-05-04 03:22:19 +00:00
Miguel de Icaza 5467fae98f Commit to the branch
svn path=/branches/mono-1-1-7/mono/; revision=43996
2005-05-04 03:21:50 +00:00
Miguel de Icaza 0b70115dbf Backport OSX fix
svn path=/branches/mono-1-1-7/mono/; revision=43988
2005-05-03 22:28:11 +00:00
10324 changed files with 280958 additions and 853439 deletions

No files matched your search

+7 -212
View File
@@ -1,217 +1,12 @@
2005-10-04 Zoltan Varga <[email protected]>
2005-10-28 Wade Berrier <[email protected]>
* configure.in: Fix up problems with the latest libtool on win32.
* mono.pc.in, mint.pc.in, configure.in: Make these relocatable.
* scripts: Makefile.am mono-nunit.pc.in script.in mono-service.in
script2.in. Make all the wrappers relocatable.
2005-09-06 Chris Toshok <toshok@ximian.com>
2005-05-09 Ben Maurer <bmaurer@ximian.com>
* data/browscap.ini: Add the ecmascriptversion/w3cdomversion
attributes required for ASP.Net client side validation to the
capabilities for Mozilla 1.[78], IE 5.5 & 6.0, Safari, and Firefox
0.9 & 1.0 browsers.
2005-08-26 Zoltan Varga <[email protected]>
* configure.in: Add ability to cross-compile from linux to win32.
2005-08-26 Kornél Pál <[email protected]>
* configure.in: Generating Consts.cs from Consts.cs.in instead of MonoVersion.cs.
2005-08-25 Zoltan Varga <[email protected]>
* configure.in: Use CC instead of gcc for __thread tests.
2005-08-25 Zoltan Varga <[email protected]>
* configure.in: Pass --enable-win32-dllmain to libgc configure. Build the runtime as a dll under windows.
2005-08-24 Zoltan Varga <[email protected]>
* configure.in: Add -lunwind to ldflags on IA64.
2005-08-22 Zoltan Varga <[email protected]>
* configure.in: Patch libtool to get rid of 'cyg' prefixes in library names.
2005-08-11 Zoltan Varga <[email protected]>
* libmono.vcproj: Fix VC build.
Thu Aug 4 19:55:33 BST 2005 Paolo Molaro <[email protected]>
* configure.in: enable the ARM jit port.
2005-08-02 Zoltan Varga <[email protected]>
* acconfig.h configure.in: Applied patch from Julien Puydt ([email protected]). Add check for IPV6_PKTINFO.
2005-07-19 Zoltan Varga <[email protected]>
* configure.in: Fix definition of LIBC for ia64.
2005-07-12 Daniel Drake <[email protected]>
* configure.in: Add check for libattr's <attr/attr.h>
2005-07-11 Raja R Harinath <[email protected]>
* scripts/script.in: Add @framework_version@ blank.
* scripts/script2.in: Remove.
* scripts/Makefile.am: Update. Use wsdl.exe for wsdl2 and
monop.exe for monop2.
2005-07-04 Raja R Harinath <[email protected]>
* Makefile.am (EXTRA_DIST): Distribute mono-uninstalled.pc.in.
(noinst_DATA): Build mono-uninstalled.pc.
* mono-uninstalled.pc.in (Libs): Avoid ${pc_top_builddir}.
(Cflags): Likewise. Let $(srcdir) to be absolute.
2005-07-03 Ben Maurer <[email protected]>
* scripts/Makefile.am (bin2_SCRIPTS): Add monop2
2005-07-01 Daniel Drake <[email protected]>
* configure.in: Add check for FreeBSD's sys/extattr.h
2005-07-01 Raja R Harinath <[email protected]>
Avoid resource leakage on 'make clean' (see #75424).
* configure.in (AC_CONFIG_FILES): Add runtime/semdel-wrapper.
* runtime/semdel-wrapper.in: New.
* runtime/Makefile.am (clean-local): Use the semdel program before
nuking the .wapi directory.
(noinst_SCRIPTS): Add semdel-wrapper.
(MYDISTFILES, distdir): Use automake variable to get the list of
files to distribute.
(all-local, install-exec, uninstall): Call semdel-wrapper.
(mcs-do-test-profiles, mcs-do-run-test-profiles, mcs-compileall):
Likewise.
2005-06-27 Geoff Norton <[email protected]>
* configure.in: Add support for X86 darwin.
2005-06-22 Zoltan Varga <[email protected]>
* configure.in: Add support for ia64.
2005-06-20 Gonzalo Paniagua Javier <[email protected]>
* configure.in: enabled the use of mmap/munmap for solaris and linux.
It seems to help with memory usage.
2005-06-15 Ben Maurer <[email protected]>
* configure.in: Another attempt at the portable "find libX11.so"
Hopefully, this one has no code paths where we are worse off than
what we had before any of this mess.
* configure.in: What I hope is a more portable version hack.
2005-06-14 Ben Maurer <[email protected]>
* configure.in: echo the version number to
mcs/build/common/MonoVersion.cs. This allows us to not need to
update AssemblyInfo.cs every time we bump the version number.
* mono-uninstalled.pc.in: pc file that handles mono when it is not
installed. This lets us have mkbundle work inside the tree.
* configure.in: Create the .pc file above.
2005-06-13 Jonathan Pryor <[email protected]>
* man/mono-shlib-cop.1: Add man page for mono-shlib-cop program.
2005-06-13 Jonathan Pryor <[email protected]>
* data/config.in: Fix generated XML.
2005-06-13 Jonathan Pryor <[email protected]>
* scripts/Makefile.am: Add mono-shlib-cop.
2005-06-09 Ben Maurer <[email protected]>
* configure.in: Handle more gracefully if objdump or X isn't
there. Warn the user about possible breakage.
2005-06-08 Ben Maurer <[email protected]>
* configure.in: read the SONAME from libX11. This is the same
thing as will be used by a shared library, so it will really
work.
This will have us get libX11.so.6 rather than libX11.so.6.2.
2005-06-07 Gonzalo Paniagua Javier <[email protected]>
* configure.in: make automake 1.9 happy about LARGE_FILES.
2005-06-06 Jonathan Pryor <[email protected]>
* configure.in: Add checks for mremap, remap_file_pages.
2005-06-06 Ben Maurer <[email protected]>
* mono.spec.in: Remove. This is horribly out of date. A real spec
file is generated in the release module.
* scripts/Makefile.am: Add mono-find-*
* scripts/mono-find-*.in: provides/requires stuff for rpm is now
done with monodis. This makes packaging easier as it doesn't
depend on the gac ind DESTDIR.
* configure.in: changes for the above
2005-05-30 Gonzalo Paniagua Javier <[email protected]>
* configure.in: added test for SIOCGIFCONF.
2005-05-26 Sebastien Pouliot <[email protected]>
* README.vsnet: Instructions about the VS.NET build.
* mono.sln: Mono solution file for VS.NET 2005.
* genmdesc.vcproj: Project file for genmdesc.
* libmono.vcproj: Project file for libmono.
* mono.vcproj: Project file for mono executable.
2005-05-25 Ben Maurer <[email protected]>
* configure.in: Do a test for libX11.so that really works :-).
2005-05-22 Ben Maurer <[email protected]>
* configure.in: Add config stuff for libsqlite{,3} and
libX11.
* data/config.in: Add dllmaps for above mentioned libs. This means
that the devel packages are not needed.
2005-05-17 Zoltan Varga <[email protected]>
* man/mono.1: Document the new MONO_DEBUG options.
2005-05-16 Raja R Harinath <[email protected]>
* configure.in (AC_OUTPUT): Add mono/arch/ia64/Makefile.
2005-05-08 Ben Maurer <[email protected]>
* scripts/Makefile.am (bin_SCRIPTS): monoresgen.exe is not
installed, therefore, don't make a script for it.
2005-05-05 Zoltan Varga <[email protected]>
* configure.in: Applied patch from Jakub Bogusz <[email protected]>.
Fix library names on sparc-linux and alpha-linux.
2005-05-04 Zoltan Varga <[email protected]>
* runtime/Makefile.am: Pass the prefix to the mcs makefiles.
* configure.in: 1.1.7.1
2005-04-28 James Willcox <[email protected]>
@@ -762,7 +557,7 @@ Fri Nov 12 17:56:26 CET 2004 Paolo Molaro <[email protected]>
* runtime/net_2_0/Makefile.am (install-data-local):
* runtime/net_1_1/Makefile.am (install-data-local): Applied patch
from Götz Waschk ([email protected]). Make this work
from Götz Waschk ([email protected]). Make this work
with DESTDIR.
2004-10-31 Zoltan Varga <[email protected]>
+2 -5
View File
@@ -7,9 +7,7 @@ SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts
## 'tools' is not normally built
DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools
vs_files = genmdesc.vcproj libmono.vcproj mono.vcproj mono.sln
EXTRA_DIST= mono.pc.in mint.pc.in mono-uninstalled.pc.in dotnet.pc.in $(vs_files)
EXTRA_DIST= mono.pc.in mono.spec.in mint.pc.in
# Distribute the 'mcs' tree too
dist-hook:
@@ -22,8 +20,7 @@ pkgconfig_DATA= mono.pc mint.pc
else
pkgconfig_DATA= mint.pc
endif
noinst_DATA = mono-uninstalled.pc
DISTCLEANFILES= mono.pc mint.pc mono-uninstalled.pc dotnet.pc
DISTCLEANFILES= mono.pc mint.pc
.PHONY: get-monolite-latest mcs-do-compiler-tests compiler-tests bootstrap-world
+1 -5
View File
@@ -21,10 +21,6 @@ This is Mono.
Available from: http://www.gtk.org/
On Itanium, you must obtain libunwind:
http://www.hpl.hp.com/research/linux/libunwind/download.php4
Optional dependencies:
* libgdiplus
@@ -42,7 +38,7 @@ This is Mono.
make
make install
Mono supports a JIT engine on x86, SPARC, SPARCv9, S/390, AMD64 and PowerPC systems.
Mono supports a JIT engine on x86, SPARC, S/390, AMD64 and PowerPC systems.
If you obtained this as a snapshot, you will need an existing
Mono installation. To upgrade your installation, unpack both
-110
View File
@@ -1,110 +0,0 @@
README.vsnet Last updated: 2005-05-26
SVN now includes a Visual Studio .NET 2005 (beta2) solution, mono.sln,
and some projects files to build most of the unmanaged parts in Mono.
The "mono.sln" solution file contains the VC projects files for:
* Embedded Samples
* test-invoke.vcproj
* test-metadata.vcproj
* teste.vcproj
* Libraries
* libgc.vcproj
* libmono.vcproj
* Tools
* genmdesc.vcproj
* monoburg.vcproj
* monodiet.vcproj
* monodis.vcproj
* monograph.vcproj
* pedump.vcproj
* mono.vcproj
REQUIREMENTS
* A working cygwin (http://www.cygwin.com/) setup! This is required to:
* generate some files (via monoburg and genmdesc);
* build the class libraries; and
* test for regressions.
* Visual Studio .NET 2005 beta2. Previous Visual Studio versions may
work or requires, hopefully minimal, changes.
* VSDependencies.zip must be decompressed under /mono/ (otherwise you
will need to edit all the projects files. This file can be downloaded
from http://www.go-mono.com/archive/VSDependencies.zip
LOCAL CHANGES
Sadly solution/projects files aren't easy to move from computers to
computers (well unless everyone follow the same naming convention) so
you'll likely have to changes some options in order to compile the
solution.
* each executed assembly (i.e. the EXE) must be able to find a
working mscorlib.dll (and all the other required assemblies).
This can be done in different ways. My preference is to use the
project "properties pages" in the "Configuration Properties
\Debugging\Environment" options and set MONO_PATH to the class
libraries directory build by cygwin (local) or on Linux
(remote).
e.g. MONO_PATH=z:\svn\mcs\class\lib\default\
allows me to use the class libs build under Linux, while
MONO_PATH=C:\cygwin\opt\mono\lib\mono\1.0
use the one built from cygwin (after a make install)
Some useful informations to adapt the solution/project files...
* My cygwin root dir is: c:\cygwin\
* My username is: poupou
* My mono install prefix is: /opt/mono
BUILDING
Once everything is installed (and edited) you can right-click on the
"mono" solution (in the "Solution Explorer"), select "Clean
Solution" (for the first time) then "Build Solution".
KNOWN ISSUES
[1] Most, BUT NOT ALL, the regressions tests pass under this build. The
failures seems limited to some mathematical differences and to code
relying on the stack walking functions. The hacks to replace the GCC
functions (__builtin_frame_address and __builtin_return_address) are
incomplete;
[2] The solution doesn't provide complete (i.e. from scratch) build. It
requires a working cygwin environment to create some files (e.g. via
genmdesc, monoburg). This isn't so bad as without cygwin you wouldn't be
able to test Mono properly (see REQUIREMENTS);
[3] Only the Debug target is configured properly (easy to fix). Anyway
there are other issues [1] to fix before switching to Release and IMHO
the _biggest_ advantage to VS.NET is it's debugger/debugging tools;
[4] The C compiler emits _lots_ of warning during compilation. Some
warnings have been turned off for some projects (there was so much that
it slowed down compilation). You can bring them back (or hide more of
them) using the project "properties pages" windows, "Configuration
Properties\C/C++\Advanced\Disable Specific Warnings";
[5] Visual Studio 2005 should have all the latest header files required,
but if not (or if you're using an older version of VS) then install MS
Platform SDK (Windows Server 2003 is the latest) to ensure you have the
latest Windows header files. You can download it from:
http://www.microsoft.com/msdownload/platformsdk/sdkupdate/psdk-full.htm
[6] Probably a lot more I didn't discover...
MORE INFORMATIONS
Please email <[email protected]> if you have any problem
and/or if there's something wrong/missing in the instructions.
-1
View File
@@ -5,7 +5,6 @@
#undef HAVE_SOL_TCP
#undef HAVE_SOL_IPV6
#undef HAVE_IP_PKTINFO
#undef HAVE_IPV6_PKTINFO
#undef HAVE_STRUCT_IP_MREQN
#undef HAVE_STRUCT_IP_MREQ
#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+42 -151
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,1.1.9.2)
AM_INIT_AUTOMAKE(mono,1.1.7.14)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -25,7 +25,6 @@ dnl
gc_headers=no
gc=included
use_included_gc=no
libgc_configure_args=
if test -d $srcdir/libgc ; then
gc_default=included
@@ -42,6 +41,10 @@ libmono_ldflags=""
AC_SUBST(libmono_cflags)
AC_SUBST(libmono_ldflags)
# Variable to have relocatable .pc files (lib, or lib64)
reloc_libdir=`basename ${libdir}`
AC_SUBST(reloc_libdir)
dnl if linker handles the version script
no_version_script=no
@@ -55,12 +58,12 @@ case "$host" in
*-*-mingw*|*-*-cygwin*)
platform_win32=yes
AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
if test "x$cross_compiling" = "xno"; then
CC="gcc -mno-cygwin -g"
# So libgc configure gets -mno-cygwin
export CC
fi
CC="gcc -mno-cygwin -g"
HOST_CC="gcc"
# So libgc configure gets -mno-cygwin
export CC
# latest libgc already defines GC_WIN32_THREADS
# CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
CPPFLAGS="$CPPFLAGS -DWIN32_THREADS -DFD_SETSIZE=1024"
libdl=
libgc_threads=win32
@@ -68,8 +71,6 @@ case "$host" in
with_nptl=default
with_sigaltstack=no
LN_S=cp
# This forces libgc to use the DllMain based thread registration code on win32
libgc_configure_args="$libgc_configure_args --enable-win32-dllmain=yes"
;;
*-*-*netbsd*)
platform_win32=no
@@ -172,7 +173,7 @@ case "$host" in
;;
*-*-linux*)
platform_win32=no
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT -DUSE_MMAP -DUSE_MUNMAP"
CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
libmono_cflags="-D_REENTRANT"
libmono_ldflags="-lpthread"
libdl="-ldl"
@@ -190,7 +191,7 @@ case "$host" in
;;
*-*-solaris*)
platform_win32=no
CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DUSE_MMAP -DUSE_MUNMAP"
CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
need_link_unlink=yes
libmono_cflags="-D_REENTRANT"
libgc_threads=pthreads
@@ -226,7 +227,6 @@ AC_CHECK_TOOL(CC, gcc, gcc)
AC_PROG_CC
AM_PROG_CC_STDC
AC_PROG_INSTALL
AC_PROG_AWK
dnl We should use AM_PROG_AS, but it's not available on automake/aclocal 1.4
: ${CCAS='$(CC)'}
# Set ASFLAGS if not already set.
@@ -395,19 +395,17 @@ GLIB_REQUIRED_VERSION=1.3.11
PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION)
if test "x$cross_compiling" = "xno"; then
GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
fi
GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0`
GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0`
GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0`
GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0`
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
if test x$platform_win32 = xyes -a x$cross_compiling = xno; then
if test x$platform_win32 = xyes; then
AC_MSG_CHECKING(for cygwin glib2-dev package)
if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then
AC_MSG_RESULT(found)
@@ -458,11 +456,6 @@ if test "x$enable_static" = "xno"; then
with_static_mono=no
fi
if test "x$platform_win32" = "xyes"; then
# Boehm GC requires the runtime to be in its own dll
with_static_mono=no
fi
AM_CONDITIONAL(STATIC_MONO, test x$with_static_mono != xno)
AC_ARG_ENABLE(minimal, [ --enable-minimal=LIST drop support for LIST subsystems.
@@ -569,7 +562,7 @@ if test "x$large_heap" = "xyes"; then
fi
# tell libgc/configure about what we want
ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads $libgc_configure_args"
ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads"
AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
AC_SUBST(LIBGC_CFLAGS)
@@ -614,7 +607,7 @@ if test x$platform_win32 = xno; then
# potential compiler bugs. Defines LARGE_FILE_SUPPORT, adds $1 to
# CPPFLAGS and sets $large_offt to yes if the test succeeds
large_offt=no
AC_DEFUN([LARGE_FILES], [
AC_DEFUN(LARGE_FILES, [
large_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $1"
AC_TRY_RUN([
@@ -731,20 +724,6 @@ if test x$platform_win32 = xno; then
AC_MSG_RESULT(no)
])
dnl *****************************
dnl *** Checks for IPV6_PKTINFO ***
dnl *****************************
AC_MSG_CHECKING(for IPV6_PKTINFO)
AC_TRY_COMPILE([#include <netdb.h>], [
int level = IPV6_PKTINFO;
], [
# Yes, we have it...
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_IPV6_PKTINFO)
], [
AC_MSG_RESULT(no)
])
dnl *********************************
dnl *** Check for struct ip_mreqn ***
dnl *********************************
@@ -1151,35 +1130,11 @@ if test x$platform_win32 = xno; then
AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
fi
dnl ******************************
dnl *** Checks for SIOCGIFCONF ***
dnl ******************************
AC_CHECK_HEADERS(sys/ioctl.h)
AC_CHECK_HEADERS(net/if.h)
AC_MSG_CHECKING(for ifreq)
AC_TRY_COMPILE([
#include <sys/ioctl.h>
#include <net/if.h>
], [
struct ifconf ifc;
struct ifreq *ifr;
void *x;
ifc.ifc_len = 0;
ifc.ifc_buf = NULL;
x = (void *) &ifr->ifr_addr;
],[
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_SIOCGIFCONF, 1, [Can get interface list])
], [
AC_MSG_RESULT(no)
])
dnl **********************************
dnl *** Checks for MonoPosixHelper ***
dnl **********************************
AC_CHECK_HEADERS(checklist.h)
AC_CHECK_HEADERS(fstab.h)
AC_CHECK_HEADERS(attr/xattr.h)
AC_CHECK_HEADERS(sys/extattr.h)
AC_CHECK_HEADERS(sys/sendfile.h)
AC_CHECK_HEADERS(sys/statvfs.h)
AC_CHECK_HEADERS(sys/vfstab.h)
@@ -1190,8 +1145,6 @@ if test x$platform_win32 = xno; then
AC_CHECK_FUNCS(fgetpwent)
AC_CHECK_FUNCS(fgetpwent)
AC_CHECK_FUNCS(getfsstat)
AC_CHECK_FUNCS(mremap)
AC_CHECK_FUNCS(remap_file_pages)
AC_CHECK_FUNCS(posix_fadvise)
AC_CHECK_FUNCS(posix_fallocate)
AC_CHECK_FUNCS(posix_madvise)
@@ -1211,12 +1164,6 @@ if test x$platform_win32 = xno; then
[#include <sys/types.h>
#include <dirent.h>])
dnl Favour xattr through glibc, but use libattr if we have to
AC_CHECK_FUNC(lsetxattr, ,
AC_CHECK_LIB(attr, lsetxattr, XATTR_LIB="-lattr",)
)
AC_SUBST(XATTR_LIB)
dnl *********************************
dnl *** Check for Console 2.0 I/O ***
dnl *********************************
@@ -1388,9 +1335,6 @@ JIT_SUPPORTED=no
INTERP_SUPPORTED=no
LIBC="libc.so.6"
INTL="libc.so.6"
SQLITE="libsqlite.so.0"
SQLITE3="libsqlite3.so.0"
X11="libX11.so"
jit_wanted=false
interp_wanted=false
@@ -1411,16 +1355,6 @@ case "$host" in
JIT_SUPPORTED=yes
jit_wanted=true
;;
ia64-*-*)
TARGET=IA64
arch_target=ia64
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
LIBC="libc.so.6.1"
AC_CHECK_LIB(unwind, _U_dyn_register, [], [AC_MSG_ERROR(library libunwind not found)])
libmono_ldflags="-lunwind"
;;
sparc*-*-*)
if test "x$ac_cv_sizeof_void_p" = "x8"; then
TARGET=SPARC64
@@ -1430,12 +1364,8 @@ case "$host" in
arch_target=sparc;
JIT_SUPPORTED=yes
ACCESS_UNALIGNED="no"
case $host_os in
linux*) ;;
*)
LIBC="libc.so"
INTL="libintl.so"
esac
LIBC="libc.so"
INTL="libintl.so"
jit_wanted=true
if test x"$GCC" = xyes; then
CFLAGS="$CFLAGS -Wno-cast-align"
@@ -1448,15 +1378,23 @@ case "$host" in
INTERP_SUPPORTED=yes
interp_wanted=true
arch_target=alpha;
case $host_os in
linux*)
LIBC="libc.so.6.1"
INTL="libc.so.6.1"
esac
;;
*-*-mingw*|*-*-cygwin*)
INTL="intl"
;;
# ia64-*-linux* | ia64-*-hpux*)
# TARGET=IA64;
# arch_target=ia64;
# JIT_SUPPORTED=no;
# ACCESS_UNALIGNED="no";
# case "$host_os" in
# linux*) LIBC="libc.so.6.1";;
# hpux*) LIBC="libc.so.1";;
# esac
# ;;
# m68k-*-linux*)
# TARGET=M68K
# ;;
hppa2.0w-hp-hpux11.00 | hppa64-hp-hpux11.00)
TARGET=HPPA;
arch_target=hppa;
@@ -1480,12 +1418,12 @@ case "$host" in
JIT_SUPPORTED=yes
jit_wanted=true
;;
arm*-linux*)
arm-*-linux-* | armv4l-*-linux-*)
TARGET=ARM;
arch_target=arm;
ACCESS_UNALIGNED="no"
JIT_SUPPORTED=yes
jit_wanted=true
INTERP_SUPPORTED=yes
interp_wanted=true
;;
s390-*-linux*)
TARGET=S390;
@@ -1532,7 +1470,7 @@ if test x$JIT_SUPPORTED = xyes; then
fi
fi
else
if test x$interp_wanted = xtrue; then
if $interp_wanted; then
jit_status="interpreter"
else
AC_ERROR(No JIT or interpreter support available or selected.)
@@ -1544,13 +1482,10 @@ AM_CONDITIONAL(USE_JIT, test x$USEJIT = xtrue)
libsuffix=".so"
case "$host" in
*-*-darwin*)
powerpc-*-darwin*)
libsuffix=".dylib"
LIBC="libc.dylib"
INTL="libintl.dylib"
SQLITE="libsqlite.0.dylib"
SQLITE3="libsqlite3.0.dylib"
X11="libX11.dylib"
;;
*-*-*netbsd*)
LIBC="libc.so.12"
@@ -1564,25 +1499,7 @@ case "$host" in
LIBC="libc.so"
INTL="libintl.so"
;;
*-*-*linux*)
AC_PATH_X
AC_MSG_CHECKING(for the soname of libX11.so)
for i in $x_libraries /usr/lib /usr/lib64; do
for r in 4 5 6; do
if test -f $i/libX11.so.$r; then
X11=libX11.so.$r
AC_MSG_RESULT($X11)
fi
done
done
if test "x$X11" = "xlibX11.so"; then
AC_MSG_WARN([Could not find X development libs. Do you have the -devel package installed? WinForms may not work...]);
fi
;;
esac
AC_SUBST(libsuffix)
if test "x$TARGET" != "xAMD64"; then
@@ -1599,8 +1516,8 @@ if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
#
rm -f conftest.c conftest.so conftest
echo "static __thread int foo; void main () { foo = 5; }" > conftest.c
$CC -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
$CC -o conftest conftest.so > /dev/null 2>&1
gcc -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
gcc -o conftest conftest.so > /dev/null 2>&1
if test ! -f conftest; then
AC_MSG_WARN([Disabling usage of __thread.]);
with_tls=pthread
@@ -1682,9 +1599,6 @@ AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
AC_SUBST(LIBC)
AC_SUBST(INTL)
AC_SUBST(SQLITE)
AC_SUBST(SQLITE3)
AC_SUBST(X11)
AC_SUBST(arch_target)
AC_SUBST(CFLAGS)
@@ -1711,7 +1625,6 @@ AC_SUBST(mono_cfg_dir)
AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper])
AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
[ depth=../../../..
@@ -1745,11 +1658,7 @@ AC_OUTPUT([
Makefile
mint.pc
mono.pc
dotnet.pc
mono-uninstalled.pc
scripts/mono-nunit.pc
scripts/mono-find-provides
scripts/mono-find-requires
mono/Makefile
mono/utils/Makefile
mono/metadata/Makefile
@@ -1768,7 +1677,6 @@ mono/arch/s390/Makefile
mono/arch/s390x/Makefile
mono/arch/arm/Makefile
mono/arch/alpha/Makefile
mono/arch/ia64/Makefile
mono/interpreter/Makefile
mono/tests/Makefile
mono/tests/tests-config
@@ -1790,20 +1698,12 @@ data/net_2_0/Makefile
samples/Makefile
support/Makefile
data/config
mono.spec
tools/Makefile
tools/locale-builder/Makefile
runtime/Makefile
])
if test x$platform_win32 = xyes; then
# Get rid of 'cyg' prefixes in library names
sed -e "s/\/cyg\//\/\//" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
# libtool seems to inherit -mno-cygwin from our CFLAGS, and uses it to compile its executable
# wrapper scripts which use exec(). gcc has no problem compiling+linking this, but the resulting
# executable doesn't work...
sed -e "s,-mno-cygwin,,g" libtool > libtool.new; mv libtool.new libtool; chmod 755 libtool
fi
(
case $prefix in
NONE) prefix=$ac_default_prefix ;;
@@ -1822,15 +1722,6 @@ fi
echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
export VERSION
[myver=$($AWK 'BEGIN {
split (ENVIRON["VERSION"] ".0.0.0", vsplit, ".")
print vsplit [1] "." vsplit [2] "." vsplit [3] "." vsplit [4]
}')]
# Generate Consts.cs
sed -e "s/@MONO_VERSION@/$myver/" $srcdir/$mcsdir/build/common/Consts.cs.in > $srcdir/$mcsdir/build/common/Consts.cs
)
libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}
+4911 -5179
View File
File diff suppressed because it is too large. Load diff
-4
View File
@@ -9,8 +9,4 @@
<dllmap dll="db2cli" target="libdb2_36@libsuffix@"/>
<dllmap dll="msvcrt" target="@LIBC@"/>
<dllmap dll="MonoPosixHelper" target="libMonoPosixHelper@libsuffix@"/>
<dllmap dll="sqlite" target="@SQLITE@"/>
<dllmap dll="sqlite3" target="@SQLITE3@"/>
<dllmap dll="libX11" target="@X11@"/>
<dllmap dll="libcairo-2.dll" target="libcairo.so.2"/>
</configuration>
+60 -60
View File
@@ -3,64 +3,64 @@
<configuration>
<configSections>
<section name="appSettings" type="System.Configuration.NameValueFileSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="strongNames" type="System.Configuration.IgnoreSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="appSettings" type="System.Configuration.NameValueFileSectionHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.diagnostics" type="System.Diagnostics.DiagnosticsConfigurationHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.runtime.remoting" type="System.Configuration.IgnoreSectionHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<section name="strongNames" type="System.Configuration.IgnoreSectionHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowLocation="false"/>
<sectionGroup name="system.web">
<section name="httpHandlers"
type="System.Web.Configuration.HttpHandlersSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.HttpHandlersSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpModules"
type="System.Web.Configuration.HttpModulesConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.HttpModulesConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="machineKey"
type="System.Web.Configuration.MachineKeyConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.MachineKeyConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="authentication"
type="System.Web.Configuration.AuthenticationConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.AuthenticationConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="authorization"
type="System.Web.Configuration.AuthorizationConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.AuthorizationConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="globalization"
type="System.Web.Configuration.GlobalizationConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.GlobalizationConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="sessionState"
type="System.Web.SessionState.SessionStateSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.SessionState.SessionStateSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="trace"
type="System.Web.Configuration.TraceConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.TraceConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="webServices"
type="System.Web.Services.Configuration.WebServicesConfigurationSectionHandler, System.Web.Services, Version=2.0.0.0 Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Services.Configuration.WebServicesConfigurationSectionHandler, System.Web.Services, Version=2.0.3600.0 Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="webControls"
type="System.Web.Configuration.WebControlsSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.WebControlsSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="compilation"
type="System.Web.Configuration.CompilationConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.CompilationConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="httpRuntime"
type="System.Web.Configuration.HttpRuntimeConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.HttpRuntimeConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="customErrors"
type="System.Web.Configuration.CustomErrorsConfigHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
type="System.Web.Configuration.CustomErrorsConfigHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<section name="pages"
type="System.Web.Configuration.PagesConfigurationHandler, System.Web, Version=2.0.0.0, Culture=neutral" />
type="System.Web.Configuration.PagesConfigurationHandler, System.Web, Version=2.0.3600.0, Culture=neutral" />
<section name="clientTarget"
type="System.Web.Configuration.ClientTargetSectionHandler, System.Web, Version=2.0.0.0, Culture=neutral" />
type="System.Web.Configuration.ClientTargetSectionHandler, System.Web, Version=2.0.3600.0, Culture=neutral" />
</sectionGroup>
<sectionGroup name="system.net">
<section name="settings"
type="System.Net.Configuration.NetConfigurationHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="System.Net.Configuration.NetConfigurationHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="connectionManagement"
type="System.Net.Configuration.ConnectionManagementHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="System.Net.Configuration.ConnectionManagementHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="authenticationModules"
type="System.Net.Configuration.NetAuthenticationModuleHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="System.Net.Configuration.NetAuthenticationModuleHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="defaultProxy"
type="System.Net.Configuration.DefaultProxyHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="System.Net.Configuration.DefaultProxyHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="webRequestModules"
type="System.Net.Configuration.WebRequestModuleHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="System.Net.Configuration.WebRequestModuleHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</sectionGroup>
<section name="system.drawing" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<section name="system.drawing" type="System.Configuration.NameValueSectionHandler, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</configSections>
<system.net>
<connectionManagement>
<add address="*" maxconnection="2" />
</connectionManagement>
<authenticationModules>
<add type="System.Net.BasicClient, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.DigestClient, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.NtlmClient, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.BasicClient, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.DigestClient, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add type="System.Net.NtlmClient, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</authenticationModules>
<defaultProxy>
<proxy />
@@ -68,9 +68,9 @@
<!-- usessystemdefault is not supported -->
</defaultProxy>
<webRequestModules>
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="http" type="System.Net.HttpRequestCreator, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="https" type="System.Net.HttpRequestCreator, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<add prefix="file" type="System.Net.FileWebRequestCreator, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</webRequestModules>
<settings>
<ipv6 enabled="false"/>
@@ -78,25 +78,25 @@
</system.net>
<system.web>
<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="*.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" />
<add verb="GET" path="WebResource.axd" type="System.Web.Handlers.AssemblyResourceLoader, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="Trace.axd" type="System.Web.Handlers.TraceHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.aspx" type="System.Web.UI.PageHandlerFactory, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asmx" validate="false" type="System.Web.Services.Protocols.WebServiceHandlerFactory, System.Web.Services, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ashx" type="System.Web.UI.SimpleHandlerFactory, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="GET" path="WebResource.axd" type="System.Web.Handlers.AssemblyResourceLoader, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.asax" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.ascx" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.config" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.cs" type="System.Web.HttpForbiddenHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*.rem" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="*" path="*.soap" type="System.Runtime.Remoting.Channels.Http.HttpRemotingHandlerFactory, System.Runtime.Remoting, Culture=neutral, PublicKeyToken=b77a5c561934e089" validate="false" />
<add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*" type="System.Web.HttpMethodNotAllowedHandler, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="GET,HEAD" path="*" type="System.Web.StaticFileHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add verb="*" path="*" type="System.Web.HttpMethodNotAllowedHandler, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</httpHandlers>
<httpModules>
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="Session" type="System.Web.SessionState.SessionStateModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule, System.Web, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="FormsAuthentication" type="System.Web.Security.FormsAuthenticationModule, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="UrlAuthorization" type="System.Web.Security.UrlAuthorizationModule, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="Session" type="System.Web.SessionState.SessionStateModule, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<add name="OutputCache" type="System.Web.Caching.OutputCacheModule, System.Web, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
</httpModules>
<authentication mode="Forms">
<forms name=".MONOAUTH" loginUrl="login.aspx" protection="All" timeout="30" path="/">
@@ -127,10 +127,10 @@
<compilation debug="false" defaultLanguage="c#" explicit="true" strict="false" >
<compilers>
<compiler language="cs;c#;csharp" extension=".cs" warningLevel="1" compilerOptions=""
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="Microsoft.CSharp.CSharpCodeProvider, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<compiler language="vb;vbs;visualbasic;vbscript" extension=".vb"
warningLevel="1" compilerOptions=""
type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
type="Microsoft.VisualBasic.VBCodeProvider, System, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</compilers>
<assemblies>
<!--<add assembly="mscorlib" /> -->
@@ -169,22 +169,22 @@
</channels>
</application>
<channels>
<channel id="http" type="System.Runtime.Remoting.Channels.Http.HttpChannel, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http client" type="System.Runtime.Remoting.Channels.Http.HttpClientChannel, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http server" type="System.Runtime.Remoting.Channels.Http.HttpServerChannel, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp" type="System.Runtime.Remoting.Channels.Tcp.TcpChannel, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp client" type="System.Runtime.Remoting.Channels.Tcp.TcpClientChannel, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp server" type="System.Runtime.Remoting.Channels.Tcp.TcpServerChannel, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http" type="System.Runtime.Remoting.Channels.Http.HttpChannel, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http client" type="System.Runtime.Remoting.Channels.Http.HttpClientChannel, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="http server" type="System.Runtime.Remoting.Channels.Http.HttpServerChannel, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp" type="System.Runtime.Remoting.Channels.Tcp.TcpChannel, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp client" type="System.Runtime.Remoting.Channels.Tcp.TcpClientChannel, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<channel id="tcp server" type="System.Runtime.Remoting.Channels.Tcp.TcpServerChannel, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</channels>
<channelSinkProviders>
<clientProviders>
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapClientFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryClientFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapClientFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryClientFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</clientProviders>
<serverProviders>
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapServerFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryServerFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<provider id="wsdl" type="System.Runtime.Remoting.MetadataServices.SdlChannelSinkProvider, System.Runtime.Remoting, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="soap" type="System.Runtime.Remoting.Channels.SoapServerFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<formatter id="binary" type="System.Runtime.Remoting.Channels.BinaryServerFormatterSinkProvider, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<provider id="wsdl" type="System.Runtime.Remoting.MetadataServices.SdlChannelSinkProvider, System.Runtime.Remoting, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
</serverProviders>
</channelSinkProviders>
</system.runtime.remoting>
@@ -204,7 +204,7 @@
<cryptographySettings>
<cryptoNameMapping>
<cryptoClasses>
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
<cryptoClass monoMD2="Mono.Security.Cryptography.MD2Managed, Mono.Security, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
</cryptoClasses>
<nameEntry name="MD2" class="monoMD2" />
</cryptoNameMapping>
-5
View File
@@ -1,5 +0,0 @@
Name: Standard libraries in a .NET setup
Description: References all the standard .NET libraries for compilation
Version: @VERSION@
Libs: -r:Accessibility.dll -r:cscompmgd.dll -r:Microsoft.JScript.dll -r:Microsoft.VisualBasic.dll -r:Microsoft.VisualC.dll -r:Microsoft.Vsa.dll -r:System.Configuration.Install.dll -r:System.Data.dll -r:System.Data.OracleClient.dll -r:System.Design.dll -r:System.DirectoryServices.dll -r:System.dll -r:System.Drawing.Design.dll -r:System.Drawing.dll -r:System.EnterpriseServices.dll -r:System.Management.dll -r:System.Messaging.dll -r:System.Runtime.Remoting.dll -r:System.Runtime.Serialization.Formatters.Soap.dll -r:System.Security.dll -r:System.ServiceProcess.dll -r:System.Web.dll -r:System.Web.Services.dll -r:System.Windows.Forms.dll -r:System.Xml.dll
-316
View File
@@ -1,316 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="genmdesc"
ProjectGUID="{B7098DFA-31E6-4006-8A15-1C9A4E925149}"
RootNamespace="genmdesc"
SignManifests="true"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="./VSDependancies/temp/genmdesc/Debug"
IntermediateDirectory="./VSDependancies/temp/genmdesc/Debug"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\./VSDependancies/genmdesc___Win32_Debug/genmdesc.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\libgc\include;.\;&quot;.\VSDependancies\include\glib-2.0\glib&quot;;.\VSDependancies\include;.\mono\;.\mono\jit;&quot;C:\Program Files\Microsoft SDK\include&quot;"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__"
MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\./VSDependancies/temp/genmdesc___Win32_Debug/genmdesc.pch"
AssemblerListingLocation=".\./VSDependancies/temp/genmdesc___Win32_Debug/"
ObjectFile=".\./VSDependancies/temp/genmdesc___Win32_Debug/"
ProgramDataBaseFileName=".\./VSDependancies/temp/genmdesc___Win32_Debug/"
BrowseInformation="1"
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="_DEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib glib-2.0.lib gmodule-2.0.lib"
OutputFile=".\./VSDependancies/genmdesc___Win32_Debug/genmdesc.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\VSDependancies\lib"
GenerateDebugInformation="true"
ProgramDatabaseFile=".\./VSDependancies/genmdesc___Win32_Debug/genmdesc.pdb"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\./VSDependancies/temp/genmdesc___Win32_Debug/genmdesc.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\Release/genmdesc.tlb"
HeaderFileName=""
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories=".\libgc\include,.\,.\VSDependancies\include\glib-2.0\glib,.\VSDependancies\include,.\mono\,.\mono\jit"
PreprocessorDefinitions="NDEBUG;WIN32;_CONSOLE;__WIN32__;HAVE_CONFIG_H;__i386__"
StringPooling="true"
RuntimeLibrary="0"
EnableFunctionLevelLinking="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/genmdesc.pch"
AssemblerListingLocation=".\Release/"
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
SuppressStartupBanner="true"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib glib-2.0.lib"
OutputFile=".\Release/genmdesc.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
AdditionalLibraryDirectories=".\VSDependancies\lib"
ProgramDatabaseFile=".\Release/genmdesc.pdb"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
SuppressStartupBanner="true"
OutputFile=".\Release/genmdesc.bsc"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
>
<File
RelativePath="mono\mini\genmdesc.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="mono\mini\helpers.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="mono\utils\monobitset.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
<File
RelativePath="mono\metadata\opcodes.c"
>
<FileConfiguration
Name="Debug|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
BrowseInformation="1"
/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32"
>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
UsePrecompiledHeader="0"
/>
</FileConfiguration>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
-5
View File
@@ -1,8 +1,3 @@
2005-06-08 Ben Maurer <[email protected]>
* Makefile.am: Avoid versioning. We aren't going to be a strongly
versioned lib.
2005-05-03 Zoltan Varga <[email protected]>
* os.c: Update from the official version.
-2
View File
@@ -4,5 +4,3 @@ INCLUDES = $(GMODULE_CFLAGS)
lib_LTLIBRARIES = libikvm-native.la
libikvm_native_la_SOURCES = jni.c os.c jni.h
libikvm_native_la_LDFLAGS = -avoid-version
+1 -62
View File
@@ -1,47 +1,3 @@
2005-08-24 Zoltan Varga <[email protected]>
* win32_threads.c: If GC_INSIDE_DLL is defined, define the DllMain function for automatic registration
of threads with the GC.
* configure.in: Add an option for turning GC_INSIDE_DLL on.
2005-08-25 Zoltan Varga <[email protected]>
* solaris_threads.c (GC_thread_register_foreign): Add dummy implementation.
Mon Aug 22 10:41:41 BST 2005 Paolo Molaro <[email protected]>
* include/private/gc_locks.h: make gcc generate correct code for swp
(patch by [email protected], Tomi Valkeinen).
2005-08-20 Zoltan Varga <[email protected]>
* include/private/gc_locks.h: Fix compilation of GC_test_and_set on IA64 with gcc-3.3.5.
Thu Aug 18 18:08:54 CEST 2005 Paolo Molaro <[email protected]>
* include/private/gcconfig.h: use LINUX_STACKBOTTOM on ARM Linux.
Mon Aug 1 16:49:45 CEST 2005 Paolo Molaro <[email protected]>
* include/private/pthread_support.h, pthread_support.c: added
patch to support registering new threads at runtime (from
Michael Meeks <[email protected]>).
2005-07-07 Raja R Harinath <[email protected]>
* Makefile.am (INCLUDES): Add $(top_builddir)/.. to pick up mono's
config.h.
Thu Jul 7 12:15:22 CEST 2005 Paolo Molaro <[email protected]>
* pthread_support.c: fix compilation when TLS_ALLOC is not defined.
Thu Jul 7 11:59:42 CEST 2005 Paolo Molaro <[email protected]>
* pthread_support.c, Makefile.am: make the __thread var use
fast access if available (and avoid dlopen issue, bug #75390).
2005-07-05 Ben Maurer <[email protected]>
* pthread_stop_world.c (pthread_start_world, _GC_suspend_handler):
@@ -49,26 +5,9 @@ Thu Jul 7 11:59:42 CEST 2005 Paolo Molaro <[email protected]>
GC_lock. Otherwise, the thread table can be corrupt in the restart
handler, causing deadlocks and segfaults.
2005-06-22 Zoltan Varga <[email protected]>
* include/private/gcconfig.h: Fix amd64 build.
2005-06-21 Ben Maurer <[email protected]>
* configure.host: remove -fexceptions, messes up with nptl
includes, as on fc4.
2005-06-17 Zoltan Varga <[email protected]>
* pthread_support.c: Workaround gcc-3.3 compiler bug.
2005-05-26 Sebastien Pouliot <[email protected]>
* libgc.vcproj: Project file for libgc.
2005-05-19 Zoltan Varga <[email protected]>
* configure.in: Handle i386-*-linux* as well. Fixes #74960.
* pthread_support.c: Workaround gcc-3.3 compiler bug.
Tue May 3 16:28:26 CEST 2005 Paolo Molaro <[email protected]>
-2
View File
@@ -22,8 +22,6 @@ AUTOMAKE_OPTIONS = foreign
SUBDIRS = include doc
INCLUDES = -I$(top_builddir)/.. -I$(top_srcdir)/..
#
# libtool is not capable of creating shared/static versions of a convenience
# library, so we have to do it ourselves
+3
View File
@@ -21,7 +21,10 @@
gc_cflags=""
# We should set -fexceptions if we are using gcc and might be used
# inside something like gcj. This is the zeroth approximation:
if test :"$GCC": = :yes: ; then
gc_cflags="${gc_cflags} -fexceptions"
else
case "$host" in
hppa*-*-hpux* )
+1 -8
View File
@@ -49,10 +49,6 @@ esac
THREADS=$with_libgc_threads
AC_ARG_ENABLE(win32-dllmain,
[ --enable-win32-dllmain Define the DllMain function in win32_threads.c even if the collector is not built as a dll],
)
AC_ARG_ENABLE(parallel-mark,
[ --enable-parallel-mark parallelize marking and free list construction],
[case "$THREADS" in
@@ -76,7 +72,7 @@ case "$THREADS" in
THREADS=posix
THREADLIBS=-lpthread
case "$host" in
x86-*-linux* | ia64-*-linux* | i386-*-linux* | i486-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux* | s390*-*-linux* | powerpc-*-linux*)
x86-*-linux* | ia64-*-linux* | i586-*-linux* | i686-*-linux* | x86_64-*-linux* | alpha-*-linux* | s390*-*-linux* | powerpc-*-linux*)
AC_DEFINE(GC_LINUX_THREADS)
AC_DEFINE(_REENTRANT)
if test "${enable_parallel_mark}" = yes; then
@@ -173,9 +169,6 @@ case "$THREADS" in
AC_DEFINE(GC_WIN32_THREADS)
dnl Wine getenv may not return NULL for missing entry
AC_DEFINE(NO_GETENV)
if test "${enable_win32_dllmain}" = yes; then
AC_DEFINE(GC_INSIDE_DLL)
fi
;;
dgux386)
THREADS=dgux386
+2 -2
View File
@@ -108,7 +108,7 @@
# ifndef __INTEL_COMPILER
__asm__ __volatile__("xchg4 %0=%1,%2"
: "=r"(oldval), "=m"(*addr)
: "r"(n) : "memory");
: "r"(n), "1"(*addr) : "memory");
# else
oldval = _InterlockedExchange(addr, n);
# endif
@@ -224,7 +224,7 @@
* this code will likely need to be updated. */
/* See linuxthreads/sysdeps/arm/pt-machine.h in glibc-2.1 */
__asm__ __volatile__("swp %0, %1, [%2]"
: "=&r"(oldval)
: "=r"(oldval)
: "r"(1), "r"(addr)
: "memory");
return oldval;
+1 -3
View File
@@ -1752,7 +1752,7 @@
# endif
# ifdef LINUX
# define OS_TYPE "LINUX"
# define LINUX_STACKBOTTOM
# define HEURISTIC1
# undef STACK_GRAN
# define STACK_GRAN 0x10000000
# define USE_GENERIC_PUSH_REGS
@@ -1832,9 +1832,7 @@
# ifdef LINUX
# define OS_TYPE "LINUX"
# define LINUX_STACKBOTTOM
# ifndef USE_MMAP
# define FALLBACK_TO_MMAP
# endif
# if !defined(GC_LINUX_THREADS) || !defined(REDIRECT_MALLOC)
# define MPROTECT_VDB
# else
-3
View File
@@ -33,7 +33,6 @@ typedef struct GC_Thread_Rep {
# define FINISHED 1 /* Thread has exited. */
# define DETACHED 2 /* Thread is intended to be detached. */
# define MAIN_THREAD 4 /* True for the original thread only. */
# define FOREIGN_THREAD 8 /* Will not be de-registered by us */
short thread_blocked; /* Protected by GC lock. */
/* Treated as a boolean value. If set, */
/* thread will acquire GC lock before */
@@ -92,8 +91,6 @@ extern GC_bool GC_thr_initialized;
GC_thread GC_lookup_thread(pthread_t id);
void *GC_thread_deregister_foreign (void *data);
void GC_stop_init();
extern GC_bool GC_in_thread_creation;
-281
View File
@@ -1,281 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8.00"
Name="libgc"
ProjectGUID="{EB56000B-C80B-4E8B-908D-D84D31B517D3}"
RootNamespace="libgc"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../VSDependancies/temp/libgc/Debug"
IntermediateDirectory="../VSDependancies/temp/libgc/Debug"
ConfigurationType="4"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=".\include\"
PreprocessorDefinitions="GC_THREADS;WIN32_THREADS;GC_WIN32_THREADS;GC_NOT_DLL;GC_GCJ_SUPPORT;WIN32;_DEBUG;_LIB;_WINDOWS;__WIN32__;__i386__;PLATFORM_WIN32;SILENT;ALL_INTERIOR_POINTERS;__STDC__"
MinimalRebuild="TRUE"
BasicRuntimeChecks="3"
RuntimeLibrary="1"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
CompileAs="1"
DisableSpecificWarnings="4311;4312;4996;4005"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
OutputFile="..\libgc.lib"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="Release"
IntermediateDirectory="Release"
ConfigurationType="4"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="2"
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
BufferSecurityCheck="TRUE"
UsePrecompiledHeader="0"
WarningLevel="3"
Detect64BitPortabilityProblems="TRUE"
DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLibrarianTool"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="Source Files"
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
<File
RelativePath=".\allchblk.c"
>
</File>
<File
RelativePath=".\alloc.c"
>
</File>
<File
RelativePath=".\blacklst.c"
>
</File>
<File
RelativePath=".\dbg_mlc.c"
>
</File>
<File
RelativePath=".\dyn_load.c"
>
</File>
<File
RelativePath=".\finalize.c"
>
</File>
<File
RelativePath=".\gcj_mlc.c"
>
</File>
<File
RelativePath=".\headers.c"
>
</File>
<File
RelativePath=".\mach_dep.c"
>
</File>
<File
RelativePath=".\malloc.c"
>
</File>
<File
RelativePath=".\mallocx.c"
>
</File>
<File
RelativePath=".\mark.c"
>
</File>
<File
RelativePath=".\mark_rts.c"
>
</File>
<File
RelativePath=".\misc.c"
>
</File>
<File
RelativePath=".\new_hblk.c"
>
</File>
<File
RelativePath=".\obj_map.c"
>
</File>
<File
RelativePath=".\os_dep.c"
>
</File>
<File
RelativePath=".\ptr_chck.c"
>
</File>
<File
RelativePath=".\reclaim.c"
>
</File>
<File
RelativePath=".\stubborn.c"
>
</File>
<File
RelativePath=".\typd_mlc.c"
>
</File>
<File
RelativePath=".\win32_threads.c"
>
</File>
</Filter>
<Filter
Name="Header Files"
Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
RelativePath=".\include\gc.h"
>
</File>
<File
RelativePath=".\include\private\gc_hdrs.h"
>
</File>
<File
RelativePath=".\include\private\gc_locks.h"
>
</File>
<File
RelativePath=".\include\gc_mark.h"
>
</File>
<File
RelativePath=".\include\private\gc_pmark.h"
>
</File>
<File
RelativePath=".\include\private\gc_priv.h"
>
</File>
<File
RelativePath=".\include\private\gcconfig.h"
>
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
+15 -73
View File
@@ -168,17 +168,9 @@ void GC_init_parallel();
/* We don't really support thread-local allocation with DBG_HDRS_ALL */
/* work around a dlopen issue (bug #75390), undefs to avoid warnings with redefinitions */
#undef PACKAGE_BUGREPORT
#undef PACKAGE_NAME
#undef PACKAGE_STRING
#undef PACKAGE_TARNAME
#undef PACKAGE_VERSION
#include "mono/utils/mono-compiler.h"
static
#ifdef USE_COMPILER_TLS
__thread MONO_TLS_FAST
__thread
#endif
GC_key_t GC_thread_key;
@@ -221,20 +213,6 @@ static void return_freelists(ptr_t *fl, ptr_t *gfl)
/* we arrange for those to fault asap.) */
static ptr_t size_zero_object = (ptr_t)(&size_zero_object);
void GC_delete_thread(pthread_t id);
void *GC_thread_deregister_foreign (void *data)
{
GC_thread me = (GC_thread)data;
/* GC_fprintf1( "\n\n\n\n --- Deregister %x ---\n\n\n\n\n", me->flags ); */
if (me -> flags & FOREIGN_THREAD) {
LOCK();
/* GC_fprintf0( "\n\n\n\n --- FOO ---\n\n\n\n\n" ); */
GC_delete_thread(me->id);
UNLOCK();
}
}
/* Each thread structure must be initialized. */
/* This call must be made from the new thread. */
/* Caller holds allocation lock. */
@@ -243,7 +221,7 @@ void GC_init_thread_local(GC_thread p)
int i;
if (!keys_initialized) {
if (0 != GC_key_create(&GC_thread_key, GC_thread_deregister_foreign)) {
if (0 != GC_key_create(&GC_thread_key, 0)) {
ABORT("Failed to create key for local allocator");
}
keys_initialized = TRUE;
@@ -582,7 +560,7 @@ volatile GC_thread GC_threads[THREAD_TABLE_SZ];
* gcc-3.3.6 miscompiles the &GC_thread_key+sizeof(&GC_thread_key) expression so
* put it into a separate function.
*/
# if defined(__GNUC__) && defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
# ifdef __GNUC__
static __attribute__((noinline)) unsigned char* get_gc_thread_key_addr GC_PROTO((void))
{
return (unsigned char*)&GC_thread_key;
@@ -1215,14 +1193,15 @@ WRAP_FUNC(pthread_detach)(pthread_t thread)
GC_bool GC_in_thread_creation = FALSE;
typedef void *(*ThreadStartFn)(void *);
void * GC_start_routine_head(void * arg, void *base_addr,
ThreadStartFn *start, void **start_arg )
void * GC_start_routine(void * arg)
{
int dummy;
struct start_info * si = arg;
void * result;
GC_thread me;
pthread_t my_pthread;
void *(*start)(void *);
void *start_arg;
my_pthread = pthread_self();
# ifdef DEBUG_THREADS
@@ -1245,7 +1224,7 @@ void * GC_start_routine_head(void * arg, void *base_addr,
/* one for the main thread. There is a strong argument that that's */
/* a kernel bug, but a pervasive one. */
# ifdef STACK_GROWS_DOWN
me -> stack_end = (ptr_t)(((word)(base_addr) + (GC_page_size - 1))
me -> stack_end = (ptr_t)(((word)(&dummy) + (GC_page_size - 1))
& ~(GC_page_size - 1));
# ifndef GC_DARWIN_THREADS
me -> stop_info.stack_ptr = me -> stack_end - 0x10;
@@ -1253,7 +1232,7 @@ void * GC_start_routine_head(void * arg, void *base_addr,
/* Needs to be plausible, since an asynchronous stack mark */
/* should not crash. */
# else
me -> stack_end = (ptr_t)((word)(base_addr) & ~(GC_page_size - 1));
me -> stack_end = (ptr_t)((word)(&dummy) & ~(GC_page_size - 1));
me -> stop_info.stack_ptr = me -> stack_end + 0x10;
# endif
/* This is dubious, since we may be more than a page into the stack, */
@@ -1265,56 +1244,19 @@ void * GC_start_routine_head(void * arg, void *base_addr,
/* from /proc, but the hook to do so isn't there yet. */
# endif /* IA64 */
UNLOCK();
if (start) *start = si -> start_routine;
if (start_arg) *start_arg = si -> arg;
start = si -> start_routine;
# ifdef DEBUG_THREADS
GC_printf1("start_routine = 0x%lx\n", start);
# endif
start_arg = si -> arg;
sem_post(&(si -> registered)); /* Last action on si. */
/* OK to deallocate. */
pthread_cleanup_push(GC_thread_exit_proc, 0);
# if defined(THREAD_LOCAL_ALLOC) && !defined(DBG_HDRS_ALL)
LOCK();
GC_init_thread_local(me);
UNLOCK();
# endif
return me;
}
int GC_thread_register_foreign (void *base_addr)
{
struct start_info si = { 0, }; /* stacked for legibility & locking */
GC_thread me;
GC_printf1( "GC_thread_register_foreign %p\n", &si );
si.flags = FOREIGN_THREAD;
if (!parallel_initialized) GC_init_parallel();
LOCK();
if (!GC_thr_initialized) GC_thr_init();
UNLOCK();
me = GC_start_routine_head(&si, base_addr, NULL, NULL);
return me != NULL;
}
void * GC_start_routine(void * arg)
{
int dummy;
struct start_info * si = arg;
void * result;
GC_thread me;
ThreadStartFn start;
void *start_arg;
me = GC_start_routine_head (arg, &dummy, &start, &start_arg);
pthread_cleanup_push(GC_thread_exit_proc, 0);
# ifdef DEBUG_THREADS
GC_printf1("start_routine = 0x%lx\n", start);
# endif
result = (*start)(start_arg);
#if DEBUG_THREADS
GC_printf1("Finishing thread 0x%x\n", pthread_self());
-6
View File
@@ -635,12 +635,6 @@ int GC_thread_is_registered (void)
return ptr ? 1 : 0;
}
int GC_thread_register_foreign (void *base_addr)
{
/* FIXME: */
return 0;
}
/* Solaris 2/Intel uses an initial stack size limit slightly bigger than the
SPARC default of 8 MB. Account for this to warn only if the user has
raised the limit beyond the default.
+1 -7
View File
@@ -74,13 +74,7 @@ extern LONG WINAPI GC_write_fault_handler(struct _EXCEPTION_POINTERS *exc_info);
int GC_thread_is_registered (void)
{
#if defined(GC_DLL) || defined(GC_INSIDE_DLL)
/* Registered by DllMain */
return 1;
#else
/* FIXME: */
return 0;
#endif
}
/*
@@ -759,7 +753,7 @@ int GC_pthread_detach(pthread_t thread)
* We avoid acquiring locks here, since this doesn't seem to be preemptable.
* Pontus Rydin suggests wrapping the thread start routine instead.
*/
#if defined(GC_DLL) || defined(GC_INSIDE_DLL)
#ifdef GC_DLL
BOOL WINAPI DllMain(HINSTANCE inst, ULONG reason, LPVOID reserved)
{
switch (reason) {
-2208
View File
File diff suppressed because it is too large. Load diff
+1 -2
View File
@@ -1,7 +1,6 @@
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
macpack.1 mkbundle.1 dtd2xsd.1 permview.1 prj2make.1 mono-service.1
EXTRA_DIST = $(man_MANS)
-146
View File
@@ -1,146 +0,0 @@
.TH "al" 1
.SH NAME
ilasm \- Mono Assembly Linker
.SH SYNOPSIS
.B al [option] [source-files]
.SH DESCRIPTION
AL is the Mono assembly linkder.
.SH OPTIONS
.TP
.B @<filename>
Read response file for more options.
.TP
.B -algid:<id>
Algorithm used to hash files. The <id> must be specified in hexadecimal.
.TP
.B -base:<addr> | -baseaddress:<addr>
Base address for the library. THIS FEATURE ISN'T IMPLEMENTED.
.TP
.B -bugreport:<filename>
Create a 'Bug Report' file. THIS FEATURE ISN'T IMPLEMENTED.
.TP
.B -comp:<text> | -company:<text>
This inserts the company name into the assembly metadata.
This is equivalent to adding the [AssemblyCompany ("<text>")] attribute
into C# source code.
.TP
.B -config:<text> | -configuration:<text>
This inserts the configuration string into the assembly metadata.
This is equivalent to adding the [AssemblyConfiguration ("<text>")]
attribute into C# source code.
.TP
.B -copy:<text> | -copyright:<text>
This inserts the copyright message into the assembly metadata.
This is equivalent to adding the [AssemblyCopyright ("<text>")]
attribute into C# source code.
.TP
.B -c:<text> | -culture:<text>
This inserts the supported culture into the assembly metadata.
This is equivalent to adding the [AssemblyCulture ("<text>")]
attribute into C# source code.
.TP
.B -delay | -delay+ | -delaysign | -delaysign+
The generated assembly will be delay signed.
This is equivalent to adding the [AssemblyDelaySignAttribute (true)]
attribute into C# source code.
.TP
.B -delay- | -delaysign-
The generated assembly will be fully signed (i.e. not delay signed).
This is the default option when signing (-keyfile or -keyname).
.TP
.B -descr:<text> | -description:<text>
This inserts a description of the assembly into the assembly metadata.
This is equivalent to adding the [AssemblyDescription ("<text>")]
attribute into C# source code.
.TP
.B -e:<filename> | -evidence:<filename>
This embed into the assembly the specified file as assembly security
evidences.
.TP
.B -fileversion:<version>
Optional Win32 version. This overrides the normal assembly version.
.TP
.B -flags:<flags>
Assembly flags. The <flags> must be specified in hexadecimal.
.TP
.B -fullpaths
Display files using fully-qualified filenames.
.TP
.B -keyf:<filename> | -keyfile:<filename>
Strongname (sign) the output assembly using the key pair present in
the specified strong name key file (snk). A full key pair is required
unless the delay signing option is also specified (-delay+).
This is equivalent to adding the [AssemblyKeyFile ("<text>")]
attribute into C# source code.
.TP
.B -keyn:<text> | -keyname:<text>
Strongname (sign) the output assembly using the key pair present in
the specified container. Delay signing isn't supported when using key
containers.
This is equivalent to adding the [AssemblyKeyName ("<text>")]
attribute into C# source code.
.TP
.B -main:<method>
Specifies the method name of the assembly entry point.
.TP
.B -nologo
Suppress the startup banner and copyright message.
.TP
.B -out:<filename>
Output file name for the assembly manifest.
.TP
.B -prod:<text> | product:<text>
This inserts the product name into the assembly metadata.
This is equivalent to adding the [AssemblyProduct ("<text>")]
attribute into C# source code.
.TP
.B -productv[ersion]:<text>
This inserts the product version into the assembly metadata.
This is equivalent to adding the [AssemblyInformationalVersion ("<text>")]
attribute into C# source code.
.TP
.B -t[arget]:<target> | -target=<target>
Valid <target>s are:
.B lib | library
to create a library (.dll),
.B exe
to create a console executable (.exe), and
.B win | winexe
to create a Windows executable (.exe).
.TP
.B -template:<filename>
Specifies an assembly to get default options from.
.TP
.B -title:<text>
This inserts an assembly title into the assembly metadata.
This is equivalent to adding the [AssemblyTitle ("<text>")]
attribute into C# source code.
.TP
.B -trade:<text> | -trademark:<text>
This inserts a trademark message into the assembly metadata.
This is equivalent to adding the [AssemblyTrademark ("<text>")]
attribute into C# source code.
.TP
.B -v:<version> | -version:<version>
This inserts the assembly version into the assembly metadata. You can
use * to auto-generate remaining numbers.
This is equivalent to adding the [AssemblyVersion ("<text>")]
attribute into C# source code.
.TP
.B -win32icon:<filename>
Use this icon for the output.
.TP
.B -win32res:<filename>
Specifies the Win32 resource file.
.TP
.B -? | -help
Display information about AL
.PP
.SH SEE ALSO
sn(1)
.SH COPYRIGHT
Copyright (C) 2005 Novell, Inc (http://www.novell.com)
.SH MAILING LISTS
Visit http://lists.ximian.com/mailman/listinfo/mono-devel-list for details.
.SH WEB SITE
Visit: http://www.mono-project.com for details
+2 -8
View File
@@ -1,7 +1,7 @@
.\"
.\" makecert manual page.
.\" Copyright 2003 Motus Technologies
.\" Copyright 2004-2005 Novell
.\" Copyright 2004 Novell
.\" Author:
.\" Sebastien Pouliot ([email protected])
.\"
@@ -107,12 +107,6 @@ issued under this authority.
.I "-eku oid[,oid]"
Add some extended key usage OID to the certificate.
.TP
.I "-p12 pkcs12file password"
Create a new PKCS#12 file containing both the certificates (the subject and
possibly the issuer's) and the private key. The PKCS#12 file is protected
with the specified password. This option is
.B mono exclusive.
.TP
.I "-?"
Help (display this help message)
.TP
@@ -159,7 +153,7 @@ Compared to the Windows version some options aren't supported (-$, -d, -l,
Written by Sebastien Pouliot
.SH COPYRIGHT
Copyright (C) 2003 Motus Technologies.
Copyright (C) 2004-2005 Novell.
Copyright (C) 2004 Novell.
Released under BSD license.
.SH MAILING LISTS
Visit http://lists.ximian.com/mailman/listinfo/mono-devel-list for details.
-1
View File
@@ -22,5 +22,4 @@
<manpage name="certmgr" page="certmgr.1" />
<manpage name="xsd" page="xsd.1" />
<manpage name="caspol" page="caspol.1" />
<manpage name="al" page="al.1" />
</manpages>
-10
View File
@@ -85,10 +85,6 @@ Default. Strongname (sign) the assembly using the strong name key file
AssemblyDelaySign (false)] in your source code. Compiler option takes
precedence over the attributes.
.TP
.I \-doc:FILE
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.
@@ -171,12 +167,6 @@ This is typically used with third party components, like this:
$ mcs -pkg:gtk-sharp demo.cs
.fi
.TP
.TP
.I \-pkg:dotnet
This will instruct the compiler to reference the System.* libraries
available on a typical dotnet framework installation, notice that this
does not include all of the Mono libraies, only the System.* ones. This
is a convenient shortcut for those porting code.
.I -resource:RESOURCE[,ID]
Embeds to the given resource file. The optional ID can be used to
give a different name to the resource. If not specified, the resource
-151
View File
@@ -1,151 +0,0 @@
.TH "mono-shlib-cop" 1
.SH NAME
mono-shlib-cop \- Shared Library Usage Checker
.SH SYNOPSIS
.B mono-shlib-cop
[OPTIONS]* [ASSEMBLY-FILE-NAME]*
.SH OPTIONS
.TP
.I \-p, --prefixes=PREFIX
Mono installation prefixes. This is to find $prefix/etc/mono/config.
The default is based upon the location of mscorlib.dll, and is normally
correct.
.PP
.SH DESCRIPTION
.I mono-shlib-cop
is a tool that inspects a managed assembly looking for
erroneous or suspecious behavior of shared libraries.
.PP
The tool takes one or more assembly filenames, and inspects each assembly
specified.
.PP
The errors checked for include:
.TP
*
Does the shared library exist?
.TP
*
Does the requested symbol exist within the shared library?
.PP
The warnings checked for include:
.TP
*
Is the target shared library a versioned library? (Relevant only on Unix
systems, not Mac OS X or Windows.)
.PP
In general, only versioned libraries such as libc.so.6 are present on the
user's machine, and efforts to load libc.so will result in a
System.DllNotFoundException. There are three solutions to this:
.TP
1.
Require that the user install any -devel packages which provide the
unversioned library. This usually requires that the user install a large
number of additional packages, complicating the installation process.
.TP
2.
Use a fully versioned name in your DllImport statements. This requires
editing your source code and recompiling whenever you need to target a
different version of the shared library.
.TP
3.
Provide an assembly.config file which contains <dllmap/> elements to remap
the shared library name used by your assembly to the actual versioned shared
library present on the users system. Mono provides a number of pre-existing
<dllmap/> entries, including libc.so and libX11.so.
.SH EXAMPLE
The following code contains examples of the above errors and warnings:
.nf
using System.Runtime.InteropServices; // for DllImport
class Demo {
[DllImport ("bad-library-name")]
private static extern void BadLibraryName ();
[DllImport ("libc.so")]
private static extern void BadSymbolName ();
[DllImport ("libcap.so")]
private static extern int cap_clear (IntPtr cap_p);
}
.fi
.TP
Bad library name
Assuming that the library
.B bad-library-name
doesn't exist on your machine, Demo.BadLibraryName will generate an error, as
it requires a shared library which doesn't exist.
.TP
Bad symbol name
Demo.BadSymbolName will generate an error, as libc.so (remapped to libc.so.6
by mono's $prefix/etc/mono/config file) doesn't contain the function
BadSymbolName.
.TP
Unversioned library dependency
Assuming you have the file libcap.so, Demo.cap_clear will generate a
warning because, while libcap.so could be loaded, libcap.so might not exist on
the users machine (on FC2, /lib/libcap.so is provided by
.I libcap-devel
, and you can't assume that end users will have any -devel packages installed).
.SH FIXING CODE
The fix depends on the warning or error:
.TP
Bad library names
Use a valid library name in the DllImport attribute, or provide a <dllmap/>
entry to map your existing library name to a valid library name.
.TP
Bad symbol names
Reference a symbol that actually exists in the target library.
.TP
Unversioned library dependency
Provide a <dllmap/> entry to reference a properly versioned library, or ignore
the warning (see
.B BUGS
).
.SH DLLMAP ENTRIES
Mono looks for an
.I ASSEMBLY-NAME
\.config file for each assembly loaded, and reads this file to find Dll
mapping information. For example, with
.I mcs.exe
, Mono would read
.I mcs.exe.config
, and for
.I Mono.Posix.dll
, Mono would read
.I Mono.Posix.dll.config
\.
.PP
The .config file is an XML document containing a top-level <configuration/>
section with nested <dllmap/> entries, which contains
.B dll
and
.B target
attributes. The dll attribute should contain the same string used in your
DllImport attribute value, and the target attribute specifies which shared
library mono should
.I actually
load at runtime.
.PP
A sample .config file is:
.nf
<configuration>
<dllmap dll="gtkembedmoz" target="libgtkembedmoz.so" />
</configuration>
.fi
.SH BUGS
.I mono-shlib-cop
currently only examines the shared library file extension to determine if a
warning should be generated. A
.I .so
extension will always generate a warning, even if the .so is not a symlink,
isn't provided in a -devel package, and there is no versioned shared library
(possible examples including /usr/lib/libtcl8.4.so, /usr/lib/libubsec.so,
etc.).
.PP
Consequently, warnings for any such libraries are useless, and incorrect.
.PP
Windows and Mac OS X will never generate warnings, as these
platforms use different shared library extensions.
.SH MAILING LISTS
Visit http://lists.ximian.com/mailman/listinfo/mono-devel-list for details.
.SH WEB SITE
Visit http://www.mono-project.com for details
+103 -207
View File
@@ -135,9 +135,96 @@ compiled with debugging information, it will produce line number
information for stack traces.
.TP
.I "--profile[=profiler[:profiler_args]]"
Turns on profiling. For more information about profiling applications
and code coverage see the sections "PROFILING" and "CODE COVERAGE"
below.
Instructs the runtime to collect profiling information about execution
times and memory allocation, and dump it at the end of the execution.
If a profiler is not specified, the default profiler is used.
.Sp
Mono has a built-in profiler called `default' (and is also the default
if no arguments are specified), but developers can write custom
profilers as shared libraries. The shared library must be called
`mono-profiler-NAME.so' where `NAME' is the name of your profiler.
.Sp
For a sample of the custom profilers look in the Mono source tree for
in the samples/profiler.c.
.Sp
The
.I profiler_args
is a profiler-specific string of options for the profiler itself.
.Sp
The default profiler is called `default' and it accepts `alloc' to
profile memory consumption by the application; `time' to profile the
time spent on each routine and `stat' to perform sample statistical
profiling. If no options are provided the default is `alloc,time'.
.Sp
For example:
.nf
mono --profile program.exe
.fi
.Sp
That will run the program with the default profiler and will do time
and allocation profiling.
.Sp
.nf
mono --profile=default:stat,alloc program.exe
.fi
Will do sample statistical profiling and allocation profiling on
program.exe.
.TP
.nf
mono --profile=custom program.exe
.fi
.Sp
In the above sample Mono will load the user defined profiler from the
shared library `mono-profiler-custom.so'.
.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.
.TP
.I "--compile name"
This compiles a method (namespace.name:methodname), this is used for
testing the compiler performance or to examine the output of the code
generator.
.TP
.I "--compileall"
Compiles all the methods in an assembly. This is used to test the
compiler performance or to examine the output of the code generator
.TP
.I "--graph=TYPE METHOD"
This generates a postscript file with a graph with the details about
the specified method (namespace.name:methodname). This requires `dot'
and ghostview to be installed (it expects Ghostview to be called
"gv").
.Sp
The following graphs are available:
.nf
cfg Control Flow Graph (CFG)
dtree Dominator Tree
code CFG showing code
ssa CFG showing code after SSA translation
optcode CFG showing code after IR optimizations
.fi
.Sp
Some graphs will only be available if certain optimizations are turned
on.
.TP
.I "--ncompile"
Instruct the runtime on the number of times that the method specified
by --compile (or all the methods if --compileall is used) to be
compiled. This is used for testing the code generator performance.
.TP
.I "-v", "--verbose"
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.).
.TP
.I "--break method"
Inserts a breakpoint before the method whose name is `method'
(namespace.class:methodname). Use `Main' as method name to insert a
breakpoint on the application's main method.
.TP
.I "--breakonex"
Inserts a breakpoint on exceptions. This allows you to debug your
application with a native debugger when an exception is thrown.
.TP
.I "--trace[=expression]"
Shows method names as they are invoked. By default all methods are
@@ -190,170 +277,6 @@ Finally, namespaces can be specified using the N: prefix:
mono --trace=N:System.Xml
.fi
.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.
.TP
.I "--compile name"
This compiles a method (namespace.name:methodname), this is used for
testing the compiler performance or to examine the output of the code
generator.
.TP
.I "--compileall"
Compiles all the methods in an assembly. This is used to test the
compiler performance or to examine the output of the code generator
.TP
.I "--graph=TYPE METHOD"
This generates a postscript file with a graph with the details about
the specified method (namespace.name:methodname). This requires `dot'
and ghostview to be installed (it expects Ghostview to be called
"gv").
.Sp
The following graphs are available:
.nf
cfg Control Flow Graph (CFG)
dtree Dominator Tree
code CFG showing code
ssa CFG showing code after SSA translation
optcode CFG showing code after IR optimizations
.fi
.Sp
Some graphs will only be available if certain optimizations are turned
on.
.TP
.I "--ncompile"
Instruct the runtime on the number of times that the method specified
by --compile (or all the methods if --compileall is used) to be
compiled. This is used for testing the code generator performance.
.TP
.I "-v", "--verbose"
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.).
.TP
.I "--break method"
Inserts a breakpoint before the method whose name is `method'
(namespace.class:methodname). Use `Main' as method name to insert a
breakpoint on the application's main method.
.TP
.I "--breakonex"
Inserts a breakpoint on exceptions. This allows you to debug your
application with a native debugger when an exception is thrown.
.SH PROFILING
The mono runtime includes a profiler that can be used to explore
various performance related problems in your application. The
profiler is activated by passing the --profile command line argument
to the Mono runtime, the format is:
.nf
--profile[=profiler[:profiler_args]]
.fi
Mono has a built-in profiler called 'default' (and is also the default
if no arguments are specified), but developers can write custom
profilers, see the section "CUSTOM PROFILERS" for more details.
.PP
If a
.I profiler
is not specified, the default profiler is used.
.Sp
The
.I profiler_args
is a profiler-specific string of options for the profiler itself.
.Sp
The default profiler accepts the following options 'alloc' to profile
memory consumption by the application; 'time' to profile the time
spent on each routine and 'stat' to perform sample statistical
profiling. If no options are provided the default is 'alloc,time'.
.Sp
For example:
.nf
mono --profile program.exe
.fi
.Sp
That will run the program with the default profiler and will do time
and allocation profiling.
.Sp
.nf
mono --profile=default:stat,alloc program.exe
.fi
Will do sample statistical profiling and allocation profiling on
program.exe.
.SH CUSTOM PROFILERS
Mono provides a mechanism for loading other profiling modules which in
the form of shared libraries. These profiling modules can hook up to
various parts of the Mono runtime to gather information about the code
being executed.
.PP
To use a third party profiler you must pass the name of the profiler
to Mono, like this:
.nf
mono --profile=custom program.exe
.fi
.PP
In the above sample Mono will load the user defined profiler from the
shared library `mono-profiler-custom.so'. This profiler module must
be on your dynamic linker library path.
.PP
A list of other third party profilers is available from Mono's web
site (www.mono-project.com/Performance_Tips)
.PP
Custom profiles are written as shared libraries. The shared library
must be called `mono-profiler-NAME.so' where `NAME' is the name of
your profiler.
.PP
For a sample of how to write your own custom profiler look in the
Mono source tree for in the samples/profiler.c.
.SH CODE COVERAGE
Mono ships with a code coverage module. This module is activated by
using the Mono --profile=cov option. The format is:
.I "--profile=cov[:assembly-name[/namespace]] test-suite.exe"
.PP
By default code coverage will default to all the assemblies loaded,
you can limit this by specifying the assembly name, for example to
perform code coverage in the routines of your program use, for example
the following command line limits the code coverage to routines in the
"demo" assembly:
.nf
mono --profile=cov:demo demo.exe
.fi
.PP
Notice that the
.I assembly-name
does not include the extension.
.PP
You can further restrict the code coverage output by specifying a
namespace:
.nf
mono --profile=cov:demo/My.Utilities demo.exe
.fi
.PP
Which will only perform code coverage in the given assembly and
namespace.
.PP
Typical output looks like this:
.nf
Not covered: Class:.ctor ()
Not covered: Class:A ()
Not covered: Driver:.ctor ()
Not covered: Driver:method ()
Partial coverage: Driver:Main ()
offset 0x000a
.fi
.PP
The offsets displayed are IL offsets.
.SH DEBUGGING
.PP
You can use the MONO_LOG_LEVEL and MONO_LOG_MASK environment variables
@@ -384,9 +307,7 @@ messages set you mask to "asm,cfg".
.PP
The following is a common use to track down problems with P/Invoke:
.nf
$ MONO_LOG_LEVEL="debug" MONO_LOG_MASK="dll" mono glue.exe
.fi
.PP
.SH SERIALIZATION
@@ -435,26 +356,23 @@ environment variable.
.TP
.I "MONO_DEBUG"
If set, enables some features of the runtime useful for debugging.
This variable should contain a comma separated list of debugging options.
Currently, the following options are supported:
.RS
.ne 8
Currently this enables two features: stack traces when interrupting
the process from the shell; Visible error messages on assembly
loading and also to track problems with delegates that are released,
but a reference is kept in unmanaged code.
.TP
.I "keep-delegates"
This option will leak delegate trampolines that are no longer
The stack tracing option makes the runtime display the stack traces
for all the threads running and exit when mono is interrupted (Ctrl-C)
and print some additional messages on error conditions. It may not
exit cleanly. Use at your own risk.
.TP
Also, this option will leak delegate trampolines that are no longer
referenced as to present the user with more information about a
delegate missuse. Basically a delegate instance might be created,
passed to unmanaged code, and no references kept in managed code,
which will garbage collect the code. With this option it is possible
to track down the source of the problems.
.TP
.I "abort-on-sigsegv"
This option will make the runtime abort when it receives a SIGSEGV signal
while executing unmanaged (native) code. This is useful for debugging
problems when interfacing with native code.
.ne
.RE
.TP
.I "MONO_DISABLE_AIO"
If set, tells mono NOT to attempt using native asynchronous I/O services. In
that case, a default select/poll implementation is used. Currently only epoll()
@@ -517,16 +435,12 @@ the permission, more accurate statistics are gathered. The MONO_RTC
value must be restricted to what the linux rtc allows: power of two
from 64 to 8192 Hz. To enable higher frequencies like 4096 Hz, run as root:
.nf
echo 4096 > /proc/sys/dev/rtc/max-user-freq
.fi
.Sp
For example:
.nf
MONO_RTC=4096 mono --profiler=default:stat program.exe
.fi
.TP
.I "MONO_NO_TLS"
@@ -545,27 +459,10 @@ The maximum number of threads in the general threadpool will be
variable is 5.
.TP
.I "MONO_TRACE"
Used for runtime tracing of method calls. The format of the comma separated
trace options is:
.nf
[-]M:method name
[-]N:namespace
[-]T:class name
[-]all
[-]program
disabled Trace output off upon start.
.fi
You can toggle trace output on/off sending a SIGUSR2 signal to the program.
.TP
.I "MONO_TRACE_LISTENER"
If set, enables the System.Diagnostics.DefaultTraceListener, which will
print the output of the System.Diagnostics Trace and Debug classes.
It can be set to a filename, and to Console.Out or Console.Error to display
output to standard output or standard error, respectively. If it's set to
Console.Out or Console.Error you can append an optional prefix that will
be used when writing messages like this: Console.Error:MyProgramName.
output to standard output or standard error, respectively.
See the System.Diagnostics.DefaultTraceListener documentation for more
information.
.TP
@@ -609,10 +506,9 @@ Contains Mono isolated storage for non-roaming users, roaming users and
local machine. Isolated storage can be accessed using the classes from
the System.IO.IsolatedStorage namespace.
.SH MAILING LISTS
Mailing lists are listed at the
http://www.mono-project.com/Mailing_Lists
Visit http://lists.ximian.com/mailman/listinfo/mono-list for details.
.SH WEB SITE
http://www.mono-project.com
Visit: http://www.mono-project.com for details
.SH SEE ALSO
.BR mcs(1), mint(1), monodis(1), mono-config(5), certmgr(1).
.PP
-29
View File
@@ -1,32 +1,3 @@
2005-09-06 Raja R Harinath <[email protected]>
* Makefile (bootstrap): Remove special handling on Win32.
2005-07-11 Raja R Harinath <[email protected]>
* Makefile (centum_tests): Add System.Messaging and
System.ServiceProcess. Remove System.Configuration.Install.
Move Mono.C5 ...
(net_2_0_centum_tests): ... here, and disable it for now.
2005-06-20 Raja R Harinath <[email protected]>
* Makefile (centum_tests): Move System.XML ...
(default_centum_tests): ... here.
2005-06-17 Raja R Harinath <[email protected]>
* Makefile (centum_tests): Add System.XML.
2005-06-10 Sebastien Pouliot <[email protected]>
* Makefile (centum_tests): Added System.Security.
2005-05-20 Raja R Harinath <[email protected]>
* Makefile (centum_tests): Add System.Web and move corlib from ...
(default_centum_tests): ... here.
2005-04-25 Raja R Harinath <[email protected]>
* Makefile (centum_tests): Add Mono.Security and
+8 -11
View File
@@ -10,29 +10,24 @@ net_2_0_SUBDIRS := jay gmcs class nunit20 tests errors tools
# List of test subdirs that should pass 100%
centum_tests := \
class/corlib \
class/System \
class/Commons.Xml.Relaxng \
class/Cscompmgd \
class/Microsoft.JScript \
class/Mono.Posix \
class/Mono.Security \
class/System.Messaging \
class/System.Configuration.Install \
class/System.Runtime.Remoting \
class/System.Runtime.Serialization.Formatters.Soap \
class/System.Security \
class/System.ServiceProcess \
class/System.Web \
class/System.Web.Services \
tests \
errors
# class/System
default_centum_tests := \
$(centum_tests) \
class/System.XML \
class/System.Data
default_centum_tests := \
class/corlib \
$(centum_tests)
net_2_0_centum_tests := $(centum_tests) # class/Mono.C5
net_2_0_centum_tests := $(centum_tests)
ifdef ONLY_CENTUM_TESTS
TEST_SUBDIRS := $($(PROFILE)_centum_tests)
@@ -74,7 +69,9 @@ _boot_ = all clean install
$(_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--default--%
$(_boot_:%=profile-do--default--%): profile-do--default--%: profile-do--net_1_1_bootstrap--%
ifeq (linux, $(PLATFORM))
$(_boot_:%=profile-do--net_1_1_bootstrap--%): profile-do--net_1_1_bootstrap--%: profile-do--basic--%
endif
testcorlib:
@cd class/corlib && $(MAKE) test run-test
-16
View File
@@ -1,19 +1,3 @@
2005-07-10 Kamil Skalski <[email protected]>
* generic.cs: Use MakeGenericType instead of BindGenericParameters.
2005-05-08 Jambunathan K <[email protected]>
* expression.cs (Binary.CheckIsArguments): Added
(Binary.Emit, Binary.CheckArguments): Modified to support 'Is'
operator.
2005-05-08 Jambunathan K <[email protected]>
* convert.cs:
* expression.cs: Miscellaneous fixes relating to
type conversions.
2005-04-10 Jambunathan K <[email protected]>
* First cut changes for suporting Binary Operators. All changes
+1 -1
View File
@@ -1,6 +1,6 @@
<configuration>
<startup>
<supportedRuntime version="v2.0.50215"/>
<supportedRuntime version="v2.0.40607"/>
</startup>
<system.diagnostics>
<trace autoflush="true" indentsize="4">
+3 -3
View File
@@ -208,7 +208,7 @@ namespace Mono.CSharp {
// VB.NET specific: Convert Nothing to value types
Expression e = NothingToPrimitiveTypes (expr, target_type);
Expression e = NothingToPrimitiveConstants (expr, target_type);
if (e != null)
return e;
@@ -1476,7 +1476,7 @@ namespace Mono.CSharp {
return null;
}
static public Constant NothingToPrimitiveTypes (Expression expr, Type target_type)
static public Constant NothingToPrimitiveConstants (Expression expr, Type target_type)
{
NullLiteral null_literal = (NullLiteral) expr;
Location loc = null_literal.Location;
@@ -1498,7 +1498,7 @@ namespace Mono.CSharp {
else if (real_target_type == TypeManager.int32_type)
retval = null_literal.ToInt (loc);
else if (real_target_type == TypeManager.int64_type)
retval = null_literal.ToLong (loc);
null_literal.ToLong (loc);
else if (real_target_type == TypeManager.decimal_type)
retval = null_literal.ToDecimal (loc);
else if (real_target_type == TypeManager.float_type)
+1 -1
View File
@@ -2992,7 +2992,7 @@ namespace Mono.CSharp {
if (gen_params.Length != atypes.Length)
continue;
list.Add (mi.MakeGenericMethod (atypes));
list.Add (mi.BindGenericParameters (atypes));
}
if (list.Count > 0) {
+25 -122
View File
@@ -1942,16 +1942,12 @@ namespace Mono.CSharp {
static string OperName (Operator oper)
{
switch (oper){
case Operator.Exponentiation:
return "^";
case Operator.Multiply:
return "*";
case Operator.Division:
return "/";
case Operator.IntegerDivision:
return "\\";
case Operator.Modulus:
return "Mod";
return "%";
case Operator.Addition:
return "+";
case Operator.Subtraction:
@@ -1969,17 +1965,15 @@ namespace Mono.CSharp {
case Operator.GreaterThanOrEqual:
return ">=";
case Operator.Equality:
return "=";
return "==";
case Operator.Inequality:
return "<>";
case Operator.Like:
return "Like";
return "!=";
case Operator.BitwiseAnd:
return "And";
return "&";
case Operator.BitwiseOr:
return "Or";
return "|";
case Operator.ExclusiveOr:
return "Xor";
return "^";
case Operator.LogicalOrElse:
return "OrElse";
case Operator.LogicalAndAlso:
@@ -2262,7 +2256,6 @@ namespace Mono.CSharp {
void CheckShiftArguments (EmitContext ec)
{
Expression e;
Type assumed_target_type = right.Type;
e = Convert.ImplicitVBConversion (ec, right, TypeManager.int32_type, Location);
if (e == null){
@@ -2280,8 +2273,7 @@ namespace Mono.CSharp {
}
left = target_left_expr;
} else if (left.Type == TypeManager.null_type)
left = Convert.ImplicitVBConversion (ec, left, assumed_target_type, Location);
}
type = left.Type;
@@ -2301,45 +2293,6 @@ namespace Mono.CSharp {
right = new Binary (Binary.Operator.BitwiseAnd, right, new IntLiteral (mask), loc);
right = right.DoResolve (ec);
}
void CheckIsArguments (EmitContext ec)
{
Type l = left.Type;
Type r = right.Type;
Type = TypeManager.bool_type;
bool left_is_null = left is NullLiteral;
bool right_is_null = right is NullLiteral;
if (left_is_null || right_is_null)
return;
if (l.IsValueType || r.IsValueType) {
Error_OperatorCannotBeApplied ();
return;
}
if (l == r)
return;
if (l.IsSubclassOf (r) || r.IsSubclassOf (l))
return;
if (!(Convert.WideningStandardConversionExists (ec, left, right.Type) ||
Convert.WideningStandardConversionExists (ec, right, left.Type))){
Error_OperatorCannotBeApplied ();
return;
}
if (left.Type != TypeManager.object_type)
left = new EmptyCast (left, TypeManager.object_type);
if (right.Type != TypeManager.object_type)
right = new EmptyCast (right, TypeManager.object_type);
return;
}
#if false
Expression ResolveOperator (EmitContext ec)
@@ -3115,7 +3068,6 @@ namespace Mono.CSharp {
opcode = OpCodes.Shl;
break;
case Operator.Is:
case Operator.Equality:
opcode = OpCodes.Ceq;
break;
@@ -3186,8 +3138,6 @@ namespace Mono.CSharp {
Type l = left.Type;
Type r = right.Type;
//Console.WriteLine (OperName (oper) +"< "+ l + ", " + r + ">");
errors = Report.Errors;
ret_expr = HandleObjectOperands (ec);
if (Report.Errors > errors)
@@ -3257,19 +3207,11 @@ namespace Mono.CSharp {
if (IsShortCircuitedLogicalExpression)
return this;
if (oper == Operator.Like) {
Type = TypeManager.bool_type;
Expression compare_mode = new EnumConstant (new IntConstant ((int) RootContext.StringComparisonMode),
typeof (Microsoft.VisualBasic.CompareMethod));
return new HelperMethodInvocation (ec, Location, TypeManager.bool_type, TypeManager.msvbcs_stringtype_strlike_string_string_comparemethod, left, right, compare_mode);
}
//
// Step 0: String concatenation (because overloading will get this wrong)
//
if (oper == Operator.Addition || oper == Operator.Concatenation){
if (oper == Operator.Addition){
//
// If any of the arguments is a string, cast to string
//
@@ -3278,8 +3220,13 @@ namespace Mono.CSharp {
if (left is StringConstant && right is StringConstant)
return new StringConstant (((StringConstant) left).Value + ((StringConstant) right).Value);
if (Type == TypeManager.string_type) {
if (l == TypeManager.string_type || r == TypeManager.string_type) {
if (r == TypeManager.void_type || l == TypeManager.void_type) {
Error_OperatorCannotBeApplied ();
return null;
}
// try to fold it in on the left
if (left is StringConcat) {
@@ -3325,7 +3272,7 @@ namespace Mono.CSharp {
Expression target_left_expr = left;
Expression target_right_expr = right;
if (IsShortCircuitedLogicalExpression || IsExpression)
if (IsShortCircuitedLogicalExpression)
return null;
if (l != TypeManager.object_type && r != TypeManager.object_type)
@@ -3405,33 +3352,18 @@ namespace Mono.CSharp {
return;
}
if (IsExpression) {
CheckIsArguments (ec);
return;
}
while (true) {
++step;
if (step > 10)
throw new Exception ("FIXME: An Infinite loop when resolving <" + l + "> " + OperName (oper) + " <" + r + ">");
//Console.WriteLine (" STEP " + step + ":");
//Console.WriteLine (" " + "<" + target_left_expr_type + ", " + target_right_expr_type + ">");
// Console.WriteLine ("STEP " + step + ":");
// Console.WriteLine (" left => " + target_left_expr_type + " right => " + target_right_expr_type);
if ((target_left_expr_type == target_right_expr_type) &&
IsOperatorDefinedForType (target_left_expr_type)) {
if (target_left_expr_type == TypeManager.null_type) {
target_left_expr = target_right_expr = new IntConstant (0);
Type = TypeManager.int32_type;
return;
} else {
left = target_left_expr;
right = target_right_expr;
type = target_left_expr_type;
return;
}
left = target_left_expr;
right = target_right_expr;
type = target_left_expr_type;
break;
}
if ( !IsOperatorDefinedForType (target_left_expr_type)) {
@@ -3458,10 +3390,6 @@ namespace Mono.CSharp {
continue;
}
if (target_left_expr_type == TypeManager.null_type ||
target_right_expr_type == TypeManager.null_type)
break;
if (target_left_expr_type == TypeManager.string_type) {
Type target_type;
if (target_right_expr_type == TypeManager.date_type)
@@ -3508,19 +3436,15 @@ namespace Mono.CSharp {
continue;
}
break;
if ( !DoOperandPromotions(ec, target_left_expr, target_right_expr)) {
Error_OperatorCannotBeApplied();
return;
}
}
if ( !DoOperandPromotions(ec, target_left_expr, target_right_expr))
Error_OperatorCannotBeApplied();
return;
}
bool IsOperatorDefinedForType (Type t)
{
if (t == TypeManager.null_type)
return true;
switch (oper) {
@@ -3545,12 +3469,6 @@ namespace Mono.CSharp {
break;
case Operator.LogicalAndAlso:
case Operator.LogicalOrElse:
if (t == TypeManager.bool_type)
return true;
break;
case Operator.RightShift:
case Operator.LeftShift:
@@ -3652,12 +3570,6 @@ namespace Mono.CSharp {
if (t1 == t2)
return t1;
if(t1 == TypeManager.null_type)
return t2;
if (t2 == TypeManager.null_type)
return t1;
if (t1 == TypeManager.date_type || t1 == TypeManager.char_type) {
if (t2 == TypeManager.string_type)
return t2;
@@ -3695,9 +3607,6 @@ namespace Mono.CSharp {
Type target_type = GetWiderOfTypes(l, r);
//Console.WriteLine (" DoingOperandPromotions");
//Console.WriteLine (" left => " + l + " right => " + r);
//Console.WriteLine (" target_type => " + target_type);
if (target_type == null) {
throw new Exception ("Types " + l + " " + r +" cannot be compared");
@@ -3764,12 +3673,6 @@ namespace Mono.CSharp {
}
}
bool IsExpression {
get {
return (oper == Operator.Is);
}
}
MethodInfo HelperMethod {
get {
MethodInfo helper_method = null;
+8 -8
View File
@@ -33,7 +33,7 @@ namespace Mono.CSharp {
}
public bool HasValueTypeConstraint {
get { return (Attributes & GenericParameterAttributes.NotNullableValueTypeConstraint) != 0; }
get { return (Attributes & GenericParameterAttributes.ValueTypeConstraint) != 0; }
}
public virtual bool HasClassConstraint {
@@ -195,7 +195,7 @@ namespace Mono.CSharp {
if (sc == SpecialConstraint.ReferenceType)
attrs |= GenericParameterAttributes.ReferenceTypeConstraint;
else
attrs |= GenericParameterAttributes.NotNullableValueTypeConstraint;
attrs |= GenericParameterAttributes.ValueTypeConstraint;
continue;
}
@@ -843,7 +843,7 @@ namespace Mono.CSharp {
return dargs [t.GenericParameterPosition];
if (t.IsGenericInstance) {
t = t.GetGenericTypeDefinition ();
t = t.MakeGenericType (dargs);
t = t.BindGenericParameters (dargs);
}
return t;
@@ -1378,7 +1378,7 @@ namespace Mono.CSharp {
//
// Now bind the parameters.
//
type = gt.MakeGenericType (atypes);
type = gt.BindGenericParameters (atypes);
return true;
}
@@ -1733,7 +1733,7 @@ namespace Mono.CSharp {
if (tc != null)
return tc.IsGeneric ? tc.CountTypeParameters : 0;
else
return t.IsGenericType ? t.GetGenericArguments ().Length : 0;
return t.HasGenericArguments ? t.GetGenericArguments ().Length : 0;
}
public static Type[] GetTypeArguments (Type t)
@@ -2171,7 +2171,7 @@ namespace Mono.CSharp {
if (infered_types [i] == null)
return false;
method = method.MakeGenericMethod (infered_types);
method = method.BindGenericParameters (infered_types);
return true;
}
@@ -2241,7 +2241,7 @@ namespace Mono.CSharp {
if (!InferTypeArguments (param_types, arg_types, infered_types))
return false;
method = method.MakeGenericMethod (infered_types);
method = method.BindGenericParameters (infered_types);
return true;
}
@@ -2269,7 +2269,7 @@ namespace Mono.CSharp {
if (!InferTypeArguments (param_types, arg_types, infered_types))
return false;
method = method.MakeGenericMethod (infered_types);
method = method.BindGenericParameters (infered_types);
return true;
}
-70
View File
@@ -1,73 +1,3 @@
2005-09-06 Raja R Harinath <[email protected]>
* profiles/net_1_1_bootstrap.make: Remove special-handling on Win32.
* profiles/default.make: Likewise.
2005-08-26 Kornél Pál <[email protected]>
* Makefile: Added Consts.cs.in. Removed MonoVersion.cs.
2005-08-23 Raja R Harinath <[email protected]>
* profiles/basic.make (do-profile-check): Set MONO_PATH to
monolite directory when running disassembler.
2005-08-22 Raja R Harinath <[email protected]>
* Makefile (DISTFILES): Move files in common/ to ...
(COMMON_SRCS): ... this. Add Consts.cs, MonoVersion.cs and
TestConfiguration.cs.
2005-08-19 Raja R Harinath <[email protected]>
* profiles/basic.make (do-profile-check): Add some debugging output.
Handle disassemblers that print corlib version in hex.
2005-07-26 Raja R Harinath <[email protected]>
* executable.make, library.make: Use unix-style commandline options.
* profiles/basic.make (FRAMEWORK_VERSION): Set.
* profiles/net_1_1_bootstrap.make (FRAMEWORK_VERSION): Likewise.
2005-07-22 Raja R Harinath <[email protected]>
* profiles/basic.make (do-profile-check): Make the "silent"
compilation check even more silent. Refuse to use monolite if the
corlib version of monolite/mscorlib.dll doesn't match the corlib
version of the source.
2005-06-15 Raja R Harinath <[email protected]>
* executable.make (dist-local): Copy from library.make.
2005-05-23 Raja R Harinath <[email protected]>
* rules.make (STD_TARGETS): Make them all go through an
indirection.
(all): Indirect through do-all.
(all.real): Remove.
(do-%): New pattern fallback. Performs the standard behaviour:
%-recursive, and then %-local.
(do-run-test): New. Make '-k' more useful.
Reported by Ritvik Mayank.
2005-05-10 Raja R Harinath <[email protected]>
* library.make (dist-fixup): Fix typo.
2005-05-06 Raja R Harinath <[email protected]>
* library.make (LIBRARY_NEEDS_PREPROCESSING): New control.
(build_lib): Name of library built. Default to $(the_lib) unless
preprocessing.
($(build_lib)): Rename from '$(the_lib)'.
($(makefrag)): Emit dependencies on $(build_lib).
2005-05-04 Zoltan Varga <[email protected]>
* rules.make config-default.make: Use the install-sh script from the mono
directory by default.
2005-04-29 Ben Maurer <[email protected]>
* profiles/basic.make: The test for mcs was broken on jails where
-8
View File
@@ -13,13 +13,6 @@ PROFILES = \
basic net_1_1_bootstrap default net_2_0_bootstrap net_2_0 \
atomic net_1_0
COMMON_SRCS = \
Consts.cs \
Consts.cs.in \
Locale.cs \
MonoTODOAttribute.cs \
TestConfiguration.cs
DISTFILES = \
README.makefiles \
README.platforms \
@@ -28,7 +21,6 @@ DISTFILES = \
executable.make \
library.make \
rules.make \
$(COMMON_SRCS:%=common/%) \
$(PLATFORMS:%=platforms/%.make) $(PROFILES:%=profiles/%.make)
dist-local: dist-default
-10
View File
@@ -1,10 +0,0 @@
2005-08-26 Kornél Pál <[email protected]>
* Consts.cs.in: Use Microsoft.VisualStudio.Web only in profile NET_2_0 as
the assembly does not exists in older versions. Fixed to use VsVersion.
2005-08-26 Kornél Pál <[email protected]>
* ChangeLog: Added.
* Consts.cs: Renamed to Consts.cs.in.
* Consts.cs.in: Added MonoVersion.
-98
View File
@@ -1,98 +0,0 @@
//
// Consts.cs.in
//
// Author:
// Kornél Pál <http://www.kornelpal.hu/>
//
// Copyright (C) 2005 Kornél Pál
//
//
// 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.
//
using System.Runtime.InteropServices;
internal
#if NET_2_0
static
#else
sealed
#endif
class Consts
{
#if !NET_2_0
private Consts ()
{
}
#endif
//
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "1.1.9.1";
#if NET_2_0 || BOOTSTRAP_NET_2_0
public const string FxVersion = "2.0.0.0";
public const string VsVersion = "8.0.0.0";
#elif NET_1_1 || TARGET_JVM
public const string FxVersion = "1.0.5000.0";
public const string VsVersion = "7.0.5000.0";
#elif NET_1_0
public const string FxVersion = "1.0.3300.0";
public const string VsVersion = "7.0.3300.0";
#else
#error No profile symbols defined.
#endif
//
// Use these assembly name constants to make code more maintainable.
//
public const string AssemblyI18N = "I18N, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
#if NET_2_0
public const string AssemblyMicrosoft_VisualStudio_Web = "Microsoft.VisualStudio.Web, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
#endif
public const string AssemblyMicrosoft_VSDesigner = "Microsoft.VSDesigner, Version=" + VsVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblyMono_Http = "Mono.Http, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
public const string AssemblyMono_Posix = "Mono.Posix, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
public const string AssemblyMono_Security = "Mono.Security, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=0738eb9f132ed756";
public const string AssemblySystem = "System, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
public const string AssemblySystem_Data = "System.Data, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
public const string AssemblySystem_Design = "System.Design, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_DirectoryServices = "System.DirectoryServices, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_Drawing = "System.Drawing, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_Drawing_Design = "System.Drawing.Design, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_Messaging = "System.Messaging, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_Security = "System.Security, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_ServiceProcess = "System.ServiceProcess, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_Web = "System.Web, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
public const string AssemblySystem_Windows_Forms = "System.Windows.Forms, Version=" + FxVersion + ", Culture=neutral, PublicKeyToken=b77a5c561934e089";
#if INSIDE_CORLIB
#if BOOTSTRAP_WITH_OLDLIB
public const UnmanagedType UnmanagedType_80 = UnmanagedType.mono_bootstrap_NativeTypeMax;
#else
public const UnmanagedType UnmanagedType_80 = (UnmanagedType) 80;
#endif
#endif
}
-51
View File
@@ -1,51 +0,0 @@
//
// Locale.cs
//
// Author:
// Miguel de Icaza ([email protected])
// Andreas Nahr ([email protected])
//
// (C) 2001 - 2003 Ximian, Inc (http://www.ximian.com)
//
//
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
//
// 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.
//
using System;
internal sealed class Locale {
private Locale ()
{
}
public static string GetText (string msg)
{
return msg;
}
public static string GetText (string fmt, params object [] args)
{
return String.Format (fmt, args);
}
}
-53
View File
@@ -1,53 +0,0 @@
//
// MonoTODOAttribute.cs
//
// Author:
// Ravi Pratap ([email protected])
//
// (C) Ximian, Inc. http://www.ximian.com
//
//
// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
//
// 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.
//
namespace System {
[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
internal sealed class MonoTODOAttribute : Attribute {
string comment;
public MonoTODOAttribute ()
{
}
public MonoTODOAttribute (string comment)
{
this.comment = comment;
}
public string Comment {
get { return comment; }
}
}
}
-46
View File
@@ -1,46 +0,0 @@
//
// TestConfiguration.cs
//
// Author:
// Ben Maurer <[email protected]>
//
// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
//
// 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.
//
using System;
using NUnit.Framework;
using NUnit.Core;
namespace System {
class TestConfiguration {
public static string NpgsqlConnectionString {
get {
string s = Environment.GetEnvironmentVariable ("MONO_NPGSQL_CONN_STR");
if (s == null)
Assert.Ignore ("No npgsql connection string, ignoring this test");
return s;
}
}
}
}
+1
View File
@@ -12,6 +12,7 @@ MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
MBAS_FLAGS = $(PLATFORM_DEBUG_FLAGS)
LIBRARY_FLAGS = /noconfig
CFLAGS = -g -O2
INSTALL = /usr/bin/install
prefix = /usr/local
exec_prefix = $(prefix)
mono_libdir = $(exec_prefix)/lib
+4 -9
View File
@@ -64,21 +64,16 @@ DISTFILES = $(sourcefile) $(base_prog_config) $(EXTRA_DISTFILES)
dist-local: dist-default
for f in `cat $(sourcefile)` ; do \
case $$f in \
../*) : ;; \
*) dest=`dirname $$f` ; \
case $$subs in *" $$dest "*) : ;; *) subs=" $$dest$$subs" ; $(MKINSTALLDIRS) $(distdir)/$$dest ;; esac ; \
cp -p $$f $(distdir)/$$dest || exit 1 ;; \
esac ; done ; \
for d in . $$subs ; do \
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
dest=`dirname $(distdir)/$$f` ; \
$(MKINSTALLDIRS) $$dest && cp -p $$f $$dest || exit 1 ; \
done
ifndef PROGRAM_COMPILE
PROGRAM_COMPILE = $(CSCOMPILE)
endif
$(PROGRAM): $(BUILT_SOURCES) $(EXTRA_SOURCES) $(response)
$(PROGRAM_COMPILE) -target:exe -out:$(base_prog) $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
$(PROGRAM_COMPILE) /target:exe /out:$(base_prog) $(BUILT_SOURCES) $(EXTRA_SOURCES) @$(response)
ifneq ($(base_prog),$(PROGRAM))
mv $(base_prog) $(PROGRAM)
test ! -f $(base_prog).mdb || mv $(base_prog).mdb $(PROGRAM).mdb
+11 -25
View File
@@ -32,13 +32,6 @@ the_pdb = $(the_lib:.dll=.pdb)
the_mdb = $(the_lib).mdb
library_CLEAN_FILES += $(makefrag) $(the_lib) $(the_pdb) $(the_mdb)
ifdef LIBRARY_NEEDS_POSTPROCESSING
build_lib = fixup/$(PROFILE)/$(LIBRARY_NAME)
library_CLEAN_FILES += $(build_lib) $(build_lib:.dll=.pdb)
else
build_lib = $(the_lib)
endif
ifndef NO_TEST
test_nunit_lib = nunit.framework.dll nunit.core.dll nunit.util.dll
test_nunit_dep = $(test_nunit_lib:%=$(topdir)/class/lib/$(PROFILE)/%)
@@ -59,7 +52,7 @@ endif
test_pdb = $(test_lib:.dll=.pdb)
test_response = $(depsdir)/$(test_lib).response
test_makefrag = $(depsdir)/$(test_lib).makefrag
test_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
test_flags = /r:$(test_against) $(test_nunit_ref) $(TEST_MCS_FLAGS)
library_CLEAN_FILES += $(LIBRARY:.dll=_test*.dll) $(LIBRARY:.dll=_test*.pdb) $(test_response) $(test_makefrag)
ifndef btest_lib
@@ -71,7 +64,7 @@ endif
btest_pdb = $(btest_lib:.dll=.pdb)
btest_response = $(depsdir)/$(btest_lib).response
btest_makefrag = $(depsdir)/$(btest_lib).makefrag
btest_flags = -r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
btest_flags = /r:$(test_against) $(test_nunit_ref) $(TEST_MBAS_FLAGS)
library_CLEAN_FILES += $(LIBRARY:.dll=_btest*.dll) $(LIBRARY:.dll=_btest*.pdb) $(btest_response) $(btest_makefrag)
ifndef HAVE_CS_TESTS
@@ -221,13 +214,6 @@ dist-local: dist-default
for d in . $$subs ; do \
case $$d in .) : ;; *) test ! -f $$d/ChangeLog || cp -p $$d/ChangeLog $(distdir)/$$d ;; esac ; done
ifdef LIBRARY_NEEDS_POSTPROCESSING
dist-local: dist-fixup
FIXUP_PROFILES = default net_2_0
dist-fixup:
$(MKINSTALLDIRS) $(distdir)/fixup $(FIXUP_PROFILES:%=$(distdir)/fixup/%)
endif
ifndef LIBRARY_COMPILE
LIBRARY_COMPILE = $(CSCOMPILE)
endif
@@ -264,20 +250,20 @@ endif
# The library
$(build_lib): $(response) $(sn) $(BUILT_SOURCES)
$(the_lib): $(response) $(sn) $(BUILT_SOURCES)
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)
mv $(LIBRARY_NAME) $@
test ! -f $(LIBRARY_NAME).mdb || mv $(LIBRARY_NAME).mdb [email protected]
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$(@F) $(BUILT_SOURCES_cmdline) @$(response)
$(SN) $(SNFLAGS) $(@F) $(LIBRARY_SNK)
mv $(@F) $@
test ! -f $(@F).mdb || mv $(@F).mdb [email protected]
else
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) -target:library -out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(LIBRARY_COMPILE) $(LIBRARY_FLAGS) $(LIB_MCS_FLAGS) /target:library /out:$@ $(BUILT_SOURCES_cmdline) @$(response)
$(SN) $(SNFLAGS) $@ $(LIBRARY_SNK)
endif
$(makefrag): $(sourcefile)
@echo Creating $@ ...
@sed 's,^,$(build_lib): ,' $< >$@
@sed 's,^,$(the_lib): ,' $< >$@
ifneq ($(response),$(sourcefile))
$(response): $(sourcefile) $(PLATFORM_excludes)
@@ -293,7 +279,7 @@ endif
ifdef HAVE_CS_TESTS
$(test_lib): $(test_dep) $(test_response) $(test_nunit_dep)
$(TEST_COMPILE) -target:library -out:$@ $(test_flags) @$(test_response)
$(TEST_COMPILE) /target:library /out:$@ $(test_flags) @$(test_response)
$(test_response): $(test_sourcefile)
@echo Creating $@ ...
@@ -310,7 +296,7 @@ endif
ifdef HAVE_VB_TESTS
$(btest_lib): $(test_dep) $(btest_response) $(test_nunit_dep)
$(BTEST_COMPILE) -target:library -out:$@ $(btest_flags) @$(btest_response)
$(BTEST_COMPILE) /target:library /out:$@ $(btest_flags) @$(btest_response)
$(btest_response): $(btest_sourcefile)
@echo Creating $@ ...
+2 -2
View File
@@ -8,14 +8,14 @@ PLATFORM_MCS_FLAGS = /nologo /optimize
PLATFORM_RUNTIME =
PLATFORM_CORLIB = mscorlib.dll
EXTERNAL_MCS = mcs
EXTERNAL_MCS = csc.exe
EXTERNAL_MBAS = vbc.exe
EXTERNAL_RUNTIME =
# Disabled since it needs the SDK
#RESGEN = resgen.exe
#ILDISASM = ildasm.exe /test
RESGEN = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_RESGEN)
RESGEN = $(topdir)/tools/resgen/resgen.exe
#ILDISASM = monodis.bat
## Gross hack
+12 -26
View File
@@ -1,16 +1,12 @@
# -*- makefile -*-
with_mono_path = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
with_mono_path_monolite = MONO_PATH="$(topdir)/class/lib/monolite$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH"
BOOTSTRAP_MCS = $(EXTERNAL_MCS)
MCS = $(with_mono_path) $(INTERNAL_MCS)
MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE)$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(INTERNAL_MCS)
PROFILE_MCS_FLAGS = -d:NET_1_1 -d:ONLY_1_1 -d:BOOTSTRAP_WITH_OLDLIB
NO_SIGN_ASSEMBLY = yes
NO_TEST = yes
NO_INSTALL = yes
FRAMEWORK_VERSION = 1.0
.PHONY: profile-check do-profile-check
profile-check:
@@ -31,32 +27,21 @@ PROFILE_OUT = $(PROFILE_CS:.cs=.out)
do-profile-check:
@ok=:; \
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
$(MAKE) -s $(PROFILE_OUT) > /dev/null 2>&1 || ok=false; \
$(MAKE) -s $(PROFILE_OUT) || ok=false; \
rm -f $(PROFILE_EXE) $(PROFILE_OUT); \
if $$ok; then :; else \
echo "*** The compiler '$(EXTERNAL_MCS)' doesn't appear to be usable." 1>&2 ; \
if test -f $(topdir)/class/lib/monolite/mcs.exe; then \
monolite_corlib_version=`$(with_mono_path_monolite) $(ILDISASM) $(topdir)/class/lib/monolite/mscorlib.dll | sed -n 's,.*mono_corlib_version.*int32.*(\([^)]*\)),\1,p'`; \
source_corlib_version=`sed -n 's,.*mono_corlib_version.*=[^0-9]*\([0-9]*\)[^0-9]*$$,\1,p' $(topdir)/class/corlib/System/Environment.cs`; \
case $$monolite_corlib_version in \
0x* | 0X*) monolite_corlib_version=`echo $$monolite_corlib_version | sed s,^0[xX],,`; \
monolite_corlib_version=`(echo 16; echo i; echo $$monolite_corlib_version; echo p) | dc` ;; esac ; \
if test x$$monolite_corlib_version = x$$source_corlib_version; then \
echo "*** Falling back to using pre-compiled binaries. Be warned, this may not work." 1>&2 ; \
( cd $(topdir)/jay && $(MAKE) ); \
( cd $(topdir)/mcs && $(MAKE) PROFILE=basic cs-parser.cs ); \
( cd $(topdir)/class/lib/monolite/ && cp *.exe *.dll ../basic ); \
case `ls -1t $(topdir)/class/lib/basic/mcs.exe $(topdir)/mcs/cs-parser.cs | sed 1q` in \
$(topdir)/class/lib/basic/mcs.exe) : ;; \
*) sleep 5; cp $(topdir)/class/lib/monolite/mcs.exe $(topdir)/class/lib/basic ;; \
esac; \
else \
echo "*** The contents of your 'monolite' directory are out-of-date" 1>&2; \
echo "*** You may want to try 'make get-monolite-latest'" 1>&2; \
echo "*** The source has version $$source_corlib_version, but monolite has version $$monolite_corlib_version" 1>&2; \
exit 1; fi; \
echo "*** Falling back to using pre-compiled binaries. Be warned, this may not work." 1>&2 ; \
( cd $(topdir)/jay && $(MAKE) ); \
( cd $(topdir)/mcs && $(MAKE) PROFILE=basic cs-parser.cs ); \
( cd $(topdir)/class/lib/monolite/ && cp *.exe *.dll ../basic ); \
case `ls -1t $(topdir)/class/lib/basic/mcs.exe $(topdir)/mcs/cs-parser.cs | sed 1q` in \
$(topdir)/class/lib/basic/mcs.exe) : ;; \
*) sleep 5; cp $(topdir)/class/lib/monolite/mcs.exe $(topdir)/class/lib/basic ;; \
esac; \
else \
echo "*** You need a C# compiler installed to build MCS (make sure mcs works from the command line)" 1>&2 ; \
echo "*** You need a C# compiler installed to build MCS. (make sure mcs works from the command line)" 1>&2 ; \
echo "*** Read INSTALL.txt for information on how to bootstrap a Mono installation." 1>&2 ; \
exit 1; fi; fi
@@ -68,3 +53,4 @@ $(PROFILE_EXE): $(PROFILE_CS)
$(PROFILE_OUT): $(PROFILE_EXE)
$(EXTERNAL_RUNTIME) $< > $@ 2>&1
+6
View File
@@ -14,9 +14,15 @@
# run the compiler; /r: flags are by default loaded from whatever's
# in the MONO_PATH too).
ifdef PLATFORM_MONO_NATIVE
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/net_1_1_bootstrap$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/net_1_1_bootstrap/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)
else
BOOTSTRAP_MCS = $(EXTERNAL_MCS)
MCS = $(PLATFORM_RUNTIME) $(EXTERNAL_MCS) /lib:$(topdir)/class/lib/$(PROFILE)
MBAS = $(PLATFORM_RUNTIME) $(EXTERNAL_MBAS) /lib:$(topdir)/class/lib/$(PROFILE)
endif
# nuttzing!
+9 -4
View File
@@ -1,8 +1,14 @@
# -*- makefile -*-
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/basic$(PLATFORM_PATH_SEPARATOR)$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/basic/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)
ifdef PLATFORM_MONO_NATIVE
BOOTSTRAP_MCS = MONO_PATH="$(topdir)/class/lib/basic:$$MONO_PATH" $(RUNTIME) $(RUNTIME_FLAGS) $(topdir)/class/lib/basic/mcs.exe
MCS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MCS)
MBAS = MONO_PATH="$(topdir)/class/lib/$(PROFILE):$$MONO_PATH" $(INTERNAL_MBAS)
else
BOOTSTRAP_MCS = $(EXTERNAL_MCS)
MCS = $(PLATFORM_RUNTIME) $(EXTERNAL_MCS) /lib:$(topdir)/class/lib/$(PROFILE)
MBAS = $(PLATFORM_RUNTIME) $(EXTERNAL_MBAS) /lib:$(topdir)/class/lib/$(PROFILE)
endif
NO_SIGN_ASSEMBLY = yes
NO_TEST = yes
@@ -13,4 +19,3 @@ 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
+6 -9
View File
@@ -22,7 +22,6 @@ CSCOMPILE = $(MCS) $(USE_MCS_FLAGS)
BASCOMPILE = $(MBAS) $(USE_MBAS_FLAGS)
CCOMPILE = $(CC) $(USE_CFLAGS)
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
INSTALL_LIB = $(INSTALL_BIN)
@@ -98,18 +97,16 @@ include $(topdir)/build/profiles/$(PROFILE).make
ifdef OVERRIDE_TARGET_ALL
all: all.override
else
all: do-all
all: all.real
endif
all.real: all-recursive
$(MAKE) all-local
STD_TARGETS = test run-test run-test-ondotnet clean install uninstall
$(STD_TARGETS): %: do-%
do-run-test:
ok=:; $(MAKE) run-test-recursive || ok=false; $(MAKE) run-test-local || ok=false; $$ok
do-%: %-recursive
$(MAKE) $*-local
$(STD_TARGETS): %: %-recursive
$(MAKE) $@-local
# The way this is set up, any profile-specific subdirs list should
# be listed _before_ including rules.make. However, the default
+2
View File
@@ -0,0 +1,2 @@
lib
semantic.cache
+3
View File
@@ -0,0 +1,3 @@
.makefrag
.response
library-deps.stamp
@@ -1,4 +1,3 @@
Accessibility/IAccessible.cs
Accessibility/IAccessibleHandler.cs
Assembly/AssemblyInfo.cs
../../build/common/Consts.cs
@@ -0,0 +1,3 @@
.makefrag
.response
library-deps.stamp
@@ -37,12 +37,17 @@ using System.Runtime.InteropServices;
// General Information about the system assembly
[assembly: AssemblyVersion (Consts.FxVersion)]
[assembly: SatelliteContractVersion (Consts.FxVersion)]
#if (ONLY_1_1)
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
[assembly: TypeLibVersion (1, 10)]
#if (NET_1_0)
[assembly: AssemblyVersion("1.0.3300.0")]
[assembly: SatelliteContractVersion("1.0.3300.0")]
#elif (NET_2_0)
[assembly: AssemblyVersion("2.0.3600.0")]
[assembly: SatelliteContractVersion("2.0.3600.0")]
#elif (NET_1_1)
[assembly: AssemblyVersion("1.0.5000.0")]
[assembly: SatelliteContractVersion("1.0.5000.0")]
[assembly: ComCompatibleVersion(1, 0, 3300, 0)]
[assembly: TypeLibVersion(1, 10)]
#endif
[assembly: AssemblyTitle("Accessibility.dll")]
+3
View File
@@ -0,0 +1,3 @@
.makefrag
.response
library-deps.stamp
View File
File mode changed.
Regular → Executable
-5
View File
@@ -1,8 +1,3 @@
2005-08-25 Atsushi Enomoto <[email protected]>
* Makefile : /codepage:28591 (otherwise the build is broken on utf8
environment).
2004-11-26 Raja R Harinath <[email protected]>
* Makefile (OTHER_RES): New. List of resources.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
-1
View File
@@ -12,7 +12,6 @@ LIB_MCS_FLAGS = /r:$(corlib) /r:System.dll /r:System.Xml.dll \
/r:System.Data.dll /r:ICSharpCode.SharpZipLib.dll \
/r:System.Design.dll /r:System.Drawing.dll /r:System.Windows.Forms.dll \
/r:Mono.Posix.dll \
/codepage:28591 \
$(OTHER_RES:%=/res:%)
NO_TEST = yes
Regular → Executable
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
+2 -2
View File
@@ -34,9 +34,9 @@
<value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
+2 -2
View File
@@ -34,9 +34,9 @@
<value>1.0.0.0</value>
</resheader>
<resheader name="Reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="Writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3102.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
Regular → Executable
View File
File mode changed.
-4
View File
@@ -1,7 +1,3 @@
2005-06-14 Lluis Sanchez Gual <[email protected]>
* Makefile: Added System.Configuration to the build.
2005-04-21 Raja R Harinath <[email protected]>
* Makefile (net_1_1_bootstrap_SUBDIRS): Add PEAPI.
+7
View File
@@ -0,0 +1,7 @@
.makefrag
.response
*.dll
*.mdb
TestResult*.xml
library-deps.stamp
y.output
+7 -1
View File
@@ -33,7 +33,13 @@ using System;
using System.Reflection;
using System.Runtime.InteropServices;
[assembly: AssemblyVersion (Consts.FxVersion)]
#if (NET_1_0)
[assembly: AssemblyVersion ("1.0.3300.0")]
#elif (NET_2_0)
[assembly: AssemblyVersion ("2.0.3600.0")]
#elif (NET_1_1)
[assembly: AssemblyVersion ("1.0.5000.0")]
#endif
//[assembly: AssemblyTitle ("")]
[assembly: AssemblyDescription ("Commons.Xml.Relaxng.dll")]
View File
File mode changed.
+45
View File
@@ -0,0 +1,45 @@
//
// Locale.cs
//
// Author:
// Miguel de Icaza ([email protected])
// Andreas Nahr ([email protected])
//
// (C) 2001 - 2003 Ximian, Inc (http://www.ximian.com)
//
//
// 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.
//
internal sealed class Locale {
private Locale ()
{
}
/// <summary>
/// Returns the translated message for the current locale
/// </summary>
public static string GetText (string msg)
{
return msg;
}
}
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
View File
File mode changed.
Loaded 100 of 10324 files, more files were not shown because too many files have changed in this diff. Show more