facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-10 08:47:12 +03:00
Code Issues Projects Releases Wiki Activity

fizz, mvfst, wangle, proxygen: add gmock as fbcode_build dependency

Browse Source 
Summary: they were all transitively pulling it from folly

Reviewed By: mjoras

Differential Revision: D23683292

fbshipit-source-id: 2085a580584891b3fd0960c14505c0f675a11bd5
This commit is contained in:
Luca Niccolini 2020-09-14 22:02:19 -07:00 committed by Facebook GitHub Bot
parent dca9f7bbfb
commit 49e3719cd0
5 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build/fbcode_builder/specs/fizz.py
View File

@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt
import specs.folly as folly
import specs.sodium as sodium
@ -12,20 +13,19 @@ import specs.sodium as sodium
def fbcode_builder_spec(builder):
builder.add_option(
'fizz/fizz/build:cmake_defines',
"fizz/fizz/build:cmake_defines",
{
# Fizz's build is kind of broken, in the sense that both `mvfst`
# and `proxygen` depend on files that are only installed with
# `BUILD_TESTS` enabled, e.g. `fizz/crypto/test/TestUtil.h`.
'BUILD_TESTS': 'ON',
}
"BUILD_TESTS": "ON"
},
)
return {
'depends_on': [fmt, folly, sodium],
'steps': [
"depends_on": [gmock, fmt, folly, sodium],
"steps": [
builder.fb_github_cmake_install(
'fizz/fizz/build',
github_org='facebookincubator',
),
"fizz/fizz/build", github_org="facebookincubator"
)
],
}

18
build/fbcode_builder/specs/mvfst.py
View File

@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import specs.gmock as gmock
import specs.folly as folly
import specs.fizz as fizz
@ -12,18 +13,17 @@ import specs.fizz as fizz
def fbcode_builder_spec(builder):
# Projects that **depend** on mvfst should don't need to build tests.
builder.add_option(
'mvfst/build:cmake_defines',
"mvfst/build:cmake_defines",
{
# This is set to ON in the mvfst `fbcode_builder_config.py`
'BUILD_TESTS': 'OFF',
}
# This is set to ON in the mvfst `fbcode_builder_config.py`
"BUILD_TESTS": "OFF"
},
)
return {
'depends_on': [folly, fizz],
'steps': [
"depends_on": [gmock, folly, fizz],
"steps": [
builder.fb_github_cmake_install(
'mvfst/build',
github_org='facebookincubator',
),
"mvfst/build", github_org="facebookincubator"
)
],
}

3
build/fbcode_builder/specs/proxygen.py
View File

@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt
import specs.folly as folly
import specs.fizz as fizz
@ -27,6 +28,6 @@ def fbcode_builder_spec(builder):
)
return {
"depends_on": [fmt, folly, wangle, fizz, sodium, zstd, mvfst],
"depends_on": [gmock, fmt, folly, wangle, fizz, sodium, zstd, mvfst],
"steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")],
}

10
build/fbcode_builder/specs/proxygen_quic.py
View File

@ -5,6 +5,8 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt
import specs.folly as folly
import specs.fizz as fizz
import specs.mvfst as mvfst
@ -18,13 +20,9 @@ import specs.zstd as zstd
def fbcode_builder_spec(builder):
builder.add_option(
"proxygen/proxygen:cmake_defines",
{
"BUILD_QUIC": "ON",
"BUILD_SHARED_LIBS": "OFF",
"BUILD_TESTS": "ON",
},
{"BUILD_QUIC": "ON", "BUILD_SHARED_LIBS": "OFF", "BUILD_TESTS": "ON"},
)
return {
"depends_on": [folly, wangle, fizz, sodium, zstd, mvfst],
"depends_on": [gmock, fmt, folly, wangle, fizz, sodium, zstd, mvfst],
"steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")],
}

15
build/fbcode_builder/specs/wangle.py
View File

@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt
import specs.folly as folly
import specs.fizz as fizz
@ -14,15 +15,13 @@ import specs.sodium as sodium
def fbcode_builder_spec(builder):
# Projects that **depend** on wangle need not spend time on tests.
builder.add_option(
'wangle/wangle/build:cmake_defines',
"wangle/wangle/build:cmake_defines",
{
# This is set to ON in the wangle `fbcode_builder_config.py`
'BUILD_TESTS': 'OFF',
}
# This is set to ON in the wangle `fbcode_builder_config.py`
"BUILD_TESTS": "OFF"
},
)
return {
'depends_on': [fmt, folly, fizz, sodium],
'steps': [
builder.fb_github_cmake_install('wangle/wangle/build'),
],
"depends_on": [gmock, fmt, folly, fizz, sodium],
"steps": [builder.fb_github_cmake_install("wangle/wangle/build")],
}