From 6b5e28a43cf0c726c688a669232f135dcec1c8cc Mon Sep 17 00:00:00 2001 From: Yanqin Jin Date: Fri, 17 Dec 2021 11:50:30 -0800 Subject: [PATCH] Update TARGETS and related scripts (#9310) Summary: As title. Remove 'unexported_deps_by_default', replace 'deps' and 'external_deps' with 'exported_deps' and 'exported_external_deps' respectively. Pull Request resolved: https://github.com/facebook/rocksdb/pull/9310 Test Plan: Github action and internal jobs. Reviewed By: DrMarcII Differential Revision: D33190092 Pulled By: riversand963 fbshipit-source-id: 64200e5331d822f88f8d122a55b7a29bfd1f9553 --- TARGETS | 35 ++++++++++++++--------------------- buckifier/targets_cfg.py | 10 ++++------ 2 files changed, 18 insertions(+), 27 deletions(-) diff --git a/TARGETS b/TARGETS index 934027327..2d13cc8d9 100644 --- a/TARGETS +++ b/TARGETS @@ -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( @@ -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( @@ -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"), ], ) @@ -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( @@ -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( @@ -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( @@ -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] diff --git a/buckifier/targets_cfg.py b/buckifier/targets_cfg.py index a97ef3853..f3790d4a6 100644 --- a/buckifier/targets_cfg.py +++ b/buckifier/targets_cfg.py @@ -159,9 +159,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 = [{deps}], - external_deps = ROCKSDB_EXTERNAL_DEPS{extra_external_deps}, + exported_deps = [{deps}], + exported_external_deps = ROCKSDB_EXTERNAL_DEPS{extra_external_deps}, ) """ @@ -176,9 +175,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, ) """