Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to use stevedore or ono for external build deps #1095

Merged
merged 5 commits into from
Dec 6, 2018

Conversation

ashwinimurt
Copy link

@ashwinimurt ashwinimurt commented Nov 29, 2018

This PR does the following:

  1. Point externalBuildDeps to stevedore artifacts directory, instead of copying the downloaded artifacts to $monoroot/../../mono-build-deps/build/
    (The copy step is unnecessary and had the overhead of keeping track of downloaded files so we can pass them as input to the copy action.)

  2. Add --stevedorebuilddeps=1/0 option to build scripts. The default is set to 0 (don't break Katana until config changes land). Update gitlabCI config to pass in stevedorebuilddeps=1.

  3. Change autoconf, automake, texinfo, libtool to point to 'public' repo.

  4. Use bokken-runners are Android, OSX runtime and Classlibs build.

Upcoming PR to use bokken for windows and linux after we have resolved all issues.

Passing GitlabCI pipeline: https://gitlab.cds.internal.unity3d.com/vm/mono/pipelines/12496
Passing Katana run: 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=use-stevedore-production&mono-build-tools-extra_branch=master&mono-build-deps_branch=default&unityscript_branch=unity-trunk

Note: This does not affect current build process on Katana because all changes are behind a if(stevedorebuilddeps) option. and the default is set to 0.

Unless we pass in --stevedorebuilddeps=1 to the perl scripts (as part of upcoming Katana PR), we will still be using ono for mono-build-deps.

@ashwinimurt ashwinimurt changed the title WIP: Add option to use stevedore or ono WIP: Add option to use stevedore or ono for external build deps Nov 29, 2018
@ashwinimurt ashwinimurt force-pushed the use-stevedore-production branch 2 times, most recently from 98a75f4 to 311256c Compare December 4, 2018 15:05
@ashwinimurt ashwinimurt changed the title WIP: Add option to use stevedore or ono for external build deps Add option to use stevedore or ono for external build deps Dec 5, 2018
Copy link

@joshpeterson joshpeterson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend squashing the "Fix Typo" commit.

@ashwinimurt ashwinimurt merged commit b808f84 into unity-master Dec 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants