mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use ikdasm, not monodis, for assembly parsing

Browse Source 
Former-commit-id: 0c062047f8bf7584a15735fff357847043a13007
This commit is contained in:
Jo Shields 2017-03-13 17:19:47 +00:00
parent b31591994a
commit 7401a465ee
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
debian/dh_clideps vendored
View File

@ -60,7 +60,7 @@ by-hand in the control file, eg. "mono-runtime | cli-runtime".
Before mondis is run, MONO_GAC_PREFIX and MONO_PATH are set to the specified directory (or
directories -- separate with colons). This is useful for multi-binary packages where a library is
built in one package and another package contains binaries linked against said library. Relative
paths will be made absolute for the benefit of monodis.
paths will be made absolute for the benefit of ikdasm.
Note that the directory given should be the complete or relative path to a directory that contains
the library. See example below.
@ -191,15 +191,15 @@ if ($dh{L_PARAMS}) {
if (defined($dh{INTERNAL_MONO_FLAG}) ||
(defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
$clr = "mono";
$cli_parser = "$pwd/debian/tmp/usr/bin/monodis";
$cli_parser = "$pwd/debian/tmp/usr/bin/ikdasm";
$cli_parser_paths = "LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib MONO_PATH=$mono_path:$pwd/debian/tmp/usr/lib/mono/4.5 MONO_GAC_PREFIX=$mono_gac_prefix ";
$cli_version = `LD_LIBRARY_PATH=$pwd/debian/tmp/usr/lib $pwd/debian/tmp/usr/bin/mono --version 2>&1`;
verbose_print("Will use built Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
} elsif (-x "/usr/bin/monodis") {
verbose_print("Will use built Mono (debian/tmp/usr/bin/ikdasm) for CIL parsing.");
} elsif (-x "/usr/bin/ikdasm") {
$clr = "mono";
$cli_parser = "/usr/bin/monodis";
$cli_parser = "/usr/bin/ikdasm";
$cli_parser_paths = "MONO_PATH=$mono_path MONO_GAC_PREFIX=$mono_gac_prefix ";
verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
verbose_print("Will use Mono (/usr/bin/ikdasm) for CIL parsing.");
} elsif (-x "/usr/bin/ildasm") {
$clr = "pnet";
$cli_parser = "/usr/share/cli-common/ildasm-monodis";

10
debian/dh_makeclilibs vendored
View File

@ -135,13 +135,13 @@ if (defined($dh{INTERNAL_MONO_FLAG}) ||
(defined($ARGV[0]) && $ARGV[0] eq "internal-mono")) {
$clr = "mono";
my $mono_path = "LD_LIBRARY_PATH=debian/tmp/usr/lib MONO_PATH=debian/tmp/usr/lib/mono/4.5 MONO_CFG_DIR=debian/tmp/etc";
$cli_parser = "$mono_path debian/tmp/usr/bin/monodis";
$cli_parser = "$mono_path debian/tmp/usr/bin/ikdasm";
$sn = "$mono_path debian/tmp/usr/bin/mono debian/tmp/usr/lib/mono/4.5/sn.exe";
verbose_print("Will use build Mono (debian/tmp/usr/bin/monodis) for CIL parsing.");
} elsif (-x "/usr/bin/monodis") {
verbose_print("Will use build Mono (debian/tmp/usr/bin/ikdasm) for CIL parsing.");
} elsif (-x "/usr/bin/ikdasm") {
$clr = "mono";
$cli_parser = "/usr/bin/monodis";
verbose_print("Will use Mono (/usr/bin/monodis) for CIL parsing.");
$cli_parser = "/usr/bin/ikdasm";
verbose_print("Will use Mono (/usr/bin/ikdasm) for CIL parsing.");
} elsif (-x "/usr/bin/ildasm") {
$clr = "pnet";
$cli_parser = "/usr/share/cli-common/ildasm-monodis";