Skip to content

Commit

Permalink
Remove import use from TARGETS
Browse files Browse the repository at this point in the history
Summary:
We're moving away from `import`. The equivalent internal construct that
gets the directory from `fbcode/` is `package_name()`. This is a
Skylark friendly wrapper around [`get_base_path`].

The additional whitespace change is from running `python ./buckifier/buckify_rocksdb.py`.

[`get_base_path`]: https://buckbuild.com/function/get_base_path.html
Closes facebook#3210

Reviewed By: yiwu-arbug

Differential Revision: D6451242

Pulled By: zertosh

fbshipit-source-id: 445757261de0ec89d5d332c1ba9af097086326dc
  • Loading branch information
zertosh authored and facebook-github-bot committed Nov 30, 2017
1 parent 54095d3 commit fad1405
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 12 deletions.
10 changes: 3 additions & 7 deletions TARGETS
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
import os

TARGETS_PATH = os.path.dirname(__file__)

REPO_PATH = TARGETS_PATH[(TARGETS_PATH.find('fbcode/') + len('fbcode/')):] + "/"
REPO_PATH = package_name() + "/"

BUCK_BINS = "buck-out/gen/" + REPO_PATH

Expand Down Expand Up @@ -1033,7 +1029,7 @@ if not is_opt_mode:
test_cc = test_cfg[1]
ttype = "gtest" if test_cfg[2] == "parallel" else "simple"
test_bin = test_name + "_bin"

cpp_binary (
name = test_bin,
srcs = [test_cc],
Expand All @@ -1043,7 +1039,7 @@ if not is_opt_mode:
compiler_flags = rocksdb_compiler_flags,
external_deps = rocksdb_external_deps,
)

custom_unittest(
name = test_name,
type = ttype,
Expand Down
6 changes: 1 addition & 5 deletions buckifier/targets_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
rocksdb_target_header = """import os
TARGETS_PATH = os.path.dirname(__file__)
REPO_PATH = TARGETS_PATH[(TARGETS_PATH.find('fbcode/') + len('fbcode/')):] + "/"
rocksdb_target_header = """REPO_PATH = package_name() + "/"
BUCK_BINS = "buck-out/gen/" + REPO_PATH
Expand Down

0 comments on commit fad1405

Please sign in to comment.