From 5abffd86bf7d96e46fc51d9649abae712918424e Mon Sep 17 00:00:00 2001 From: Alex Thibodeau Date: Mon, 5 Oct 2020 15:12:20 -0400 Subject: [PATCH] Try to copy monodis into monodistribution/bin dir --- external/buildscripts/build.pl | 12 ++++++++++++ external/buildscripts/build_all_osx.pl | 5 +++++ external/buildscripts/build_win_no_cygwin.pl | 16 ++++++++++++++-- 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/external/buildscripts/build.pl b/external/buildscripts/build.pl index e1dbd234d9f..753688b8081 100644 --- a/external/buildscripts/build.pl +++ b/external/buildscripts/build.pl @@ -1646,18 +1646,30 @@ if ($artifact) system("ln", "-f", "$monoroot/mono/mini/mono-sgen","$distDirArchBin/mono") eq 0 or die("failed symlinking mono executable\n"); system("ln", "-f", "$monoroot/tools/pedump/pedump","$distDirArchBin/pedump") eq 0 or die("failed symlinking pedump executable\n"); + if($ENV{MONODIS}) + { + system("ln", "-f", "$monoroot/mono/dis/monodis","$distDirArchBin/monodis") eq 0 or die("failed symlinking monodis executable\n"); + } system('cp', "$monoroot/data/config","$distDirArchEtc/mono/config") eq 0 or die("failed to copy config\n"); } elsif($^O eq 'darwin') { system("ln", "-f", "$monoroot/mono/mini/mono","$distDirArchBin/mono") eq 0 or die("failed hardlinking mono executable\n"); system("ln", "-f", "$monoroot/tools/pedump/pedump","$distDirArchBin/pedump") eq 0 or die("failed hardlinking pedump executable\n"); + if($ENV{MONODIS}) + { + system("ln", "-f", "$monoroot/mono/dis/monodis","$distDirArchBin/monodis") eq 0 or die("failed hardlinking monodis executable\n"); + } } else { system("cp", "$monoprefix/bin/mono-2.0.dll", "$distDirArchBin/mono-2.0.dll") eq 0 or die ("failed copying mono-2.0.dll\n"); system("cp", "$monoprefix/bin/mono-2.0.pdb", "$distDirArchBin/mono-2.0.pdb") eq 0 or die ("failed copying mono-2.0.pdb\n"); system("cp", "$monoprefix/bin/mono.exe", "$distDirArchBin/mono.exe") eq 0 or die ("failed copying mono.exe\n"); + if($ENV{MONODIS}) + { + system("cp", "$monoprefix/bin/monodis.exe", "$distDirArchBin/monodis.exe") eq 0 or die ("failed copying monodis.exe\n"); + } } } diff --git a/external/buildscripts/build_all_osx.pl b/external/buildscripts/build_all_osx.pl index 21b2ad81ec7..5a57d2cc62c 100644 --- a/external/buildscripts/build_all_osx.pl +++ b/external/buildscripts/build_all_osx.pl @@ -119,6 +119,11 @@ if ($artifact) system ('mv', "$distDirSourceBinX64/$file", "$distDirDestinationBin/$file") eq 0 or die ("Failed to move '$distDirSourceBinX64/$file' to '$distDirDestinationBin/$file'."); } + if($ENV{MONODIS}) + { + system ('mv', "$distDirSourceBinX64/monodis", "$distDirDestinationBin/monodis") eq 0 or die ("Failed to move '$distDirSourceBinX64/monodis' to '$distDirDestinationBin/monodis'."); + } + for my $file ('libMonoPosixHelper.dylib') { MergeIntoFatBinary("$embedDirSourceX64/$file", "$embedDirSourceARM64/$file", "$distDirDestinationLib/$file"); diff --git a/external/buildscripts/build_win_no_cygwin.pl b/external/buildscripts/build_win_no_cygwin.pl index b37dc363866..8227e94b792 100644 --- a/external/buildscripts/build_win_no_cygwin.pl +++ b/external/buildscripts/build_win_no_cygwin.pl @@ -136,11 +136,19 @@ if ($build) copy("$monoroot/msvc/build/bdwgc/$archNameForBuild/bin/$configDirName/mono-bdwgc.exe", "$monoprefix/bin/.") or die ("failed copying mono-bdwgc.exe\n"); copy("$monoroot/msvc/build/bdwgc/$archNameForBuild/bin/$configDirName/mono-2.0-bdwgc.dll", "$monoprefix/bin/.") or die ("failed copying mono-2.0-bdwgc.dll\n"); copy("$monoroot/msvc/build/bdwgc/$archNameForBuild/bin/$configDirName/mono-2.0-bdwgc.pdb", "$monoprefix/bin/.") or die ("failed copying mono-2.0-bdwgc.pdb\n"); + if($ENV{MONODIS}) + { + copy("$monoroot/msvc/build/bdwgc/$archNameForBuild/bin/$configDirName/monodis-bdwgc.exe", "$monoprefix/bin/.") or die ("failed copying monodis-bdwgc.exe\n"); + } copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-sgen.exe", "$monoprefix/bin/.") or die ("failed copying mono-sgen.exe\n"); copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-2.0-sgen.dll", "$monoprefix/bin/.") or die ("failed copying mono-2.0-sgen.dll\n"); copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-2.0-sgen.pdb", "$monoprefix/bin/.") or die ("failed copying mono-2.0-sgen.pdb\n"); - + if($ENV{MONODIS}) + { + copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/monodis-sgen.exe", "$monoprefix/bin/.") or die ("failed copying monodis-sgen.exe\n"); + } + # sgen as default exe copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-sgen.exe", "$monoprefix/bin/mono.exe") or die ("failed copying mono-sgen.exe to mono.exe\n"); @@ -224,7 +232,11 @@ if ($artifact) copy("$monoprefix/bin/mono-sgen.exe", "$distDirArchBin/.") or die ("failed copying mono-sgen.exe\n"); copy("$monoprefix/bin/mono-bdwgc.exe", "$distDirArchBin/.") or die ("failed copying mono-bdwgc.exe\n"); copy("$monoprefix/bin/mono.exe", "$distDirArchBin/.") or die ("failed copying mono.exe\n"); - + if($ENV{MONODIS}) + { + copy("$monoprefix/bin/monodis-bdwgc.exe", "$distDirArchBin/.") or die ("failed copying monodis-bdwgc.exe\n"); + copy("$monoprefix/bin/monodis-sgen.exe", "$distDirArchBin/.") or die ("failed copying monodis-sgen.exe\n"); + } copy("$monoprefix/bin/MonoPosixHelper.dll", "$distDirArchBin/.") or die ("failed copying MonoPosixHelper.dll\n"); copy("$monoprefix/bin/MonoPosixHelper.pdb", "$distDirArchBin/.") or die ("failed copying MonoPosixHelper.pdb\n"); -- GitLab