runfiles,C++: move to //tools/cpp/runfiles

src/main/cpp/util/BUILD

@@ -47,9 +47,9 @@ cc_library(
         ":ijar",
         "//src/test/cpp/util:__pkg__",
         "//src/tools/launcher:__subpackages__",
-        "//src/tools/runfiles:__pkg__",
         "//src/tools/singlejar:__pkg__",
         "//third_party/def_parser:__pkg__",
+        "//tools/cpp/runfiles:__pkg__",
     ],
     deps = [
         ":blaze_exit_code",

src/tools/runfiles/BUILD

@@ -20,8 +20,6 @@ filegroup(
     name = "embedded_tools",
     srcs = [
         "BUILD.tools",
-        "runfiles.cc",
-        "runfiles.h",
         "runfiles.py",
         "//src/tools/runfiles/java/com/google/devtools/build/runfiles:embedded_tools",
     ],
@@ -40,35 +38,6 @@ py_test(
     deps = [":py-runfiles"],
 )
 
-cc_library(
-    name = "cc-runfiles",
-    srcs = ["runfiles.cc"],
-    hdrs = ["runfiles.h"],
-    # This library is available to clients under
-    # @bazel_tools//tools/runfiles:cc-runfiles, with the same source files.
-    # The include statement in runfiles.cc that includes runfiles.h must work
-    # both here in the //src/tools/runfiles package, and in the
-    # @bazel_tools//tools/runfiles package.
-    # runfiles.cc includes "tools/runfiles/runfiles.h" so we need to tell the
-    # compiler to prepend "src" to it so the include path is valid.
-    # Alternatively we could omit this "copts" attribute here and add some
-    # include path manipulating attributes to
-    # @bazel_tools//tools/runfiles:cc-runfiles instead -- that would work too,
-    # but I (laszlocsomor@) find this solution (i.e. the "copts" attribute on
-    # this rule) to be simpler.
-    copts = ["-Isrc"],
-)
-
-cc_test(
-    name = "cc-runfiles-test",
-    srcs = ["runfiles_test.cc"],
-    deps = [
-        ":cc-runfiles",
-        "//src/main/cpp/util:file",
-        "//third_party:gtest",
-    ],
-)
-
 sh_library(
     name = "runfiles_sh_lib",
     srcs = ["runfiles.sh"],

tools/BUILD

@@ -46,7 +46,7 @@ filegroup(
         "//tools/build_rules:embedded_tools_srcs",
         "//tools/buildstamp:srcs",
         "//tools/coverage:srcs",
-        "//tools/cpp:srcs",
+        "//tools/cpp:embedded_tools",
         "//tools/genrule:srcs",
         "//tools/j2objc:srcs",
         "//tools/jdk:package-srcs",

tools/cpp/BUILD

@@ -196,7 +196,16 @@ filegroup(
 
 filegroup(
     name = "srcs",
-    srcs = glob(["**"]),
+    srcs = glob(["**"]) + ["//tools/cpp/runfiles:srcs"],
+)
+
+filegroup(
+    name = "embedded_tools",
+    srcs = [
+        ":srcs",
+        "//tools/cpp/runfiles:embedded_tools",
+    ],
+    visibility = ["//tools:__pkg__"],
 )
 
 filegroup(

tools/cpp/runfiles/BUILD

@@ -0,0 +1,32 @@
+filegroup(
+    name = "srcs",
+    srcs = glob(["**"]),
+    visibility = ["//tools/cpp:__pkg__"],
+)
+
+filegroup(
+    name = "embedded_tools",
+    srcs = [
+        "BUILD.tools",
+        "runfiles.cc",
+        "runfiles.h",
+    ],
+    visibility = ["//tools/cpp:__pkg__"],
+)
+
+cc_library(
+    name = "runfiles",
+    srcs = ["runfiles.cc"],
+    hdrs = ["runfiles.h"],
+)
+
+cc_test(
+    name = "runfiles-test",
+    srcs = ["runfiles_test.cc"],
+    deps = [
+        ":runfiles",
+        "//src/main/cpp/util:file",
+        "//third_party:gtest",
+    ],
+)
+

tools/cpp/runfiles/BUILD.tools

@@ -0,0 +1,2 @@
+# This package will host the C++ runfiles library when it's ready.
+# Follow the progress on https://github.com/bazelbuild/bazel/issues/4460

src/tools/runfiles/runfiles.cc → tools/cpp/runfiles/runfiles.cc

@@ -11,7 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#include "tools/runfiles/runfiles.h"
+#include "tools/cpp/runfiles/runfiles.h"
 
 #ifdef COMPILER_MSVC
 #include <windows.h>
@@ -32,6 +32,8 @@
 #endif  // COMPILER_MSVC
 
 namespace bazel {
+namespace tools {
+namespace cpp {
 namespace runfiles {
 
 using std::function;
@@ -314,4 +316,6 @@ Runfiles* Runfiles::CreateDirectoryBased(const string& directory_path,
 }
 
 }  // namespace runfiles
+}  // namespace cpp
+}  // namespace tools
 }  // namespace bazel

src/tools/runfiles/runfiles.h → tools/cpp/runfiles/runfiles.h

@@ -16,13 +16,13 @@
 //
 // Usage:
 //
-//   #include "tools/runfiles/runfiles.h"
+//   #include "tools/cpp/runfiles/runfiles.h"
 //   ...
+//   using namespace bazel::tools::cpp::runfiles::Runfiles;
 //
 //   int main(int argc, char** argv) {
 //     std::string error;
-//     std::unique_ptr<bazel::runfiles::Runfiles> runfiles(
-//         bazel::runfiles::Runfiles::Create(argv[0], &error));
+//     std::unique_ptr<Runfiles> runfiles(Runfiles::Create(argv[0], &error));
 //     if (runfiles == nullptr) {
 //       ...  // error handling
 //     }
@@ -39,19 +39,18 @@
 // If you want to explicitly create a manifest- or directory-based
 // implementation, you can do so as follows:
 //
-//   std::unique_ptr<bazel::runfiles::Runfiles> runfiles1(
-//       bazel::runfiles::Runfiles::CreateManifestBased(
+//   std::unique_ptr<Runfiles> runfiles1(
+//       Runfiles::CreateManifestBased(
 //           "path/to/foo.runfiles/MANIFEST", &error));
 //
-//   std::unique_ptr<bazel::runfiles::Runfiles> runfiles2(
-//       bazel::runfiles::Runfiles::CreateDirectoryBased(
+//   std::unique_ptr<Runfiles> runfiles2(
+//       Runfiles::CreateDirectoryBased(
 //           "path/to/foo.runfiles", &error));
 //
 // If you want to start child processes that also need runfiles, you need to set
 // the right environment variables for them:
 //
-//   std::unique_ptr<bazel::runfiles::Runfiles> runfiles(
-//       bazel::runfiles::Runfiles::Create(argv[0], &error));
+//   std::unique_ptr<Runfiles> runfiles(Runfiles::Create(argv[0], &error));
 //
 //   for (const auto i : runfiles->EnvVars()) {
 //     setenv(i.first, i.second, 1);
@@ -70,6 +69,8 @@
 #include <vector>
 
 namespace bazel {
+namespace tools {
+namespace cpp {
 namespace runfiles {
 
 class Runfiles {
@@ -179,6 +180,8 @@ bool TestOnly_IsAbsolute(const std::string& path);
 
 }  // namespace testing
 }  // namespace runfiles
+}  // namespace cpp
+}  // namespace tools
 }  // namespace bazel
 
 #endif  // BAZEL_SRC_TOOLS_RUNFILES_RUNFILES_H_

src/tools/runfiles/runfiles_test.cc → tools/cpp/runfiles/runfiles_test.cc

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "src/tools/runfiles/runfiles.h"
+#include "tools/cpp/runfiles/runfiles.h"
 
 #ifdef COMPILER_MSVC
 #include <windows.h>
@@ -31,11 +31,13 @@
 #define LINE() T(__LINE__)
 
 namespace bazel {
+namespace tools {
+namespace cpp {
 namespace runfiles {
 namespace {
 
-using bazel::runfiles::testing::TestOnly_CreateRunfiles;
-using bazel::runfiles::testing::TestOnly_IsAbsolute;
+using bazel::tools::cpp::runfiles::testing::TestOnly_CreateRunfiles;
+using bazel::tools::cpp::runfiles::testing::TestOnly_IsAbsolute;
 using std::cerr;
 using std::endl;
 using std::function;
@@ -470,4 +472,6 @@ TEST_F(RunfilesTest, IsAbsolute) {
 
 }  // namespace
 }  // namespace runfiles
+}  // namespace cpp
+}  // namespace tools
 }  // namespace bazel