Skip to content

Commit

Permalink
[facebook#38] Move debian_system_builder to build
Browse files Browse the repository at this point in the history
facebook#41 (review)

Move the debian system builder to subdirectory of build. The
fbcode_builder is shared accross other projects and should not be
modified.
  • Loading branch information
butjar committed Mar 28, 2019
1 parent 60f5fc7 commit 4a5dc77
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 4 deletions.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@
== How to run it? ==
cd build
python fbcode_builder/debian_system_builder.py > ./build_openr.sh
python debian_system_builder/debian_system_builder.py > ./build_openr.sh
sudo chmod +x build_openr.sh
sudo ./build_openr.sh
'''

import os
import distutils.spawn
import fbcode_builder_path

from fbcode_builder import FBCodeBuilder
from shell_builder import ShellFBCodeBuilder
Expand Down Expand Up @@ -157,8 +158,9 @@ def gcc_version():
from utils import read_fbcode_builder_config, build_fbcode_builder_config
install_dir = install_dir()

config = read_fbcode_builder_config(
'debian_system_fbcode_builder_config.py')
config_file = os.path.join(os.path.dirname(__file__),
'debian_system_fbcode_builder_config.py')
config = read_fbcode_builder_config(config_file)
builder = DebianSystemFBCodeBuilder()

builder.add_option('projects_dir', install_dir)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from __future__ import absolute_import, division, print_function, unicode_literals

import specs.fbthrift as fbthrift
import specs.fbzmq as fbzmq
import debian_specs.fbzmq as fbzmq
import specs.folly as folly
import specs.re2 as re2
from shell_quoting import ShellQuoted, path_join
Expand Down
8 changes: 8 additions & 0 deletions build/debian_system_builder/fbcode_builder_path.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import os
import sys

# Add fbcode_builder directory to the path
sys.path.append(os.path.join(
os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
"fbcode_builder"
))

0 comments on commit 4a5dc77

Please sign in to comment.