Skip to content

Commit

Permalink
update pkg_tar to 0.3.x
Browse files Browse the repository at this point in the history
Needed to unblock #8857

Closes #11270.

PiperOrigin-RevId: 366994484
  • Loading branch information
aiuto authored and copybara-github committed Apr 6, 2021
1 parent e414d6f commit 99079b3
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 14 deletions.
14 changes: 6 additions & 8 deletions BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ pkg_tar(
"@com_google_protobuf//:protobuf_java_util",
"@com_google_protobuf//:protobuf_javalite",
],
remap_paths = {
"..": "derived/jars",
},
strip_prefix = ".",
package_dir = "derived/jars",
strip_prefix = "external",
# Public but bazel-only visibility.
visibility = ["//:__subpackages__"],
)
Expand Down Expand Up @@ -127,11 +125,12 @@ pkg_tar(
":generated_resources",
":srcs",
],
# TODO(aiuto): Replace with pkg_filegroup when that is available.
remap_paths = {
"WORKSPACE.filtered": "WORKSPACE",
# Rewrite paths coming from local repositories back into third_party.
"../googleapis": "third_party/googleapis",
"../remoteapis": "third_party/remoteapis",
"external/googleapis": "third_party/googleapis",
"external/remoteapis": "third_party/remoteapis",
},
strip_prefix = ".",
# Public but bazel-only visibility.
Expand All @@ -141,8 +140,7 @@ pkg_tar(
pkg_tar(
name = "platforms-srcs",
srcs = ["@platforms//:srcs"],
package_dir = "platforms",
strip_prefix = ".",
strip_prefix = "external",
visibility = ["//:__subpackages__"],
)

Expand Down
2 changes: 0 additions & 2 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -812,8 +812,6 @@ register_execution_platforms("//:default_host_platform") # buildozer: disable=p
# Tools for building deb, rpm and tar files.
dist_http_archive(
name = "rules_pkg",
patch_cmds = EXPORT_WORKSPACE_IN_BUILD_FILE,
patch_cmds_win = EXPORT_WORKSPACE_IN_BUILD_FILE_WIN,
)

load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
Expand Down
8 changes: 4 additions & 4 deletions distdir_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,11 @@ DIST_DEPS = {
"strip_prefix": "stardoc-1ef781ced3b1443dca3ed05dec1989eca1a4e1cd",
},
"rules_pkg": {
"archive": "rules_pkg-0.2.4.tar.gz",
"sha256": "4ba8f4ab0ff85f2484287ab06c0d871dcb31cc54d439457d28fd4ae14b18450a",
"archive": "rules_pkg-0.4.0.tar.gz",
"sha256": "038f1caa773a7e35b3663865ffb003169c6a71dc995e39bf4815792f385d837d",
"urls": [
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
"https://github.com/bazelbuild/rules_pkg/releases/download/0.2.4/rules_pkg-0.2.4.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
"https://github.com/bazelbuild/rules_pkg/releases/download/0.4.0/rules_pkg-0.4.0.tar.gz",
],
"used_in": [
"additional_distfiles",
Expand Down

0 comments on commit 99079b3

Please sign in to comment.