Changes to use artifacts from stevedore unity-internal

external/buildscripts/Build.bee.cs

@@ -47,59 +47,54 @@ namespace BuildProgram
 
 		private static void RegisterCommonArtifacts()
 		{
-			Artifacts.Add("7z",
-				new Tuple<string, string>(
-					"7z/9df1e3b3b120_12ed325f6a47f0e5cebc247dbe9282a5da280d392cce4e6c9ed227d57ff1e2ff.7z",
-					"testing"));
-
 			Artifacts.Add("MonoBleedingEdge",
 				new Tuple<string, string>(
 					"MonoBleedingEdge/9df1e3b3b120_ab6d2f131e6bd4fe2aacafb0f683e8fa4e1ccba35552b6fe89bf359b6ee16215.7z",
-					"testing"));
+					"unity-internal"));
 
 			Artifacts.Add("reference-assemblies",
 				new Tuple<string, string>(
 					"reference-assemblies/9df1e3b3b120_bbb4750c6bf0a1784bec7d7c04b8ef5881f31f6212136e014694f3864a388886.7z",
-					"testing"));
+					"unity-internal"));
 		}
 
 		private static void RegisterWindowsArtifacts()
 		{
-			Artifacts.Add("android-ndk-r16b-windows",
+			Artifacts.Add("android-ndk-windows-x86_64",
 				new Tuple<string, string>(
-					"android-ndk-r16b-windows/9df1e3b3b120_403e0d58eabae03f0d9e8d1d2cea2dbf1d14c380c3d1c7eeb6e8c60ffc15e1b8.7z",
-					"testing"));
+					"android-ndk-windows-x86_64/r16b_4c6b39939b29dfd05e27c97caf588f26b611f89fe95aad1c987278bd1267b562.7z",
+					"unity-internal"));
 		}
 
 		private static void RegisterOSXArtifacts()
 		{
-			Artifacts.Add("android-ndk-r16b-darwin",
+			Artifacts.Add("android-ndk-darwin-x86_64",
 				new Tuple<string, string>(
-					"android-ndk-r16b-darwin/9df1e3b3b120_c7cda5a221dd72799b7e618597b3f8766df7183d386becb2785631c2d3ac0d75.7z",
-					"testing"));
+					"android-ndk-darwin-x86_64/r16b_9654a692ed97713e35154bfcacb0028fdc368128d636326f9644ed83eec5d88b.7z",
+					"unity-internal"));
 
 			Artifacts.Add("MacBuildEnvironment",
 				new Tuple<string, string>(
 					"MacBuildEnvironment/9df1e3b3b120_2fc8e616a2e5dfb7907fc42d9576b427e692223c266dc3bc305de4bf03714e30.7z",
-					"testing"));
+					"unity-internal"));
 
 			Artifacts.Add("mono-build-tools-extra",
 				new Tuple<string, string>(
 					"mono-build-tools-extra/9de3c42ef81ec4f79b53e7db32d390227d8c43c4_fa9931c37b7a4ca636eb9e0e48252c4cb591caaa9b77c41b75795037868c1256.7z",
-					"testing"));
+					"unity-internal"));
 		}
 
 		private static void RegisterLinuxArtifacts()
 		{
-			Artifacts.Add("android-ndk-r16b-linux",
+			Artifacts.Add("android-ndk-linux-x86_64",
 				new Tuple<string, string>(
-					"android-ndk-r16b-linux/9df1e3b3b120_fbabd18208d82cbc810266e8b566bb0ea4e1e438de38d450a92deaa3e23757b6.7z",
-					"testing"));
+					"android-ndk-linux-x86_64/r16b_bcdea4f5353773b2ffa85b5a9a2ae35544ce88ec5b507301d8cf6a76b765d901.7z",
+					"unity-internal"));
 
 			Artifacts.Add("linux-sdk-20170609",
 				new Tuple<string, string>(
 					"linux-sdk-20170609/9df1e3b3b120_9a3a0847d5b3767579e908b5a9ce050936617b1b9275a79a8b71bb3229998957.7z",
-					"testing"));
+					"unity-internal"));
 		}
 
 		private static void RegisterCommonNonWindowsArtifacts()
@@ -124,10 +119,10 @@ namespace BuildProgram
 					"autoconf-src/2.69_0e4ba7a0363c68ad08a7d138b228596aecdaea68e1d8b8eefc645e6ac8fc85c7.7z",
 					"public"));
 
-			Artifacts.Add("libgdiplus",
+			Artifacts.Add("libgdiplus-mac",
 				new Tuple<string, string>(
-					"libgdiplus/9df1e3b3b120_4cf7c08770db93922f54f38d2461b9122cddc898db58585864446e70c5ad3057.7z",
-					"testing"));
+					"libgdiplus-mac/9df1e3b3b120_4cf7c08770db93922f54f38d2461b9122cddc898db58585864446e70c5ad3057.7z",
+					"unity-internal"));
 		}
 	}
 }
\ No newline at end of file

external/buildscripts/build.pl

