Commit 0e50cd03 authored by Luca Niccolini's avatar Luca Niccolini Committed by Facebook GitHub Bot

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

Summary: they were all transitively pulling it from folly

Reviewed By: mjoras

Differential Revision: D23683292

fbshipit-source-id: 2085a580584891b3fd0960c14505c0f675a11bd5
parent 25e3fd32
...@@ -5,6 +5,7 @@ from __future__ import division ...@@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt import specs.fmt as fmt
import specs.folly as folly import specs.folly as folly
import specs.sodium as sodium import specs.sodium as sodium
...@@ -12,20 +13,19 @@ import specs.sodium as sodium ...@@ -12,20 +13,19 @@ import specs.sodium as sodium
def fbcode_builder_spec(builder): def fbcode_builder_spec(builder):
builder.add_option( 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` # Fizz's build is kind of broken, in the sense that both `mvfst`
# and `proxygen` depend on files that are only installed with # and `proxygen` depend on files that are only installed with
# `BUILD_TESTS` enabled, e.g. `fizz/crypto/test/TestUtil.h`. # `BUILD_TESTS` enabled, e.g. `fizz/crypto/test/TestUtil.h`.
'BUILD_TESTS': 'ON', "BUILD_TESTS": "ON"
} },
) )
return { return {
'depends_on': [fmt, folly, sodium], "depends_on": [gmock, fmt, folly, sodium],
'steps': [ "steps": [
builder.fb_github_cmake_install( builder.fb_github_cmake_install(
'fizz/fizz/build', "fizz/fizz/build", github_org="facebookincubator"
github_org='facebookincubator', )
),
], ],
} }
...@@ -5,6 +5,7 @@ from __future__ import division ...@@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals from __future__ import unicode_literals
import specs.gmock as gmock
import specs.folly as folly import specs.folly as folly
import specs.fizz as fizz import specs.fizz as fizz
...@@ -12,18 +13,17 @@ import specs.fizz as fizz ...@@ -12,18 +13,17 @@ import specs.fizz as fizz
def fbcode_builder_spec(builder): def fbcode_builder_spec(builder):
# Projects that **depend** on mvfst should don't need to build tests. # Projects that **depend** on mvfst should don't need to build tests.
builder.add_option( builder.add_option(
'mvfst/build:cmake_defines', "mvfst/build:cmake_defines",
{ {
# This is set to ON in the mvfst `fbcode_builder_config.py` # This is set to ON in the mvfst `fbcode_builder_config.py`
'BUILD_TESTS': 'OFF', "BUILD_TESTS": "OFF"
} },
) )
return { return {
'depends_on': [folly, fizz], "depends_on": [gmock, folly, fizz],
'steps': [ "steps": [
builder.fb_github_cmake_install( builder.fb_github_cmake_install(
'mvfst/build', "mvfst/build", github_org="facebookincubator"
github_org='facebookincubator', )
),
], ],
} }
...@@ -5,6 +5,7 @@ from __future__ import division ...@@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt import specs.fmt as fmt
import specs.folly as folly import specs.folly as folly
import specs.fizz as fizz import specs.fizz as fizz
...@@ -27,6 +28,6 @@ def fbcode_builder_spec(builder): ...@@ -27,6 +28,6 @@ def fbcode_builder_spec(builder):
) )
return { 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", "..")], "steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")],
} }
...@@ -5,6 +5,8 @@ from __future__ import division ...@@ -5,6 +5,8 @@ from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt
import specs.folly as folly import specs.folly as folly
import specs.fizz as fizz import specs.fizz as fizz
import specs.mvfst as mvfst import specs.mvfst as mvfst
...@@ -18,13 +20,9 @@ import specs.zstd as zstd ...@@ -18,13 +20,9 @@ import specs.zstd as zstd
def fbcode_builder_spec(builder): def fbcode_builder_spec(builder):
builder.add_option( builder.add_option(
"proxygen/proxygen:cmake_defines", "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 { 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", "..")], "steps": [builder.fb_github_cmake_install("proxygen/proxygen", "..")],
} }
...@@ -5,6 +5,7 @@ from __future__ import division ...@@ -5,6 +5,7 @@ from __future__ import division
from __future__ import print_function from __future__ import print_function
from __future__ import unicode_literals from __future__ import unicode_literals
import specs.gmock as gmock
import specs.fmt as fmt import specs.fmt as fmt
import specs.folly as folly import specs.folly as folly
import specs.fizz as fizz import specs.fizz as fizz
...@@ -14,15 +15,13 @@ import specs.sodium as sodium ...@@ -14,15 +15,13 @@ import specs.sodium as sodium
def fbcode_builder_spec(builder): def fbcode_builder_spec(builder):
# Projects that **depend** on wangle need not spend time on tests. # Projects that **depend** on wangle need not spend time on tests.
builder.add_option( 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` # This is set to ON in the wangle `fbcode_builder_config.py`
'BUILD_TESTS': 'OFF', "BUILD_TESTS": "OFF"
} },
) )
return { return {
'depends_on': [fmt, folly, fizz, sodium], "depends_on": [gmock, fmt, folly, fizz, sodium],
'steps': [ "steps": [builder.fb_github_cmake_install("wangle/wangle/build")],
builder.fb_github_cmake_install('wangle/wangle/build'),
],
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment