Add subincludes (#28)

Means that consuming repos don't have to always globally subinclude the rules in order to use them.

Co-authored-by: Jon Poole <[email protected]>
Co-authored-by: Chris Novakovic <[email protected]>

Author: 3 people

Diff for: .plzconfig

@@ -1,8 +1,12 @@
 [please]
-version = >=16.12.1
-
-[parse]
-preloadbuilddefs = build_defs/cc.build_defs
+version = >=17.0.0
+
+[Plugin "python"]
+Target = //plugins:python
+ModuleDir = third_party.python
+WheelRepo = https://get.please.build/third_party/python/py3
+WheelNameScheme = {url_base}/{package_name}-{version}-${{OS}}_${{ARCH}}.whl
+WheelNameScheme = "{url_base}/{package_name}-{version}.whl"
 
 [PluginDefinition]
 name = cc

Diff for: build_defs/c.build_defs

@@ -6,7 +6,7 @@ other than using different config settings.
 Both C and C++ can be mixed and matched arbitrarily, but of course to do so
 you must pay attention to interoperability when needed (e.g. 'extern "C"' and so forth).
 """
-subinclude("///cc//build_defs:cc")
+subinclude("//build_defs:cc")
 
 def c_library(name:str, srcs:list=[], hdrs:list=[], private_hdrs:list=[], deps:list=[], out:str='', optional_outs:list=[],
               visibility:list=None, test_only:bool&testonly=False, compiler_flags:list&cflags&copts=[],

Diff for: compdb/BUILD

@@ -1,3 +1,5 @@
+subinclude("//build_defs:cc")
+
 cc_binary(
     name = "compdb",
     srcs = ["compdb.cc"],

Diff for: gtest/BUILD

@@ -0,0 +1,4 @@
+plugin_repo(
+    name = "python",
+    revision = "v1.12.2",
+)

Diff for: plugins/BUILD

@@ -1,6 +1,8 @@
 # Test the way cc rules depend on one another; ideally we should be able to
 # pick up all transitive dependencies correctly but compile the .o files independently.
 
+subinclude("//build_defs:cc")
+
 cc_library(
     name = "lib1",
     srcs = ["lib1.cc"],

Diff for: test/BUILD

@@ -1,3 +1,5 @@
+subinclude("//build_defs:cc")
+
 cc_binary(
     name = "test_binary",
     srcs = ["test_binary.cc"],

Diff for: test/binary/BUILD

@@ -1,3 +1,5 @@
+subinclude("//build_defs:c")
+
 c_test(
     name = "c_test",
     srcs = ["test.c"],

Diff for: test/c/BUILD

@@ -1,3 +1,5 @@
+subinclude("//build_defs:cc")
+
 # Tests that a sequence of dependencies works as expected.
 cc_library(
     name = "lib1",

Diff for: test/deps/BUILD

@@ -1,4 +1,4 @@
-subinclude("//build_defs:cc_embed_binary")
+subinclude("//build_defs:cc", "//build_defs:cc_embed_binary")
 
 cc_embed_binary(
     name = "embedded_file_1",

Diff for: test/embed/BUILD

@@ -1,3 +1,5 @@
+subinclude("//build_defs:cc")
+
 cc_library(
     name = "lib1",
     hdrs = ["lib1/include/lib.hpp"],

Diff for: test/gtest/BUILD

@@ -1,3 +1,5 @@
+subinclude("//build_defs:cc")
+
 # Currently only supported for Clang.
 if "clang" in CONFIG.CC.CPP_TOOL:
     cc_module(

Diff for: test/gtest/gtest_test.cc

@@ -1,3 +1,5 @@
+subinclude("//build_defs:cc", "///python//build_defs:python")
+
 # TODO(peterebden): now Python is becoming a plugin, we should choose something else to test with.
 cc_shared_object(
     name = "so_test",
@@ -30,5 +32,6 @@ python_test(
     zip_safe = False,
     deps = [
         ":so_test",
+        "//third_party/python:six",
     ],
 )

Diff for: test/labels/BUILD

@@ -0,0 +1,9 @@
+subinclude("///python//build_defs:python")
+
+python_wheel(
+    name = "six",
+    outs = ["six.py"],
+    hashes = ["8f3cd2e254d8f793e7f3d6d9df77b92252b52637291d0f0da013c76ea2724b6c"],
+    version = "1.14.0",
+    visibility = ["PUBLIC"],
+)

Diff for: test/modules/BUILD

@@ -1,3 +1,5 @@
+subinclude("///cc//build_defs:cc")
+
 github_repo(
     name = "unittest_cpp",
     repo = "unittest-cpp/unittest-cpp",
@@ -7,9 +9,21 @@ github_repo(
     strip_prefix = "unittest-cpp-2.0.0",
 )
 
+
+filegroup(
+    name = "srcs",
+    srcs = ["unittest_main.cc", "///unittest-pp/unittest_cpp//:unittest_cpp_srcs"],
+)
+
+filegroup(
+    name = "hdrs",
+    srcs = ["///unittest-pp/unittest_cpp//:unittest_cpp_hdrs"],
+)
+
 cc_library(
     name = "main",
-    srcs = ["unittest_main.cc"],
+    srcs = [":srcs"],
+    hdrs = [":hdrs"],
     visibility = ["PUBLIC"],
-    deps = ["///unittest-pp/unittest_cpp//:unittest_cpp"],
+    includes = ["."],
 )

Diff for: test/so/BUILD

@@ -2,9 +2,15 @@
 
 os = "Win32" if CONFIG.OS == "windows" else "Posix"
 
-cc_library(
-    name = "unittest_cpp",
+filegroup(
+    name = "unittest_cpp_srcs",
     srcs = glob(["UnitTest++/*.cpp", f"UnitTest++/{os}/*.cpp"]),
-    hdrs = glob(["UnitTest++/*.h", f"UnitTest++/{os}/*.h"]),
     visibility = ["PUBLIC"],
 )
+
+
+filegroup(
+    name = "unittest_cpp_hdrs",
+    srcs = glob(["UnitTest++/*.h", f"UnitTest++/{os}/*.h"]),
+    visibility = ["PUBLIC"],
+)