@@ -728,73 +728,32 @@ if ($build)
 		my $ndkName = "";
 		if($^O eq "linux")
 		{
-			$ndkName = "android-ndk-$ndkVersion-linux/android-ndk-$ndkVersion-linux-x86_64.zip";
+			$ndkName = "android-ndk-linux-x86_64/android-ndk-$ndkVersion";
 		}
 		elsif($^O eq "darwin")
 		{
-			$ndkName = "android-ndk-$ndkVersion-darwin/android-ndk-$ndkVersion-darwin-x86_64.zip";
+			$ndkName = "android-ndk-darwin-x86_64/android-ndk-$ndkVersion";
 		}
 		else
 		{
-			$ndkName = "android-$ndkVersion-r16b-windows/android-ndk-$ndkVersion-windows-x86.zip";
+			$ndkName = "android-ndk-windows-x86_64/android-ndk-$ndkVersion";
 		}
 
-		my $depsNdkArchive = "$externalBuildDeps/$ndkName";
-		my $depsNdkFinal = "$externalBuildDeps/android-ndk-$ndkVersion";
+		my $depsNdkFinal = "$externalBuildDeps/$ndkName";
 
-		print(">>> Android NDK Archive = $depsNdkArchive\n");
-		print(">>> Android NDK Extraction Destination = $depsNdkFinal\n");
+		print(">>> Android NDK Destination = $depsNdkFinal\n");
 		print("\n");
 
 		$ENV{ANDROID_NDK_ROOT} = "$depsNdkFinal";
 
-		if (-d $depsNdkFinal)
+		if(!(-d $depsNdkFinal))
 		{
-			print(">>> Android NDK already extracted\n");
-		}
-		else
-		{
-			print(">>> Android NDK needs to be extracted\n");
-
-			if ($runningOnWindows)
-			{
-				my $sevenZip = "$externalBuildDeps/7z/win64/7za.exe";
-				my $winDepsNdkArchive = `cygpath -w $depsNdkArchive`;
-				my $winDepsNdkExtract = `cygpath -w $externalBuildDeps`;
-
-				# clean up trailing new lines that end up in the output from cygpath.  If left, they cause problems down the line
-				# for 7zip
-				$winDepsNdkArchive =~ s/\n+$//;
-				$winDepsNdkExtract =~ s/\n+$//;
-
-				system($sevenZip, "x", "$winDepsNdkArchive", "-o$winDepsNdkExtract");
-			}
-			else
-			{
-				my ($name,$path,$suffix) = fileparse($depsNdkArchive, qr/\.[^.]*/);
-
-				print(">>> Android NDK Extension = $suffix\n");
-
-				# Versions after r11 use .zip extension.  Currently we use r10e, but let's support the .zip extension in case
-				# we upgrade down the road
-				if (lc $suffix eq '.zip')
-				{
-					system("unzip", "-q", $depsNdkArchive, "-d", $externalBuildDeps);
-				}
-				elsif (lc $suffix eq '.bin')
-				{	chmod(0755, $depsNdkArchive);
-					system($depsNdkArchive, "-o$externalBuildDeps");
-				}
-				else
-				{
-					die "Unknown file extension '" . $suffix . "'\n";
-				}
-			}
+			die("Android NDK not found\n");
 		}
 
 		if (!(-f "$ENV{ANDROID_NDK_ROOT}/ndk-build"))
 		{
-			die("Something went wrong with the NDK extraction\n");
+			die("Something went wrong. $ENV{ANDROID_NDK_ROOT} does not contain ndk-build\n");
 		}
 
 		my $androidNdkRoot = $ENV{ANDROID_NDK_ROOT};
@@ -977,7 +936,7 @@ if ($build)
 
 			if ($runningOnWindows)
 			{
-				my $sevenZip = "$externalBuildDeps/7z/win64/7za.exe";
+				my $sevenZip = "$externalBuildDeps/7za-win-x64/7za.exe";
 				my $winDepsSdkArchive = `cygpath -w $depsSdkArchive`;
 				my $winDepsSdkExtract = `cygpath -w $externalBuildDeps`;
 

external/buildscripts/build_win_wrapper.pl

@@ -100,7 +100,7 @@ else
 
 print(">>> externalBuildDeps = $externalBuildDeps\n");
 
-my $SevenZip = "$externalBuildDeps/7z/win64/7za.exe";
+my $SevenZip = "$externalBuildDeps/7za-win-x64/7za.exe";
 
 # Attempt to find common default cygwin install locations
 if ($cygwinRootWindows eq "")

external/buildscripts/collect_allbuilds.pl

@@ -59,14 +59,15 @@ print MYFILE "TC projectname was: $ENV{TEAMCITY_PROJECT_NAME}\n";
 print MYFILE "TC buildconfigname was: $ENV{TEAMCITY_BUILDCONF_NAME}\n";
 close(MYFILE);
 
+my $externalBuildDeps = "$monoroot/external/buildscripts/artifacts/Stevedore";
 my $externalzip = "";
 if($^O eq "linux")
 {
-	$externalzip = "$monoroot/../../mono-build-deps/build/7z/linux64/7za";
+	$externalzip = "$externalBuildDeps/7za-linux-x64/7za";
 }
 elsif($^O eq 'darwin')
 {
-	$externalzip = "$monoroot/../../mono-build-deps/build/7z/osx/7za";
+	$externalzip = "$externalBuildDeps/7za-mac-x64/7za";
 }