Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load py_library, py_binary from rules_python #129

Merged
merged 1 commit into from
Apr 11, 2024
Merged

Load py_library, py_binary from rules_python #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,36 @@
workspace(name = "com_google_emboss")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

# googletest
git_repository(
name = "com_google_googletest",
remote = "https://github.com/google/googletest",
commit = "2f2e72bae991138cedd0e3d06a115022736cd568",
remote = "https://github.com/google/googletest",
shallow_since = "1563302555 -0400",
)

git_repository(
name = "com_google_absl",
remote = "https://github.com/abseil/abseil-cpp",
commit = "3020b58f0d987073b8adab204426f82c3f60b283",
remote = "https://github.com/abseil/abseil-cpp",
shallow_since = "1562769772 +0000",
)

http_archive(
name = "bazel_skylib",
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz"],
sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
name = "bazel_skylib",
sha256 = "f7be3474d42aae265405a592bb7da8e171919d74c16f082a5457840f06054728",
urls = ["https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz"],
)

http_archive(
name = "rules_python",
sha256 = "c68bdc4fbec25de5b5493b8819cfc877c4ea299c0dcb15c244c5a00208cde311",
strip_prefix = "rules_python-0.31.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz",
)

load("@rules_python//python:repositories.bzl", "py_repositories")

py_repositories()
5 changes: 4 additions & 1 deletion compiler/back_end/cpp/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

# Emboss C++ code generator.

load("@rules_python//python:py_binary.bzl", "py_binary")
load("@rules_python//python:py_library.bzl", "py_library")
load("@rules_python//python:py_test.bzl", "py_test")
load(":build_defs.bzl", "emboss_cc_test")

