Skip to content

Commit

Permalink
Link in fizz to wangle and wangle's dependencies
Browse files Browse the repository at this point in the history
Summary: Update cmake configurations + legocastle jobs in order to add fizz as a dependency to wangle

Reviewed By: reanimus

Differential Revision: D9337956

fbshipit-source-id: 40f25694c2b3fd8aa37d254bc63a664f4c8ee526
  • Loading branch information
AjanthanAsogamoorthy authored and facebook-github-bot committed Aug 22, 2018
1 parent ab08f97 commit 92b67bf
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 3 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ if(lib_only OR build_all)
find_package(Glog REQUIRED)
find_package(Krb5 REQUIRED gssapi)
find_package(Yarpl)
find_package(fizz CONFIG REQUIRED)
find_package(wangle CONFIG REQUIRED)
find_package(Zlib REQUIRED)
find_package(Zstd REQUIRED)
Expand Down
4 changes: 3 additions & 1 deletion build/fbcode_builder/specs/fbthrift.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
from __future__ import unicode_literals

import specs.folly as folly
import specs.fizz as fizz
import specs.sodium as sodium
import specs.wangle as wangle
import specs.zstd as zstd

Expand All @@ -22,7 +24,7 @@ def fbcode_builder_spec(builder):
)
builder.add_option('krb5/krb5:git_hash', 'krb5-1.16.1-final')
return {
'depends_on': [folly, wangle, zstd],
'depends_on': [folly, fizz, sodium, wangle, zstd],
'steps': [
# This isn't a separete spec, since only fbthrift uses mstch.
builder.github_project_workdir('no1msd/mstch', 'build'),
Expand Down
17 changes: 17 additions & 0 deletions build/fbcode_builder/specs/fizz.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env python
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals

import specs.folly as folly
import specs.sodium as sodium


def fbcode_builder_spec(builder):
return {
'depends_on': [folly, sodium],
'steps': [
builder.fb_github_cmake_install('fizz/fizz/build'),
],
}
4 changes: 3 additions & 1 deletion build/fbcode_builder/specs/proxygen.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@
from __future__ import unicode_literals

import specs.folly as folly
import specs.fizz as fizz
import specs.sodium as sodium
import specs.wangle as wangle


def fbcode_builder_spec(builder):
return {
'depends_on': [folly, wangle],
'depends_on': [folly, wangle, fizz, sodium],
'steps': [
builder.fb_github_autoconf_install('proxygen/proxygen'),
],
Expand Down
4 changes: 3 additions & 1 deletion build/fbcode_builder/specs/wangle.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@
from __future__ import unicode_literals

import specs.folly as folly
import specs.fizz as fizz
import specs.sodium as sodium


def fbcode_builder_spec(builder):
# Projects that simply depend on Wangle need not spend time on tests.
builder.add_option('wangle/wangle/build:cmake_defines', {'BUILD_TESTS': 'OFF'})
return {
'depends_on': [folly],
'depends_on': [folly, fizz, sodium],
'steps': [
builder.fb_github_cmake_install('wangle/wangle/build'),
],
Expand Down

0 comments on commit 92b67bf

Please sign in to comment.