Skip to content

Commit b96f9da

Browse files
ashwinimurtashwinimurt
authored
Merge pull request #1066 from Unity-Technologies/support-rearranged-mono-build-deps
Update external build-deps tools paths (MBE)
2 parents 929ae6e + d7758d6 commit b96f9da

File tree

3 files changed

+23
-35
lines changed

3 files changed

+23
-35
lines changed

‎external/buildscripts/build.pl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -351,17 +351,17 @@
351351
my $texinfoVersion = "4.8";
352352
my $automakeVersion = "1.15";
353353
my $libtoolVersion = "2.4.6";
354-
my $autoconfDir = "$externalBuildDeps/autoconf-$autoconfVersion";
355-
my $texinfoDir = "$externalBuildDeps/texinfo-$texinfoVersion";
356-
my $automakeDir = "$externalBuildDeps/automake-$automakeVersion";
357-
my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion";
354+
my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion";
355+
my $texinfoDir = "$externalBuildDeps/texinfo-4-8/texinfo-$texinfoVersion";
356+
my $automakeDir = "$externalBuildDeps/automake-1-15/automake-$automakeVersion";
357+
my $libtoolDir = "$externalBuildDeps/libtool-2-4-6/libtool-$libtoolVersion";
358358
my $builtToolsDir = "$externalBuildDeps/built-tools";
359359

360360
$ENV{PATH} = "$builtToolsDir/bin:$ENV{PATH}";
361361