package(
Expand All @@ -37,7 +40,7 @@ py_binary(
py_library(
name = "attributes",
srcs = ["attributes.py"],
deps = []
deps = [],
)

py_library(
Expand Down
3 changes: 3 additions & 0 deletions compiler/back_end/util/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

# Shared utilities for Emboss back ends.

load("@rules_python//python:py_library.bzl", "py_library")
load("@rules_python//python:py_test.bzl", "py_test")

package(
default_visibility = ["//compiler:__subpackages__"],
)
Expand Down
20 changes: 12 additions & 8 deletions compiler/front_end/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
# intermediate representation (IR). The IR is passed to back end code
# generators to generate code in various languages.

load("@rules_python//python:py_binary.bzl", "py_binary")
load("@rules_python//python:py_library.bzl", "py_library")
load("@rules_python//python:py_test.bzl", "py_test")

package(
default_visibility = [
"//:__subpackages__",
Expand Down Expand Up @@ -135,8 +139,8 @@ py_library(
":tokenizer",
":type_check",
":write_inference",
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:parser_types",
"//compiler/util:resources",
],
Expand All @@ -151,8 +155,8 @@ py_test(
python_version = "PY3",
deps = [
":glue",
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:parser_types",
"//compiler/util:test_util",
],
Expand All @@ -163,8 +167,8 @@ py_library(
srcs = ["synthetics.py"],
visibility = ["//visibility:private"],
deps = [
"//compiler/util:ir_pb2",
"//compiler/util:expression_parser",
"//compiler/util:ir_pb2",
"//compiler/util:traverse_ir",
],
)
Expand All @@ -185,8 +189,8 @@ py_library(
srcs = ["symbol_resolver.py"],
visibility = ["//visibility:private"],
deps = [
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:ir_util",
"//compiler/util:traverse_ir",
],
Expand Down Expand Up @@ -257,8 +261,8 @@ py_test(
deps = [
":attribute_checker",
":glue",
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:ir_util",
"//compiler/util:test_util",
],
Expand All @@ -269,8 +273,8 @@ py_library(
srcs = ["type_check.py"],
deps = [
":attributes",
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:ir_util",
"//compiler/util:traverse_ir",
],
Expand Down Expand Up @@ -321,8 +325,8 @@ py_library(
],
deps = [
":attributes",
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:ir_util",
"//compiler/util:resources",
"//compiler/util:traverse_ir",
Expand All @@ -345,8 +349,8 @@ py_library(
name = "dependency_checker",
srcs = ["dependency_checker.py"],
deps = [
"//compiler/util:ir_pb2",
"//compiler/util:error",
"//compiler/util:ir_pb2",
"//compiler/util:ir_util",
"//compiler/util:traverse_ir",
],
Expand Down
9 changes: 6 additions & 3 deletions compiler/util/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

# Shared utilities for Emboss back ends.

load("@rules_python//python:py_library.bzl", "py_library")
load("@rules_python//python:py_test.bzl", "py_test")

package(
default_visibility = ["//compiler:__subpackages__"],
)
Expand Down Expand Up @@ -100,8 +103,8 @@ py_library(
name = "traverse_ir",
srcs = ["traverse_ir.py"],
deps = [
":simple_memoizer",
":ir_pb2",
":simple_memoizer",
],
)

Expand All @@ -110,8 +113,8 @@ py_test(
srcs = ["traverse_ir_test.py"],
python_version = "PY3",
deps = [
":traverse_ir",
":ir_pb2",
":traverse_ir",
],
)

Expand All @@ -128,8 +131,8 @@ py_test(
srcs = ["parser_types_test.py"],
python_version = "PY3",
deps = [
":parser_types",
":ir_pb2",
":parser_types",
],
)

Expand Down
2 changes: 1 addition & 1 deletion doc/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
filegroup(
name = "grammar_md",
srcs = [
"grammar.md",
"__init__.py",
"grammar.md",
],
# This should only be needed by docs_are_up_to_date_test.
visibility = ["//:__subpackages__"],
Expand Down
4 changes: 2 additions & 2 deletions integration/googletest/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ cc_library(
visibility = ["//visibility:public"],
deps = [
"//runtime/cpp:cpp_utils",
"@com_google_googletest//:gtest",
"@com_google_absl//absl/memory",
"@com_google_googletest//:gtest",
],
)

Expand All @@ -32,7 +32,7 @@ cc_test(
copts = ["-Wsign-compare"],
deps = [
":emboss_test_util",
"@com_google_googletest//:gtest_main",
"//testdata:complex_structure_emboss",
"@com_google_googletest//:gtest_main",
],
)
2 changes: 1 addition & 1 deletion runtime/cpp/test/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ emboss_cc_util_test(
copts = ["-DEMBOSS_FORCE_ALL_CHECKS"],
deps = [
"//runtime/cpp:cpp_utils",
"@com_google_googletest//:gtest_main",
"@com_google_absl//absl/strings:str_format",
"@com_google_googletest//:gtest_main",
],
)

Expand Down
26 changes: 13 additions & 13 deletions testdata/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@

# Shared test data for Emboss.

load("//:build_defs.bzl",
"emboss_cc_library",
"emboss_library",
"cc_emboss_library"
load(
"//:build_defs.bzl",
"cc_emboss_library",
"emboss_cc_library",
"emboss_library",
)

package(
Expand All @@ -27,17 +28,18 @@ package(
filegroup(
name = "golden_files",
srcs = [
"golden/__init__.py",
"golden/span_se_log_file_status.emb",
"golden/span_se_log_file_status.ir.txt",
"golden/span_se_log_file_status.parse_tree.txt",
"golden/span_se_log_file_status.tokens.txt",
"golden/__init__.py",
],
)

filegroup(
name = "test_embs",
srcs = [
"__init__.py",
"absolute_cpp_namespace.emb",
"anonymous_bits.emb",
"bcd.emb",
Expand All @@ -50,22 +52,21 @@ filegroup(
"enum_case.emb",
"explicit_sizes.emb",
"float.emb",
"import_dir/project/imported.emb",
"import_dir/project/importer.emb",
"imported.emb",
"imported_genfiles.emb",
"importer.emb",
"import_dir/project/imported.emb",
"import_dir/project/importer.emb",
"int_sizes.emb",
"nested_structure.emb",
"no_cpp_namespace.emb",
"next_keyword.emb",
"no_cpp_namespace.emb",
"parameters.emb",
"requires.emb",
"subtypes.emb",
"text_format.emb",
"uint_sizes.emb",
"virtual_field.emb",
"__init__.py",
],
)

Expand Down Expand Up @@ -180,15 +181,14 @@ emboss_cc_library(
srcs = [
"import_dir/project/importer.emb",
],
import_dirs = [
"import_dir",
],
deps = [
":import_dir_imported_emboss",
],
import_dirs = [
"import_dir",
]
)


emboss_cc_library(
name = "importer2_emboss",
srcs = [
Expand Down