Merge pull request #1344 from Unity-Technologies/unity-master-monodis

Try to copy monodis into monodistribution/bin dir

Author: ashwinimurt

external/buildscripts/build.pl

@@ -1646,12 +1646,20 @@
 
 			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
 		{

external/buildscripts/build_all_osx.pl

@@ -119,6 +119,11 @@
 		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");

external/buildscripts/build_win_no_cygwin.pl

@@ -136,11 +136,22 @@
 	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");
 
+		# monodis-sgen as default monodis.exe
+		copy("$monoroot/msvc/build/sgen/$archNameForBuild/bin/$configDirName/monodis-sgen.exe", "$monoprefix/bin/monodis.exe") or die ("failed copying monodis.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 +235,12 @@
 	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/monodis.exe", "$distDirArchBin/.") or die ("failed copying monodis.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");