From 94d0d45c7b48c4b35fa0bbad704c6bec25cf83da Mon Sep 17 00:00:00 2001 From: Alex Guzman Date: Tue, 7 Aug 2018 14:03:50 -0700 Subject: [PATCH] Add support for building from facebookincubator repos Summary: Currently, fbcode_builder assumes you're building code living in the facebook github org. If you try to do travis builds using a facebookincubator repo, an error occurs due to hard-coded assumptions about the org. This fixes that Reviewed By: knekritz Differential Revision: D9183307 fbshipit-source-id: 0a1ac399953485e84f0534cc0616765227088c80 --- build/fbcode_builder/fbcode_builder.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/fbcode_builder/fbcode_builder.py b/build/fbcode_builder/fbcode_builder.py index c6db4218d..fa38bf0cc 100644 --- a/build/fbcode_builder/fbcode_builder.py +++ b/build/fbcode_builder/fbcode_builder.py @@ -372,14 +372,14 @@ class FBCodeBuilder(object): self.cmake_configure(name, cmake_path) + self.make_and_install() ) - def fb_github_autoconf_install(self, project_and_path): + def fb_github_autoconf_install(self, project_and_path, github_org='facebook'): return [ - self.fb_github_project_workdir(project_and_path), + self.fb_github_project_workdir(project_and_path, github_org), self.autoconf_install(project_and_path), ] - def fb_github_cmake_install(self, project_and_path, cmake_path='..'): + def fb_github_cmake_install(self, project_and_path, cmake_path='..', github_org='facebook'): return [ - self.fb_github_project_workdir(project_and_path), + self.fb_github_project_workdir(project_and_path, github_org), self.cmake_install(project_and_path, cmake_path), ]