Update external build-deps tools paths (MBE) #1066
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ashwinimurt
changed the title
ashwinimurt
commented
Nov 6, 2018
| my $texinfoDir = "$externalBuildDeps/texinfo-$texinfoVersion"; | ||
| my $automakeDir = "$externalBuildDeps/automake-$automakeVersion"; | ||
| my $libtoolDir = "$externalBuildDeps/libtool-$libtoolVersion"; | ||
| my $autoconfDir = "$externalBuildDeps/autoconf-2-69/autoconf-$autoconfVersion"; |
There was a problem hiding this comment.
Stevedore does not allow . in the unpacked folder name. So use dashes instead.
ashwinimurt
commented
Nov 6, 2018
| { | ||
| print(">>> Checking out boo\n"); | ||
| GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout, "unity-trunk"); | ||
| } |
joncham
reviewed
Nov 7, 2018
| if (!$ENV{UNITY_THISISABUILDMACHINE}) { | ||
| GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout); | ||
| } | ||
| GitClone("git://github.com/Unity-Technologies/boo.git", $booCheckout); |
There was a problem hiding this comment.
Do we always want to do this now?
There was a problem hiding this comment.
We don't clone if booCheckout already exists, like on Katana, its cloned in a build step before running the script.
sub GitClone
{
my $repo = shift;
my $localFolder = shift;
my $branch = shift;
$branch = defined($branch)?$branch:master;
if (-d $localFolder) {
return;
}
system("git clone --branch $branch $repo $localFolder") eq 0 or die("git clone $repo $localFolder failed!");
}
There was a problem hiding this comment.
Its needed for OSX and bare minimum builds on Gitlab CI
joncham
reviewed
Nov 7, 2018
| if (!$ENV{UNITY_THISISABUILDMACHINE}) { | ||
| GitClone("git://github.com/Unity-Technologies/unityscript.git", $usCheckout); | ||
| } | ||
| GitClone("git://github.com/Unity-Technologies/unityscript.git", $usCheckout); |
joncham
approved these changes
Nov 7, 2018
joncham
approved these changes
Nov 7, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
To support external repo mono-build-deps PR: https://ono.unity3d.com/unity-extra/mono-build-deps/pull-request/77510/_/scripting/move-zip-files-into-folders-hgmove
Katana:
https://katana.bf.unity3d.com/projects/Mono%20Runtime%20and%20Classlibs/builders?boo_branch=unity-trunk&cecil_branch=unity-master&krait-signal-handler_branch=master&mono_branch=support-rearranged-mono-build-deps&mono-build-tools-extra_branch=master&mono-build-deps_branch=scripting%2Fmove-zip-files-into-folders&unityscript_branch=unity-trunk