Author: jbevain
Date: 2007-06-06 06:21:36 -0400 (Wed, 06 Jun 2007)
New Revision: 78711
Added:
trunk/cecil/linker/Descriptors/Mono.Unix.xml
trunk/cecil/linker/Descriptors/System.Web.xml
trunk/cecil/linker/Descriptors/System.Xml
trunk/cecil/linker/Descriptors/System.xml
trunk/cecil/linker/Descriptors/mscorlib.xml
Removed:
trunk/cecil/linker/Descriptors/corlib.xml
trunk/cecil/linker/Descriptors/system.web.xml
trunk/cecil/linker/Descriptors/system.xml
Modified:
trunk/cecil/linker/Makefile
trunk/cecil/linker/Mono.Linker.Steps/BlacklistStep.cs
trunk/cecil/linker/Mono.Linker.csproj
Log:
protected Mono.Posix.UnixEndPoint
Added: trunk/cecil/linker/Descriptors/Mono.Unix.xml
===================================================================
--- trunk/cecil/linker/Descriptors/Mono.Unix.xml 2007-06-06 09:25:34 UTC
(rev 78710)
+++ trunk/cecil/linker/Descriptors/Mono.Unix.xml 2007-06-06 10:21:36 UTC
(rev 78711)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<linker>
+ <assembly fullname="Mono.Unix">
+ <type fullname="Mono.Posix.UnixEndPoint" />
+ </assembly>
+</linker>
Property changes on: trunk/cecil/linker/Descriptors/Mono.Unix.xml
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: trunk/cecil/linker/Descriptors/System.Web.xml (from rev 78710,
trunk/cecil/linker/Descriptors/system.web.xml)
Copied: trunk/cecil/linker/Descriptors/System.Xml (from rev 78710,
trunk/cecil/linker/Descriptors/system.xml)
Copied: trunk/cecil/linker/Descriptors/System.xml (from rev 78710,
trunk/cecil/linker/Descriptors/system.xml)
Deleted: trunk/cecil/linker/Descriptors/corlib.xml
===================================================================
--- trunk/cecil/linker/Descriptors/corlib.xml 2007-06-06 09:25:34 UTC (rev
78710)
+++ trunk/cecil/linker/Descriptors/corlib.xml 2007-06-06 10:21:36 UTC (rev
78711)
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<linker>
- <assembly fullname="mscorlib">
- <namespace fullname="System.Security.Cryptography" />
- <type fullname="Mono.Interop.ComInteropProxy" />
- <type fullname="Mono.Interop.IDispatch" />
- <type fullname="Mono.Interop.IUnknown" />
- <type fullname="System.Activator" />
- <type fullname="System.AppDomain" preserve="fields" />
- <type fullname="System.AppDomainSetup" />
- <type fullname="System.AppDomainUnloadedException" />
- <type fullname="System.ApplicationException" />
- <type fullname="System.ArgIterator" />
- <type fullname="System.ArgumentException" />
- <type fullname="System.ArgumentNullException" />
- <type fullname="System.ArgumentOutOfRangeException" />
- <type fullname="System.ArithmeticException" />
- <type fullname="System.Array" />
- <type fullname="System.Array/InternalArray`1" />
- <type fullname="System.ArrayTypeMismatchException" />
- <type fullname="System.Attribute" />
- <type fullname="System.BadImageFormatException" />
- <type fullname="System.Boolean" />
- <type fullname="System.Buffer" />
- <type fullname="System.Byte" />
- <type fullname="System.CannotUnloadAppDomainException" />
- <type fullname="System.Char" />
- <type fullname="System.Collections.Generic.ICollection`1" />
- <type fullname="System.Collections.Generic.IEnumerable`1" />
- <type
fullname="System.Collections.Generic.IEquatableOfTEqualityComparer`1" />
- <type fullname="System.Collections.Generic.IList`1" />
- <type fullname="System.Console" />
- <type fullname="System.ConsoleDriver" />
- <type fullname="System.ContextBoundObject" />
- <type fullname="System.Convert" />
- <type fullname="System.CurrentSystemTimeZone" />
- <type fullname="System.DateTime" />
- <type fullname="System.DBNull" />
- <type fullname="System.Decimal" />
- <type fullname="System.Delegate" preserve="fields" />
- <type fullname="System.Diagnostics.StackFrame" />
- <type fullname="System.Diagnostics.StackTrace" />
- <type fullname="System.DivideByZeroException" />
- <type fullname="System.Double" />
- <type fullname="System.Enum" />
- <type fullname="System.Environment" />
- <type fullname="System.Exception" />
- <type fullname="System.ExecutionEngineException" />
- <type fullname="System.FieldAccessException" />
- <type fullname="System.FormatException" />
- <type fullname="System.GC" />
- <type fullname="System.Globalization.DateTimeFormatInfo"
preserve="fields" />
- <type fullname="System.Globalization.CompareInfo"
preserve="fields" />
- <type fullname="System.Globalization.CultureInfo"
preserve="fields" />
- <type fullname="System.Globalization.NumberFormatInfo"
preserve="fields" />
- <type fullname="System.Globalization.RegionInfo"
preserve="fields" />
- <type fullname="System.Globalization.SortKey" preserve="fields"
/>
- <type fullname="System.IO.FileMode" />
- <type fullname="System.IO.FileNotFoundException" />
- <type fullname="System.IO.FileLoadException" />
- <type fullname="System.IO.FileStreamAsyncResult" />
- <type fullname="System.IO.IOException" />
- <type fullname="System.IO.MonoIO" preserve="fields" />
- <type fullname="System.IO.Path" />
- <type fullname="System.IO.StreamReader" />
- <type fullname="System.IndexOutOfRangeException" />
- <type fullname="System.Int16" />
- <type fullname="System.Int32" />
- <type fullname="System.Int64" />
- <type fullname="System.IntPtr" />
- <type fullname="System.InvalidCastException" />
- <type fullname="System.InvalidOperationException" />
- <type fullname="System.InvalidProgramException" />
- <type fullname="System.MarshalByRefObject" />
- <type fullname="System.Math" />
- <type fullname="System.MethodAccessException" />
- <type fullname="System.MissingFieldException" />
- <type fullname="System.MissingMethodException" />
- <type fullname="System.MonoAsyncCall" preserve="fields" />
- <type fullname="System.MonoCustomAttrs" preserve="fields" />
- <type fullname="System.MonoCustomAttrs/AttributeInfo"
preserve="fields" />
- <type fullname="System.MonoEnumInfo" preserve="fields" />
- <type fullname="System.MonoListItem" preserve="fields" />
- <type fullname="System.MonoType" preserve="fields" />
- <type fullname="System.MulticastDelegate" preserve="fields" />
- <type fullname="System.NotImplementedException" />
- <type fullname="System.NotSupportedException" />
- <type fullname="System.NullReferenceException" />
- <type fullname="System.Nullable`1" />
- <type fullname="System.Object" preserve="fields" />
- <type fullname="System.OutOfMemoryException" />
- <type fullname="System.Reflection.Assembly" preserve="fields" />
- <type fullname="System.Reflection.AssemblyName"
preserve="fields" />
- <type fullname="System.Reflection.ConstructorInfo"
preserve="fields" />
- <type fullname="System.Reflection.CustomAttributeData"
preserve="fields" />
- <type fullname="System.Reflection.CustomAttributeNamedArgument"
/>
- <type fullname="System.Reflection.CustomAttributeTypedArgument"
/>
- <type fullname="System.Reflection.Emit.AssemblyBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.ConstructorBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.CustomAttributeBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.DynamicMethod"
preserve="fields" />
- <type fullname="System.Reflection.Emit.EnumBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.EventBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.FieldBuilder"
preserve="fields" />
- <type
fullname="System.Reflection.Emit.GenericTypeParameterBuilder" preserve="fields"
/>
- <type fullname="System.Reflection.Emit.ILExceptionBlock"
preserve="fields" />
- <type fullname="System.Reflection.Emit.ILExceptionInfo"
preserve="fields" />
- <type fullname="System.Reflection.Emit.ILGenerator"
preserve="fields" />
- <type fullname="System.Reflection.Emit.LocalBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.MethodBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.ModuleBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.MonoResource"
preserve="fields" />
- <type fullname="System.Reflection.Emit.MonoWin32Resource"
preserve="fields" />
- <type fullname="System.Reflection.Emit.ParameterBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.PropertyBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.SignatureHelper"
preserve="fields" />
- <type fullname="System.Reflection.Emit.TypeBuilder"
preserve="fields" />
- <type fullname="System.Reflection.Emit.UnmanagedMarshal"
preserve="fields" />
- <type fullname="System.Reflection.EventInfo" preserve="fields"
/>
- <type fullname="System.Reflection.ExceptionHandlingClause"
preserve="fields" />
- <type fullname="System.Reflection.FieldInfo" preserve="fields"
/>
- <type fullname="System.Reflection.LocalVariableInfo"
preserve="fields" />
- <type fullname="System.Reflection.ManifestResourceInfo"
preserve="fields" />
- <type fullname="System.Reflection.MethodBase" preserve="fields"
/>
- <type fullname="System.Reflection.MethodBody" preserve="fields"
/>
- <type fullname="System.Reflection.MethodInfo" preserve="fields"
/>
- <type fullname="System.Reflection.Module" preserve="fields" />
- <type fullname="System.Reflection.MonoArrayMethod"
preserve="fields" />
- <type fullname="System.Reflection.MonoCMethod"
preserve="fields" />
- <type fullname="System.Reflection.MonoEvent" preserve="fields"
/>
- <type fullname="System.Reflection.MonoEventInfo"
preserve="fields" />
- <type fullname="System.Reflection.MonoField" preserve="fields"
/>
- <type fullname="System.Reflection.MonoGenericClass"
preserve="fields" />
- <type fullname="System.Reflection.MonoGenericMethod"
preserve="fields" />
- <type fullname="System.Reflection.MonoGenericCMethod"
preserve="fields" />
- <type fullname="System.Reflection.MonoMethod" preserve="fields"
/>
- <type fullname="System.Reflection.MonoMethodInfo"
preserve="fields" />
- <type fullname="System.Reflection.MonoPropertyInfo"
preserve="fields" />
- <type fullname="System.Reflection.MonoProperty"
preserve="fields" />
- <type fullname="System.Reflection.ParameterInfo"
preserve="fields" />
- <type fullname="System.Reflection.PropertyInfo"
preserve="fields" />
- <type fullname="System.Reflection.ReflectionTypeLoadException"
/>
- <type fullname="System.Reflection.TargetException" />
- <type
fullname="System.Reflection.TargetParameterCountException" />
- <type fullname="System.Runtime.CompilerServices.CallConvCdecl"
/>
- <type
fullname="System.Runtime.CompilerServices.CallConvStdcall" />
- <type
fullname="System.Runtime.CompilerServices.CallConvFastcall" />
- <type
fullname="System.Runtime.CompilerServices.CallConvThiscall" />
- <type
fullname="System.Runtime.CompilerServices.InternalsVisibleToAttribute" />
- <type fullname="System.Runtime.CompilerServices.RuntimeHelpers"
/>
- <type
fullname="System.Runtime.InteropServices.DllImportAttribute" />
- <type fullname="System.Runtime.InteropServices.GCHandle" />
- <type fullname="System.Runtime.InteropServices.GuidAttribute" />
- <type fullname="System.Runtime.InteropServices.HandleRef" />
- <type
fullname="System.Runtime.InteropServices.ICustomMarshaler" />
- <type
fullname="System.Runtime.InteropServices.InterfaceTypeAttribute" />
- <type fullname="System.Runtime.InteropServices.Marshal" />
- <type
fullname="System.Runtime.InteropServices.MarshalDirectiveException" />
- <type fullname="System.Runtime.InteropServices.SafeHandle" />
- <type
fullname="System.Runtime.InteropServices.UnmanagedFunctionPointerAttribute" />
- <type
fullname="System.Runtime.Remoting.Activation.ActivationServices" />
- <type fullname="System.Runtime.Remoting.Contexts.Context" />
- <type fullname="System.Runtime.Remoting.IRemotingTypeInfo" />
- <type fullname="System.Runtime.Remoting.Messaging.AsyncResult"
/>
- <type fullname="System.Runtime.Remoting.Messaging.CallContext"
/>
- <type
fullname="System.Runtime.Remoting.Messaging.MonoMethodMessage" />
- <type fullname="System.Runtime.Remoting.Proxies.RealProxy" />
- <type
fullname="System.Runtime.Remoting.Proxies.TransparentProxy" />
- <type fullname="System.Runtime.Remoting.RemotingServices" />
- <type fullname="System.Runtime.Serialization.ISerializable" />
- <type
fullname="System.Runtime.Serialization.SerializationException" />
- <type fullname="System.Runtime.Serialization.SerializationInfo"
/>
- <type fullname="System.Runtime.Serialization.StreamingContext"
/>
- <type fullname="System.RuntimeArgumentHandle" />
- <type fullname="System.RuntimeFieldHandle" />
- <type fullname="System.RuntimeMethodHandle" />
- <type fullname="System.RuntimeTypeHandle" />
- <type fullname="System.SByte" />
- <type
fullname="System.Security.AllowPartiallyTrustedCallersAttribute" />
- <type
fullname="System.Security.Cryptography.RandomNumberGenerator" />
- <type
fullname="System.Security.Cryptography.RNGCryptoServiceProvider" />
- <type fullname="System.Security.Policy.Evidence" />
- <type fullname="System.Security.Principal.WindowsIdentity" />
- <type
fullname="System.Security.Principal.WindowsImpersonationContext" />
- <type fullname="System.Security.Principal.WindowsPrincipal" />
- <type fullname="System.Security.RuntimeSecurityFrame" />
- <type fullname="System.Security.SecurityException" />
- <type fullname="System.Security.SecurityManager" />
- <type
fullname="System.Security.SuppressUnmanagedCodeSecurityAttribute" />
- <type fullname="System.Security.VerificationException" />
- <type fullname="System.Single" />
- <type fullname="System.StackOverflowException" />
- <type fullname="System.STAThreadAttribute" />
- <type fullname="System.String" />
- <type fullname="System.SystemException" />
- <type fullname="System.Text.StringBuilder" />
- <type fullname="System.Threading.ExecutionContext" />
- <type fullname="System.Threading.Interlocked" />
- <type fullname="System.Threading.Monitor" />
- <type fullname="System.Threading.Mutex" />
- <type fullname="System.Threading.NativeEventCalls" />
- <type fullname="System.Threading.Semaphore" />
- <type fullname="System.Threading.SynchronisationLockException"
/>
- <type fullname="System.Threading.Thread" />
- <type fullname="System.Threading.ThreadAbortException" />
- <type fullname="System.Threading.ThreadPool" />
- <type fullname="System.Threading.ThreadStateException" />
- <type fullname="System.Threading.WaitHandle" />
- <type fullname="System.Type" />
- <type fullname="System.TypeInitializationException" />
- <type fullname="System.TypeLoadException" />
- <type fullname="System.TypedReference" />
- <type fullname="System.UInt16" />
- <type fullname="System.UInt32" />
- <type fullname="System.UInt64" />
- <type fullname="System.UIntPtr" />
- <type fullname="System.UnhandledExceptionEventArgs" />
- <type fullname="System.ValueType" />
- <type fullname="System.Variant" />
- <type fullname="System.Version" />
- <type fullname="System.Void" />
- <type fullname="System.__ComObject" />
- </assembly>
-</linker>
Copied: trunk/cecil/linker/Descriptors/mscorlib.xml (from rev 78710,
trunk/cecil/linker/Descriptors/corlib.xml)
Deleted: trunk/cecil/linker/Descriptors/system.web.xml
===================================================================
--- trunk/cecil/linker/Descriptors/system.web.xml 2007-06-06 09:25:34 UTC
(rev 78710)
+++ trunk/cecil/linker/Descriptors/system.web.xml 2007-06-06 10:21:36 UTC
(rev 78711)
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<linker>
- <assembly fullname="System.Web">
- <type fullname="System.Web.Util.ICalls" />
- </assembly>
-</linker>
Deleted: trunk/cecil/linker/Descriptors/system.xml
===================================================================
--- trunk/cecil/linker/Descriptors/system.xml 2007-06-06 09:25:34 UTC (rev
78710)
+++ trunk/cecil/linker/Descriptors/system.xml 2007-06-06 10:21:36 UTC (rev
78711)
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<linker>
- <assembly fullname="System">
- <type fullname="System.Configuration.DefaultConfig" />
- <type fullname="System.Diagnostics.DefaultTraceListener" />
- <type fullname="System.Diagnostics.FileVersionInfo" />
- <type fullname="System.Diagnostics.Process" />
- <type fullname="System.Diagnostics.ProcessModule" />
- <type fullname="System.IO.FAMWatcher" />
- <type fullname="System.IO.FileSystemWatcher" />
- <type fullname="System.IO.InotifyWatcher" />
- <type fullname="System.Net.Dns" />
- <type fullname="System.Net.SocketAddress" />
- <type fullname="System.Net.Sockets.LingerOption" />
- <type fullname="System.Net.Sockets.Socket" />
- <type fullname="System.Net.Sockets.SocketException" />
- </assembly>
-</linker>
Modified: trunk/cecil/linker/Makefile
===================================================================
--- trunk/cecil/linker/Makefile 2007-06-06 09:25:34 UTC (rev 78710)
+++ trunk/cecil/linker/Makefile 2007-06-06 10:21:36 UTC (rev 78711)
@@ -2,7 +2,7 @@
MCS = mcs
KEY_FILE = ../../mcs/class/mono.snk
MONO.CECIL.DLL = Mono.Cecil.dll
-MCS_FLAGS = -debug -keyfile:$(KEY_FILE) -r:$(MONO.CECIL.DLL)
-resource:Descriptors/corlib.xml -resource:Descriptors/system.xml
-resource:Descriptors/system.web.xml
+MCS_FLAGS = -debug -keyfile:$(KEY_FILE) -r:$(MONO.CECIL.DLL)
-resource:Descriptors/mscorlib.xml -resource:Descriptors/System.xml
-resource:Descriptors/System.Web.xml -resource:Descriptors/Mono.Unix.xml
LINKER = monolinker.exe
all: config.make monolinker.exe monolinker
Modified: trunk/cecil/linker/Mono.Linker.Steps/BlacklistStep.cs
===================================================================
--- trunk/cecil/linker/Mono.Linker.Steps/BlacklistStep.cs 2007-06-06
09:25:34 UTC (rev 78710)
+++ trunk/cecil/linker/Mono.Linker.Steps/BlacklistStep.cs 2007-06-06
10:21:36 UTC (rev 78711)
@@ -37,15 +37,13 @@
public class BlacklistStep : BaseStep {
- static readonly IDictionary blacklists = new Hashtable ();
+ static readonly string [] blacklists = new string [] {
+ "mscorlib",
+ "System",
+ "System.Web",
+ "Mono.Unix"
+ };
- static BlacklistStep ()
- {
- blacklists.Add ("mscorlib", "corlib.xml");
- blacklists.Add ("System", "system.xml");
- blacklists.Add ("System.Web", "system.web.xml");
- }
-
protected override bool ConditionToProcess()
{
return Context.CoreAction == AssemblyAction.Link;
@@ -53,11 +51,11 @@
protected override void Process ()
{
- foreach (DictionaryEntry entry in blacklists) {
- if (!IsReferenced ((string) entry.Key))
+ foreach (string name in blacklists) {
+ if (!IsReferenced (name)
continue;
- Context.Pipeline.AddStepBefore (typeof
(MarkStep), GetResolveStep ((string) entry.Value));
+ Context.Pipeline.AddStepBefore (typeof
(MarkStep), GetResolveStep (name);
}
}
@@ -84,7 +82,7 @@
static Stream GetResource (string descriptor)
{
- return Assembly.GetExecutingAssembly
().GetManifestResourceStream (descriptor);
+ return Assembly.GetExecutingAssembly
().GetManifestResourceStream (descriptor + ".xml");
}
}
}
Modified: trunk/cecil/linker/Mono.Linker.csproj
===================================================================
--- trunk/cecil/linker/Mono.Linker.csproj 2007-06-06 09:25:34 UTC (rev
78710)
+++ trunk/cecil/linker/Mono.Linker.csproj 2007-06-06 10:21:36 UTC (rev
78711)
@@ -70,15 +70,18 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="Descriptors\corlib.xml">
- <LogicalName>corlib.xml</LogicalName>
+ <EmbeddedResource Include="Descriptors\mscorlib.xml">
+ <LogicalName>mscorlib.xml</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="Descriptors\system.web.xml">
- <LogicalName>system.web.xml</LogicalName>
+ <EmbeddedResource Include="Descriptors\System.Web.xml">
+ <LogicalName>System.web.xml</LogicalName>
</EmbeddedResource>
- <EmbeddedResource Include="Descriptors\system.xml">
- <LogicalName>system.xml</LogicalName>
+ <EmbeddedResource Include="Descriptors\System.xml">
+ <LogicalName>System.xml</LogicalName>
</EmbeddedResource>
+ <EmbeddedResource Include="Descriptors\Mono.Unix.xml">
+ <LogicalName>Mono.Unix.xml</LogicalName>
+ </EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
