Author: jbevain
Date: 2006-11-06 03:16:59 -0500 (Mon, 06 Nov 2006)
New Revision: 67398
Added:
trunk/cecil/merge/Makefile
trunk/cecil/merge/monomerge.exe.sources
Modified:
trunk/cecil/merge/ChangeLog
trunk/cecil/merge/Mono.Merge/ReflectionMerger.cs
Log:
2006-11-06 Jb Evain <[EMAIL PROTECTED]>
* Makefile, monomerge.exe.sources:
Compilation stuff for Mono.
Modified: trunk/cecil/merge/ChangeLog
===================================================================
--- trunk/cecil/merge/ChangeLog 2006-11-06 07:50:39 UTC (rev 67397)
+++ trunk/cecil/merge/ChangeLog 2006-11-06 08:16:59 UTC (rev 67398)
@@ -1,4 +1,7 @@
2006-11-06 Jb Evain <[EMAIL PROTECTED]>
+ * Makefile, monomerge.exe.sources:
+ Compilation stuff for Mono.
+
* First check-in of the merging tool by:
Alex Prudiky <[EMAIL PROTECTED]>
Added: trunk/cecil/merge/Makefile
===================================================================
--- trunk/cecil/merge/Makefile 2006-11-06 07:50:39 UTC (rev 67397)
+++ trunk/cecil/merge/Makefile 2006-11-06 08:16:59 UTC (rev 67398)
@@ -0,0 +1,14 @@
+
+MCS = gmcs
+KEY_FILE = ../../mcs/class/mono.snk
+MONO.CECIL.DLL = Mono.Cecil.dll
+MCS_FLAGS = -keyfile:$(KEY_FILE) -r:$(MONO.CECIL.DLL)
+MERGE = monomerge.exe
+
+all:
+ cp ../lib/$(MONO.CECIL.DLL) .
+ $(MCS) $(MCS_FLAGS) @monomerge.exe.sources /out:$(MERGE)
+
+clean:
+ rm -f $(MERGE)
+ rm -f $(MONO.CECIL.DLL)
Property changes on: trunk/cecil/merge/Makefile
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/cecil/merge/Mono.Merge/ReflectionMerger.cs
===================================================================
--- trunk/cecil/merge/Mono.Merge/ReflectionMerger.cs 2006-11-06 07:50:39 UTC
(rev 67397)
+++ trunk/cecil/merge/Mono.Merge/ReflectionMerger.cs 2006-11-06 08:16:59 UTC
(rev 67398)
@@ -97,7 +97,7 @@
{
if (!MemberReferencesContains
(Target.MainModule.MemberReferences, member)) {
TypeReference tr = GetTypeReference
(member.DeclaringType);
- if (tr.Scope != Target) {
+ if (tr.Scope != (IMetadataScope) Target) {
member.DeclaringType = tr;
Target.MainModule.MemberReferences.Add
(member);
}
Added: trunk/cecil/merge/monomerge.exe.sources
===================================================================
--- trunk/cecil/merge/monomerge.exe.sources 2006-11-06 07:50:39 UTC (rev
67397)
+++ trunk/cecil/merge/monomerge.exe.sources 2006-11-06 08:16:59 UTC (rev
67398)
@@ -0,0 +1,7 @@
+./Mono.Merge/AssemblyInfo.cs
+./Mono.Merge/BaseMergeReflectionVisitor.cs
+./Mono.Merge/Driver.cs
+./Mono.Merge/FixReflectionAfterMerge.cs
+./Mono.Merge/MergeContext.cs
+./Mono.Merge/ReflectionMerger.cs
+./Mono.Merge/StructureMerger.cs
Property changes on: trunk/cecil/merge/monomerge.exe.sources
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