362362
if (!(-d "$autoconfDir"))
363363
{
364-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
364+
chdir("$externalBuildDeps/autoconf-2-69") eq 1 or die ("failed to chdir to external directory\n");
365365
system("tar xzf autoconf-$autoconfVersion.tar.gz") eq 0 or die ("failed to extract autoconf\n");
366366

367367
chdir("$autoconfDir") eq 1 or die ("failed to chdir to autoconf directory\n");
@@ -374,7 +374,7 @@
374374

375375
if (!(-d "$texinfoDir") and $windowsSubsystemForLinux)
376376
{
377-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
377+
chdir("$externalBuildDeps/texinfo-4-8") eq 1 or die ("failed to chdir to external directory\n");
378378
system("tar xzf texinfo-$texinfoVersion.tar.gz") eq 0 or die ("failed to extract texinfo\n");
379379

380380
chdir($texinfoDir) eq 1 or die ("failed to chdir to texinfo directory\n");
@@ -388,7 +388,7 @@
388388
if (!(-d "$automakeDir"))
389389
{
390390
my $automakeMakeFlags = "";
391-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
391+
chdir("$externalBuildDeps/automake-1-15") eq 1 or die ("failed to chdir to external directory\n");
392392
system("tar xzf automake-$automakeVersion.tar.gz") eq 0 or die ("failed to extract automake\n");
393393

394394
chdir("$automakeDir") eq 1 or die ("failed to chdir to automake directory\n");
@@ -406,7 +406,7 @@
406406

407407
if (!(-d "$libtoolDir"))
408408
{
409-
chdir("$externalBuildDeps") eq 1 or die ("failed to chdir to external directory\n");
409+
chdir("$externalBuildDeps/libtool-2-4-6") eq 1 or die ("failed to chdir to external directory\n");
410410
system("tar xzf libtool-$libtoolVersion.tar.gz") eq 0 or die ("failed to extract libtool\n");
411411

412412
chdir("$libtoolDir") eq 1 or die ("failed to chdir to libtool directory\n");
@@ -436,7 +436,7 @@
436436
if (! -d $macSdkPath)
437437
{
438438
print(">>> Unzipping mac build toolchain\n");
439-
system("$externalBuildDeps/unzip", '-qd', "$macBuildEnvDir", "$macBuildEnvDir/builds.zip") eq 0 or die ("failed unzipping mac build toolchain\n");
439+
system("unzip", '-qd', "$macBuildEnvDir", "$macBuildEnvDir/builds.zip") eq 0 or die ("failed unzipping mac build toolchain\n");
440440
}
441441
}
442442

@@ -453,7 +453,7 @@
453453
if (! -d "$iosBuildEnvDir/builds")
454454
{
455455
print(">>> Unzipping ios build toolchain\n");
456-
system("$externalBuildDeps/unzip", '-qd', "$iosBuildEnvDir/builds", "$iosBuildEnvDir/builds.zip") eq 0 or die ("failed unzipping ios build toolchain\n");
456+
system("unzip", '-qd', "$iosBuildEnvDir/builds", "$iosBuildEnvDir/builds.zip") eq 0 or die ("failed unzipping ios build toolchain\n");
457457
}
458458

459459
$ENV{PATH} = "$iosXcodeDefaultToolchainRoot/usr/bin:$iosBuildEnvDir/builds/Xcode.app/Contents/Developer/usr/bin:$ENV{PATH}";
@@ -698,15 +698,15 @@
698698
my $ndkName = "";
699699
if($^O eq "linux")
700700
{
701-
$ndkName = "android-ndk-$ndkVersion-linux-x86_64.zip";
701+
$ndkName = "android-ndk-$ndkVersion-linux/android-ndk-$ndkVersion-linux-x86_64.zip";
702702
}
703703
elsif($^O eq "darwin")
704704
{
705-
$ndkName = "android-ndk-$ndkVersion-darwin-x86_64.zip";
705+
$ndkName = "android-ndk-$ndkVersion-darwin/android-ndk-$ndkVersion-darwin-x86_64.zip";
706706
}
707707
else
708708
{
709-
$ndkName = "android-ndk-$ndkVersion-windows-x86.zip";
709+
$ndkName = "android-$ndkVersion-r16b-windows/android-ndk-$ndkVersion-windows-x86.zip";
710710
}
711711

712712
my $depsNdkArchive = "$externalBuildDeps/$ndkName";
@@ -1096,8 +1096,8 @@
10961096
print(">>> Linux SDK Version = $sdkVersion\n");
10971097

10981098
my $sdkName = "linux-sdk-$sdkVersion.tar.bz2";
1099-
my $depsSdkArchive = "$externalBuildDeps/$sdkName";
1100-
my $depsSdkFinal = "$externalBuildDeps/linux-sdk-$sdkVersion";
1099+
my $depsSdkArchive = "$externalBuildDeps/linux-sdk-$sdkVersion/$sdkName";
1100+
my $depsSdkFinal = "$externalBuildDeps/linux-sdk-$sdkVersion/linux-sdk-$sdkVersion";
11011101

11021102
print(">>> Linux SDK Archive = $depsSdkArchive\n");
11031103
print(">>> Linux SDK Extraction Destination = $depsSdkFinal\n");

‎external/buildscripts/build_unityscript_bareminimum_win.pl

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -65,19 +65,14 @@ sub UnityBooc
6565

6666
sub BuildUnityScriptForUnity
6767
{
68-
# Build system is handling this
69-
if (!$ENV{UNITY_THISISABUILDMACHINE}) {
70-
GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout);
71-
}
68+
GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout);
7269

7370
my $commonDefines = "NO_SERIALIZATION_INFO,NO_SYSTEM_PROCESS,NO_ICLONEABLE,MSBUILD,IGNOREKEYFILE";
7471

7572
Build("$booCheckout/src/booc/Booc.csproj", undef, "/property:TargetFrameworkVersion=4.0 /property:DefineConstants=\"" . $commonDefines . "\" /property:OutputPath=$output/wp8");
7673
Build("$booCheckout/src/booc/Booc.csproj", undef, "/property:TargetFrameworkVersion=4.0 /property:DefineConstants=\"" . $commonDefines . ",NO_SYSTEM_REFLECTION_EMIT\" /property:OutputPath=$output/wsa");
7774

78-
if (!$ENV{UNITY_THISISABUILDMACHINE}) {
79-
GitClone("git://github.com/Unity-Technologies/unityscript.git", $usCheckout);
80-
}
75+
GitClone("git://github.com/Unity-Technologies/unityscript.git", $usCheckout);
8176

8277
UnityBooc("-out:$output/wsa/Boo.Lang.Extensions.dll -srcdir:$booCheckout/src/Boo.Lang.Extensions -r:$output/wsa/Boo.Lang.dll -r:$output/wsa/Boo.Lang.Compiler.dll");
8378
UnityBooc("-out:$output/wsa/Boo.Lang.Useful.dll -srcdir:$booCheckout/src/Boo.Lang.Useful -r:$output/wsa/Boo.Lang.Parser");

‎external/buildscripts/build_us_and_boo.pl

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,24 +49,17 @@ sub BuildUnityScriptFor45
4949
my $booCheckout = "$monoroot/../../boo/build";
5050
print(">>> Using mono prefix $monoprefix45\n");
5151

52-
# Build host is handling this
53-
if (!$buildMachine)
52+
if (!(-d "$booCheckout"))
5453
{
55-
if (!(-d "$booCheckout"))
56-
{
57-
print(">>> Checking out boo\n");
58-
GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout, "unity-trunk");
59-
}
54+
print(">>> Checking out boo\n");
55+
GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout, "unity-trunk");
6056
}
6157

6258
my $usCheckout = "$monoroot/../../unityscript/build";
63-
if (!$buildMachine)
59+
if (!(-d "$usCheckout"))
6460
{
65-
if (!(-d "$usCheckout"))
66-
{
67-
print(">>> Checking out unity script\n");
68-
GitClone("git://github.com/Unity-Technologies/unityscript.git", $usCheckout, "unity-trunk");
69-
}
61+
print(">>> Checking out unity script\n");
62+
GitClone("git://github.com/Unity-Technologies/unityscript.git", $usCheckout, "unity-trunk");
7063
}
7164

7265
my $boocCsproj = "$booCheckout/src/booc/booc.csproj";

0 commit comments

Comments
 (0)