Skip to content

Commit 5abffd8

Browse files
UnityAlexashwinimurt
authored andcommitted
Try to copy monodis into monodistribution/bin dir
1 parent d2fcb23 commit 5abffd8

File tree

3 files changed

+31
-2
lines changed

3 files changed

+31
-2
lines changed

external/buildscripts/build.pl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1646,18 +1646,30 @@
16461646

16471647
system("ln", "-f", "$monoroot/mono/mini/mono-sgen","$distDirArchBin/mono") eq 0 or die("failed symlinking mono executable\n");
16481648
system("ln", "-f", "$monoroot/tools/pedump/pedump","$distDirArchBin/pedump") eq 0 or die("failed symlinking pedump executable\n");
1649+
if($ENV{MONODIS})
1650+
{
1651+
system("ln", "-f", "$monoroot/mono/dis/monodis","$distDirArchBin/monodis") eq 0 or die("failed symlinking monodis executable\n");
1652+
}
16491653
system('cp', "$monoroot/data/config","$distDirArchEtc/mono/config") eq 0 or die("failed to copy config\n");
16501654
}
16511655
elsif($^O eq 'darwin')
16521656
{
16531657
system("ln", "-f", "$monoroot/mono/mini/mono","$distDirArchBin/mono") eq 0 or die("failed hardlinking mono executable\n");
16541658
system("ln", "-f", "$monoroot/tools/pedump/pedump","$distDirArchBin/pedump") eq 0 or die("failed hardlinking pedump executable\n");
1659+
if($ENV{MONODIS})
1660+
{
1661+
system("ln", "-f", "$monoroot/mono/dis/monodis","$distDirArchBin/monodis") eq 0 or die("failed hardlinking monodis executable\n");
1662+
}
16551663
}
16561664
else
16571665
{
16581666
system("cp", "$monoprefix/bin/mono-2.0.dll", "$distDirArchBin/mono-2.0.dll") eq 0 or die ("failed copying mono-2.0.dll\n");
16591667
system("cp", "$monoprefix/bin/mono-2.0.pdb", "$distDirArchBin/mono-2.0.pdb") eq 0 or die ("failed copying mono-2.0.pdb\n");
16601668
system("cp", "$monoprefix/bin/mono.exe", "$distDirArchBin/mono.exe") eq 0 or die ("failed copying mono.exe\n");
1669+
if($ENV{MONODIS})
1670+
{
1671+
system("cp", "$monoprefix/bin/monodis.exe", "$distDirArchBin/monodis.exe") eq 0 or die ("failed copying monodis.exe\n");
1672+
}
16611673
}
16621674
}
16631675

external/buildscripts/build_all_osx.pl

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@
119119
system ('mv', "$distDirSourceBinX64/$file", "$distDirDestinationBin/$file") eq 0 or die ("Failed to move '$distDirSourceBinX64/$file' to '$distDirDestinationBin/$file'.");
120120
}
121121

122+
if($ENV{MONODIS})
123+
{
124+
system ('mv', "$distDirSourceBinX64/monodis", "$distDirDestinationBin/monodis") eq 0 or die ("Failed to move '$distDirSourceBinX64/monodis' to '$distDirDestinationBin/monodis'.");
125+
}
126+
122127
for my $file ('libMonoPosixHelper.dylib')
123128
{
124129
MergeIntoFatBinary("$embedDirSourceX64/$file", "$embedDirSourceARM64/$file", "$distDirDestinationLib/$file");

external/buildscripts/build_win_no_cygwin.pl

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,19 @@
136136
copy("$monoroot/msvc/build/bdwgc/$archNameForBuild/bin/$configDirName/mono-bdwgc.exe", "$monoprefix/bin/.") or die ("failed copying mono-bdwgc.exe\n");
137137
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");
138138
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");
139+
if($ENV{MONODIS})
140+
{
141+
copy("$monoroot/msvc/build/bdwgc/$archNameForBuild/bin/$configDirName/monodis-bdwgc.exe", "$monoprefix/bin/.") or die ("failed copying monodis-bdwgc.exe\n");
142+
}
139143
140144
copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/mono-sgen.exe", "$monoprefix/bin/.") or die ("failed copying mono-sgen.exe\n");
141145
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");
142146
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");
143-
147+
if($ENV{MONODIS})
148+
{
149+
copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/monodis-sgen.exe", "$monoprefix/bin/.") or die ("failed copying monodis-sgen.exe\n");
150+
}
151+
144152
# sgen as default exe
145153
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");
146154
@@ -224,7 +232,11 @@
224232
copy("$monoprefix/bin/mono-sgen.exe", "$distDirArchBin/.") or die ("failed copying mono-sgen.exe\n");
225233
copy("$monoprefix/bin/mono-bdwgc.exe", "$distDirArchBin/.") or die ("failed copying mono-bdwgc.exe\n");
226234
copy("$monoprefix/bin/mono.exe", "$distDirArchBin/.") or die ("failed copying mono.exe\n");
227-
235+
if($ENV{MONODIS})
236+
{
237+
copy("$monoprefix/bin/monodis-bdwgc.exe", "$distDirArchBin/.") or die ("failed copying monodis-bdwgc.exe\n");
238+
copy("$monoprefix/bin/monodis-sgen.exe", "$distDirArchBin/.") or die ("failed copying monodis-sgen.exe\n");
239+
}
228240
copy("$monoprefix/bin/MonoPosixHelper.dll", "$distDirArchBin/.") or die ("failed copying MonoPosixHelper.dll\n");
229241
copy("$monoprefix/bin/MonoPosixHelper.pdb", "$distDirArchBin/.") or die ("failed copying MonoPosixHelper.pdb\n");
230242

0 commit comments

Comments
 (0)