Revert il2cpp as dependency of mono f16d00e

Michael DeRoy · Michael DeRoy · commit 59240d127dcc · 2018-01-25T17:14:24.000-05:00
diff --git a/external/buildscripts/build.pl b/external/buildscripts/build.pl
@@ -166,7 +166,6 @@
 
 # Do any settings agnostic per-platform stuff
 my $externalBuildDeps = "";
-my $externalBuildDepsIl2Cpp = "$monoroot/../../il2cpp/build";
 
 if ($buildDeps ne "" && not $forceDefaultBuildDeps)
 {
@@ -296,18 +295,6 @@
 			$externalBuildDeps = abs_path($externalBuildDeps) if (-d $externalBuildDeps);
 		}
 
-		if (!(-d "$externalBuildDepsIl2Cpp"))
-		{
-			my $il2cpp_repo = "https://bitbucket.org/Unity-Technologies/il2cpp";
-            print(">>> Cloning $il2cpp_repo at $externalBuildDepsIl2Cpp\n");
-            $checkoutResult = system("hg", "clone", $il2cpp_repo, "$externalBuildDepsIl2Cpp");
-
-            if ($checkoutOnTheFly && $checkoutResult ne 0)
-            {
-                die("failed to checkout IL2CPP for the mono build dependencies\n");
-            }
-		}
-
 		if (-d "$existingExternalMono")
 		{
 			print(">>> External mono found at : $existingExternalMono\n");
diff --git a/external/buildscripts/build_win_no_cygwin.pl b/external/buildscripts/build_win_no_cygwin.pl
@@ -65,7 +65,6 @@
 
 # Do any settings agnostic per-platform stuff
 my $externalBuildDeps = "";
-my $externalBuildDepsIl2Cpp = "$monoroot/../../il2cpp/build";
 
 if ($buildDeps ne "" && not $forceDefaultBuildDeps)
 {
@@ -112,18 +111,6 @@
 			}
 		}
 
-        if (!(-d "$externalBuildDepsIl2Cpp"))
-        {
-            my $il2cpp_repo = "https://bitbucket.org/Unity-Technologies/il2cpp";
-            print(">>> Cloning $il2cpp_repo at $externalBuildDepsIl2Cpp\n");
-            $checkoutResult = system("hg", "clone", $il2cpp_repo, "$externalBuildDepsIl2Cpp");
-
-            if ($checkoutOnTheFly && $checkoutResult ne 0)
-            {
-                die("failed to checkout IL2CPP for the mono build dependencies\n");
-            }
-        }
-
 		if (-d "$existingExternalMono")
 		{
 			print(">>> External mono found at : $existingExternalMono\n");
diff --git a/external/buildscripts/build_win_wrapper.pl b/external/buildscripts/build_win_wrapper.pl
@@ -66,7 +66,6 @@
 );
 
 my $externalBuildDeps = "";
-my $externalBuildDepsIl2Cpp = "$monoroot/../../il2cpp/build";
 
 if ($buildDeps ne "")
 {
@@ -97,18 +96,6 @@
 			die("failed to checkout mono build dependencies\n");
 		}
 	}
-
-    if (!(-d "$externalBuildDepsIl2Cpp"))
-    {
-        my $il2cpp_repo = "https://bitbucket.org/Unity-Technologies/il2cpp";
-        print(">>> Cloning $il2cpp_repo at $externalBuildDepsIl2Cpp\n");
-        $checkoutResult = system("hg", "clone", $il2cpp_repo, "$externalBuildDepsIl2Cpp");
-
-        if ($checkoutOnTheFly && $checkoutResult ne 0)
-        {
-            die("failed to checkout IL2CPP for the mono build dependencies\n");
-        }
-    }
 }
 
 print(">>> externalBuildDeps = $externalBuildDeps\n");

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,6 @@`
`65`	`65`
`66`	`66`	`# Do any settings agnostic per-platform stuff`
`67`	`67`	`my $externalBuildDeps = "";`
`68`		`-my $externalBuildDepsIl2Cpp = "$monoroot/../../il2cpp/build";`
`69`	`68`
`70`	`69`	`if ($buildDeps ne "" && not $forceDefaultBuildDeps)`
`71`	`70`	`{`
`@@ -112,18 +111,6 @@`
`112`	`111`	`}`
`113`	`112`	`}`
`114`	`113`
`115`		`- if (!(-d "$externalBuildDepsIl2Cpp"))`
`116`		`- {`
`117`		`- my $il2cpp_repo = "https://bitbucket.org/Unity-Technologies/il2cpp";`
`118`		`- print(">>> Cloning $il2cpp_repo at $externalBuildDepsIl2Cpp\n");`
`119`		`- $checkoutResult = system("hg", "clone", $il2cpp_repo, "$externalBuildDepsIl2Cpp");`
`120`		`-`
`121`		`- if ($checkoutOnTheFly && $checkoutResult ne 0)`
`122`		`- {`
`123`		`- die("failed to checkout IL2CPP for the mono build dependencies\n");`
`124`		`- }`
`125`		`- }`
`126`		`-`
`127`	`114`	`if (-d "$existingExternalMono")`
`128`	`115`	`{`
`129`	`116`	`print(">>> External mono found at : $existingExternalMono\n");`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,6 @@`
`66`	`66`	`);`
`67`	`67`
`68`	`68`	`my $externalBuildDeps = "";`
`69`		`-my $externalBuildDepsIl2Cpp = "$monoroot/../../il2cpp/build";`
`70`	`69`
`71`	`70`	`if ($buildDeps ne "")`
`72`	`71`	`{`
`@@ -97,18 +96,6 @@`
`97`	`96`	`die("failed to checkout mono build dependencies\n");`
`98`	`97`	`}`
`99`	`98`	`}`
`100`		`-`
`101`		`- if (!(-d "$externalBuildDepsIl2Cpp"))`
`102`		`- {`
`103`		`- my $il2cpp_repo = "https://bitbucket.org/Unity-Technologies/il2cpp";`
`104`		`- print(">>> Cloning $il2cpp_repo at $externalBuildDepsIl2Cpp\n");`
`105`		`- $checkoutResult = system("hg", "clone", $il2cpp_repo, "$externalBuildDepsIl2Cpp");`
`106`		`-`
`107`		`- if ($checkoutOnTheFly && $checkoutResult ne 0)`
`108`		`- {`
`109`		`- die("failed to checkout IL2CPP for the mono build dependencies\n");`
`110`		`- }`
`111`		`- }`
`112`	`99`	`}`
`113`	`100`
`114`	`101`	`print(">>> externalBuildDeps = $externalBuildDeps\n");`