Skip to content

WIP try to use source directories for crates #54

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

Draft
dzbarsky wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP try to use source directories for crates #54

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
10 changes: 7 additions & 3 deletions rs/private/crate_git_repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch")
load(":repository_utils.bzl", "common_attrs", "generate_build_file")
load("@bazel_skylib//lib:paths.bzl", "paths")
load(":repository_utils.bzl", "BUILD_FILE_DIR", "common_attrs", "generate_build_file", "generate_root_build_file", "materialize_crate_tree")
load(":toml2json.bzl", "run_toml2json")

_INHERITABLE_FIELDS = [
Expand Down Expand Up @@ -46,7 +47,9 @@ def _crate_git_repository_implementation(rctx):

patch(rctx)

cargo_toml = run_toml2json(rctx, "Cargo.toml")
materialize_crate_tree(rctx)

cargo_toml = run_toml2json(rctx, paths.join(BUILD_FILE_DIR, "Cargo.toml"))

if strip_prefix:
workspace_cargo_toml_path = repo_dir.get_child(rctx.attr.workspace_cargo_toml)
Expand All @@ -61,7 +64,8 @@ def _crate_git_repository_implementation(rctx):
if type(value) == "dict" and value.get("workspace") == True:
crate_package[field] = workspace_package.get(field)

rctx.file("BUILD.bazel", generate_build_file(rctx, cargo_toml))
rctx.file(paths.join(BUILD_FILE_DIR, "BUILD.bazel"), generate_build_file(rctx, cargo_toml))
rctx.file("BUILD.bazel", generate_root_build_file(rctx, cargo_toml))

return rctx.repo_metadata(reproducible = True)

Expand Down
17 changes: 12 additions & 5 deletions rs/private/crate_repository.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
load("@bazel_tools//tools/build_defs/repo:cache.bzl", "get_default_canonical_id")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "patch")
load(":cargo_credentials.bzl", "load_cargo_credentials", "registry_auth_headers")
load(":repository_utils.bzl", "generate_build_file", "common_attrs")
load("@bazel_skylib//lib:paths.bzl", "paths")
load(":repository_utils.bzl", "BUILD_FILE_DIR", "common_attrs", "generate_build_file", "generate_root_build_file", "materialize_crate_tree")
load(":toml2json.bzl", "run_toml2json")

def _crate_repository_impl(rctx):
Expand All @@ -25,9 +26,12 @@ def _crate_repository_impl(rctx):

patch(rctx)

cargo_toml = run_toml2json(rctx, "Cargo.toml")
materialize_crate_tree(rctx)

rctx.file("BUILD.bazel", generate_build_file(rctx, cargo_toml))
cargo_toml = run_toml2json(rctx, paths.join(BUILD_FILE_DIR, "Cargo.toml"))

rctx.file(paths.join(BUILD_FILE_DIR, "BUILD.bazel"), generate_build_file(rctx, cargo_toml))
rctx.file("BUILD.bazel", generate_root_build_file(rctx, cargo_toml))

return rctx.repo_metadata(reproducible = True)

Expand Down Expand Up @@ -55,9 +59,12 @@ def _local_crate_repository_impl(rctx):

patch(rctx)

cargo_toml = run_toml2json(rctx, "Cargo.toml")
materialize_crate_tree(rctx)

cargo_toml = run_toml2json(rctx, paths.join(BUILD_FILE_DIR, "Cargo.toml"))

rctx.file("BUILD.bazel", generate_build_file(rctx, cargo_toml))
rctx.file(paths.join(BUILD_FILE_DIR, "BUILD.bazel"), generate_build_file(rctx, cargo_toml))
rctx.file("BUILD.bazel", generate_root_build_file(rctx, cargo_toml))

return rctx.repo_metadata(reproducible = True)

Expand Down
Loading
Loading