Skip to content

Commit 3dddf2d

Browse files
committed
Checkout us and boo on build machines
1 parent fa97094 commit 3dddf2d

File tree

2 files changed

+8
-20
lines changed

2 files changed

+8
-20
lines changed

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)