Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
load(
"@io_bazel_rules_go//go/private:tools/lines_sorted_test.bzl",
"@io_bazel_rules_go//go/private/tools:lines_sorted_test.bzl",
"lines_sorted_test",
)
load(
"@io_bazel_rules_go//go/private:rules/nogo.bzl",
"@io_bazel_rules_go//go/private/rules:nogo.bzl",
"nogo",
)
load(
"@io_bazel_rules_go//go/private:rules/info.bzl",
"@io_bazel_rules_go//go/private/rules:info.bzl",
"go_info",
)
load(
Expand All @@ -22,7 +22,7 @@ load(
"go_context_data",
)
load(
"@io_bazel_rules_go//go/private:rules/stdlib.bzl",
"@io_bazel_rules_go//go/private/rules:stdlib.bzl",
"stdlib",
)

Expand Down
11 changes: 0 additions & 11 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,6 @@ load("@io_bazel_rules_go//extras:embed_data_deps.bzl", "go_embed_data_dependenci

go_embed_data_dependencies()

http_archive(
name = "rules_proto",
sha256 = "4d421d51f9ecfe9bf96ab23b55c6f2b809cbaf0eea24952683e397decfbd0dd0",
strip_prefix = "rules_proto-f6b8d89b90a7956f6782a4a3609b2f0eee3ce965",
# master, as of 2020-01-06
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/f6b8d89b90a7956f6782a4a3609b2f0eee3ce965.tar.gz",
"https://github.com/bazelbuild/rules_proto/archive/f6b8d89b90a7956f6782a4a3609b2f0eee3ce965.tar.gz",
],
)

# Used by //tests:buildifier_test.
# Latest release is not compatible with the incompatible bazel flags we use
# in CI, in particular, --incompatible_load_proto_rules_from_bzl.
Expand Down
24 changes: 24 additions & 0 deletions extras/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

filegroup(
name = "all_rules",
srcs = glob(["*.bzl"]) + ["//go/private:all_rules"],
Expand All @@ -10,3 +12,25 @@ filegroup(
srcs = glob(["**"]),
visibility = ["//visibility:public"],
)

bzl_library(
name = "bindata",
srcs = ["bindata.bzl"],
visibility = ["//visibility:public"],
deps = ["@io_bazel_rules_go//go:def"],
)

bzl_library(
name = "embed_data",
srcs = ["embed_data.bzl"],
visibility = ["//visibility:public"],
deps = ["@io_bazel_rules_go//go/private:context"],
)

bzl_library(
name = "embed_data_deps",
srcs = ["embed_data_deps.bzl"],
visibility = ["//visibility:public"],
# Don't list dependency on @bazel_tools//tools/build_defs/repo.bzl
deps = [], # keep
)
30 changes: 30 additions & 0 deletions go/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

filegroup(
name = "all_files",
testonly = True,
Expand Down Expand Up @@ -25,3 +27,31 @@ toolchain_type(
name = "toolchain",
visibility = ["//visibility:public"],
)

bzl_library(
name = "def",
srcs = ["def.bzl"],
visibility = ["//visibility:public"],
deps = [
"//extras:embed_data",
"//go/private:context",
"//go/private:go_toolchain",
"//go/private:providers",
"//go/private/rules:library",
"//go/private/rules:nogo",
"//go/private/rules:sdk",
"//go/private/rules:source",
"//go/private/rules:wrappers",
"//go/private/tools:path",
],
)

bzl_library(
name = "deps",
srcs = ["deps.bzl"],
visibility = ["//visibility:public"],
deps = [
"//go/private:repositories",
"//go/private:sdk",
],
)
20 changes: 10 additions & 10 deletions go/def.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ may change without notice.
"""

load(
"@io_bazel_rules_go//go/private:context.bzl",
"//go/private:context.bzl",
_go_context = "go_context",
)
load(
"@io_bazel_rules_go//go/private:providers.bzl",
"//go/private:providers.bzl",
_GoArchive = "GoArchive",
_GoArchiveData = "GoArchiveData",
_GoLibrary = "GoLibrary",
Expand All @@ -36,38 +36,38 @@ load(
_GoSource = "GoSource",
)
load(
"@io_bazel_rules_go//go/private:rules/sdk.bzl",
"//go/private/rules:sdk.bzl",
_go_sdk = "go_sdk",
)
load(
"@io_bazel_rules_go//go/private:go_toolchain.bzl",
"//go/private:go_toolchain.bzl",
_declare_toolchains = "declare_toolchains",
_go_toolchain = "go_toolchain",
)
load(
"@io_bazel_rules_go//go/private:rules/wrappers.bzl",
"//go/private/rules:wrappers.bzl",
_go_binary_macro = "go_binary_macro",
_go_library_macro = "go_library_macro",
_go_test_macro = "go_test_macro",
)
load(
"@io_bazel_rules_go//go/private:rules/source.bzl",
"//go/private/rules:source.bzl",
_go_source = "go_source",
)
load(
"@io_bazel_rules_go//extras:embed_data.bzl",
"//extras:embed_data.bzl",
_go_embed_data = "go_embed_data",
)
load(
"@io_bazel_rules_go//go/private:tools/path.bzl",
"//go/private/tools:path.bzl",
_go_path = "go_path",
)
load(
"@io_bazel_rules_go//go/private:rules/library.bzl",
"//go/private/rules:library.bzl",
_go_tool_library = "go_tool_library",
)
load(
"@io_bazel_rules_go//go/private:rules/nogo.bzl",
"//go/private/rules:nogo.bzl",
_nogo = "nogo_wrapper",
)

Expand Down
13 changes: 13 additions & 0 deletions go/platform/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

# This file declares a config_setting for each platform supported by the
# Go SDK. These rules follow a goos_goarch naming convention, for example,
# //go/platform:linux_amd64
Expand All @@ -23,3 +25,14 @@ filegroup(
srcs = glob(["**"]),
visibility = ["//visibility:public"],
)

bzl_library(
name = "list",
srcs = ["list.bzl"],
deps = ["@io_bazel_rules_go//go/private:platforms"],
)

bzl_library(
name = "apple",
srcs = ["apple.bzl"],
)
118 changes: 116 additions & 2 deletions go/private/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")

filegroup(
name = "all_rules",
srcs = glob(["**/*.bzl"]),
srcs = [
"//go/private/actions:all_rules",
"//go/private/rules:all_rules",
"//go/private/skylib/lib:all_rules",
"//go/private/tools:all_rules",
] + glob(["**/*.bzl"]),
visibility = ["//visibility:public"],
)

filegroup(
name = "all_files",
testonly = True,
srcs = glob(["**"]),
srcs = [
"//go/private/actions:all_files",
"//go/private/rules:all_files",
"//go/private/skylib/lib:all_files",
"//go/private/tools:all_files",
] + glob(["**"]),
visibility = ["//visibility:public"],
)

Expand All @@ -30,3 +42,105 @@ config_setting(
name = "stamp",
values = {"stamp": "true"},
)

bzl_library(
name = "context",
srcs = ["context.bzl"],
visibility = [
"//extras:__pkg__", # Manually added
"//go:__subpackages__",
],
deps = [
Comment thread
achew22 marked this conversation as resolved.
":common",
":mode",
":providers",
"//go/platform:apple",
"@bazel_skylib//lib:paths",
"@bazel_skylib//rules:common_settings",
"@bazel_tools//tools/build_defs/cc:action_names.bzl",
"@bazel_tools//tools/cpp:toolchain_utils.bzl",
],
)

bzl_library(
name = "go_toolchain",
srcs = ["go_toolchain.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:platforms",
"@io_bazel_rules_go//go/private:providers",
"@io_bazel_rules_go//go/private/actions:archive",
"@io_bazel_rules_go//go/private/actions:asm",
"@io_bazel_rules_go//go/private/actions:binary",
"@io_bazel_rules_go//go/private/actions:compile",
"@io_bazel_rules_go//go/private/actions:cover",
"@io_bazel_rules_go//go/private/actions:link",
"@io_bazel_rules_go//go/private/actions:pack",
"@io_bazel_rules_go//go/private/actions:stdlib",
],
)

bzl_library(
name = "repositories",
srcs = ["repositories.bzl"],
visibility = ["//go:__subpackages__"],
# Don't list dependency on @bazel_tools//tools/build_defs/repo:http.bzl
deps = [
":common",
":nogo",
"//go/private/skylib/lib:versions",
"//proto:gogo",
], # keep
)

bzl_library(
name = "sdk",
srcs = ["sdk.bzl"],
visibility = ["//go:__subpackages__"],
deps = [
"@io_bazel_rules_go//go/private:common",
"@io_bazel_rules_go//go/private:nogo",
"@io_bazel_rules_go//go/private:platforms",
"@io_bazel_rules_go//go/private:sdk_list",
"@io_bazel_rules_go//go/private/skylib/lib:versions",
],
)

bzl_library(
name = "common",
srcs = ["common.bzl"],
visibility = ["//go:__subpackages__"],
)

bzl_library(
name = "mode",
srcs = ["mode.bzl"],
visibility = ["//go:__subpackages__"],
)

bzl_library(
name = "nogo",
srcs = ["nogo.bzl"],
visibility = ["//go:__subpackages__"],
)

bzl_library(
name = "platforms",
srcs = ["platforms.bzl"],
visibility = ["//go:__subpackages__"],
)

bzl_library(
name = "providers",
srcs = ["providers.bzl"],
visibility = [
"//go:__subpackages__",
"//proto:__pkg__", # keep
],
)

bzl_library(
name = "sdk_list",
srcs = ["sdk_list.bzl"],
visibility = ["//go:__subpackages__"],
)
4 changes: 2 additions & 2 deletions go/private/BUILD.sdk.bazel
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@io_bazel_rules_go//go/private:rules/binary.bzl", "go_tool_binary")
load("@io_bazel_rules_go//go/private:rules/sdk.bzl", "package_list")
load("@io_bazel_rules_go//go/private/rules:binary.bzl", "go_tool_binary")
load("@io_bazel_rules_go//go/private/rules:sdk.bzl", "package_list")
load("@io_bazel_rules_go//go:def.bzl", "declare_toolchains", "go_sdk")

package(default_visibility = ["//visibility:public"])
Expand Down
Loading