Skip to content

Commit

Permalink
Update TARGETS and related scripts (#9310)
Browse files Browse the repository at this point in the history
Summary:
As title. Remove 'unexported_deps_by_default', replace 'deps' and
'external_deps' with 'exported_deps' and 'exported_external_deps'
respectively.

Pull Request resolved: #9310

Test Plan: Github action and internal jobs.

Reviewed By: DrMarcII

Differential Revision: D33190092

Pulled By: riversand963

fbshipit-source-id: 64200e5331d822f88f8d122a55b7a29bfd1f9553
  • Loading branch information
riversand963 authored and facebook-github-bot committed Dec 17, 2021
1 parent 423538a commit 6b5e28a
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 27 deletions.
35 changes: 14 additions & 21 deletions TARGETS
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [],
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = [],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)

cpp_library(
Expand Down Expand Up @@ -795,9 +794,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [],
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = [],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)

cpp_library(
Expand All @@ -820,9 +818,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [":rocksdb_lib"],
external_deps = ROCKSDB_EXTERNAL_DEPS + [
exported_deps = [":rocksdb_lib"],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS + [
("googletest", None, "gtest"),
],
)
Expand All @@ -844,9 +841,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [":rocksdb_lib"],
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = [":rocksdb_lib"],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)

cpp_library(
Expand All @@ -860,9 +856,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [":rocksdb_lib"],
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = [":rocksdb_lib"],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)

cpp_library(
Expand Down Expand Up @@ -892,9 +887,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = ROCKSDB_LIB_DEPS,
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = ROCKSDB_LIB_DEPS,
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)

cpp_binary(
Expand Down Expand Up @@ -928,9 +922,8 @@ cpp_library(
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [":rocksdb_test_lib"],
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = [":rocksdb_test_lib"],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)

# [test_name, test_src, test_type, extra_deps, extra_compiler_flags]
Expand Down
10 changes: 4 additions & 6 deletions buckifier/targets_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,8 @@
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = [{deps}],
external_deps = ROCKSDB_EXTERNAL_DEPS{extra_external_deps},
exported_deps = [{deps}],
exported_external_deps = ROCKSDB_EXTERNAL_DEPS{extra_external_deps},
)
"""

Expand All @@ -176,9 +175,8 @@
os_deps = ROCKSDB_OS_DEPS,
os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
unexported_deps_by_default = False,
deps = ROCKSDB_LIB_DEPS,
external_deps = ROCKSDB_EXTERNAL_DEPS,
exported_deps = ROCKSDB_LIB_DEPS,
exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
)
"""

Expand Down

0 comments on commit 6b5e28a

Please sign in to comment.