Distribute the ikdasm managed disassembler written by Jeroen Frijters.

diff --git a/mcs/tools/Makefile b/mcs/tools/Makefile
index fc01a9618a71559637757457b8141c2048363a73..3c0f45c251f553acca6aba16949642e98af57a00 100644 (file)
--- a/mcs/tools/Makefile
+++ b/mcs/tools/Makefile
@@ -46,7 +46,8 @@ net_4_0_dirs := \
        ccrewrite       \
        cccheck         \
        security        \
-       mdbrebase
+       mdbrebase       \
+       ikdasm
 
 net_2_0_dirs := \
        $(per_profile_dirs)

diff --git a/mcs/tools/ikdasm/Makefile b/mcs/tools/ikdasm/Makefile
new file mode 100644 (file)
index 0000000..4ed6e90
--- /dev/null
+++ b/mcs/tools/ikdasm/Makefile
@@ -0,0 +1,12 @@
+thisdir = tools/ikdasm
+SUBDIRS =
+include ../../build/rules.make
+
+PROGRAM = ikdasm.exe
+
+LOCAL_MCS_FLAGS = \
+       -d:NO_SYMBOL_WRITER /r:System.Security.dll
+
+#EXTRA_DISTFILES = LICENSE
+
+include ../../build/executable.make

diff --git a/mcs/tools/ikdasm/ikdasm.exe.sources b/mcs/tools/ikdasm/ikdasm.exe.sources
new file mode 100644 (file)
index 0000000..33d6941
--- /dev/null
+++ b/mcs/tools/ikdasm/ikdasm.exe.sources
@@ -0,0 +1,19 @@
+../../../external/ikdasm/CABlob.cs
+../../../external/ikdasm/Disassembler.cs
+../../../external/ikdasm/ExportedMethods.cs
+../../../external/ikdasm/IL.cs
+../../../external/ikdasm/Keywords.cs
+../../../external/ikdasm/LineWriter.cs
+../../../external/ikdasm/Program.cs
+../../../external/ikdasm/Util.cs
+../../../external/ikdasm/VTableFixups.cs
+
+../../../external/ikvm/reflect/*.cs
+../../../external/ikvm/reflect/Emit/*.cs
+../../../external/ikvm/reflect/Metadata/*.cs
+../../../external/ikvm/reflect/Reader/*.cs
+../../../external/ikvm/reflect/Writer/*.cs
+../../../external/ikvm/reflect/Impl/ITypeOwner.cs
+../../../external/ikvm/reflect/Impl/SymbolSupport.cs
+
+../../class/Mono.Options/Mono.Options/Options.cs

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 7a697cd2cc1f43c89cdbdf3a23b3db5552388fbc..be605ec3dcf9e27afabb0d2b547c631683887716 100644 (file)
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -102,7 +102,8 @@ scripts_4_0 = \
        svcutil$(SCRIPT_SUFFIX)                 \
        ccrewrite$(SCRIPT_SUFFIX)               \
        cccheck$(SCRIPT_SUFFIX)                 \
-       mdbrebase$(SCRIPT_SUFFIX)
+       mdbrebase$(SCRIPT_SUFFIX)               \
+       ikdasm$(SCRIPT_SUFFIX)
 
 MDOC_SUBCOMMANDS = \
        mdoc-assemble \