Move blaze_util::Which to standalone library.
This method is only used by blaze_util_linux.cc so
instead of porting it to Windows, I'm moving it to
a separate library.
As part of this change I'm creating separate
libraries for other sources in //src/main/cpp/util
as well, so their dependencies are clearly defined
in the BUILD file, plus we can port them one by
one.
This is part of the effort of compiling Bazel on
Windows with the MSVC toolchain.
--
MOS_MIGRATED_REVID=134636777
diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
index b52b292..ae1cc17 100644
--- a/src/main/cpp/BUILD
+++ b/src/main/cpp/BUILD
@@ -52,7 +52,14 @@
deps = [
"//src/main/cpp/util",
"//src/main/cpp/util:blaze_exit_code",
- ],
+ ] + select({
+ "//src:darwin": [],
+ "//src:darwin_x86_64": [],
+ "//src:freebsd": [],
+ "//src:windows": [],
+ "//src:windows_msvc": [],
+ "//conditions:default": ["//src/main/cpp/util:file_linux"],
+ }),
)
cc_library(
diff --git a/src/main/cpp/blaze_util_linux.cc b/src/main/cpp/blaze_util_linux.cc
index 5db5cb5..705d1b9 100644
--- a/src/main/cpp/blaze_util_linux.cc
+++ b/src/main/cpp/blaze_util_linux.cc
@@ -30,6 +30,7 @@
#include "src/main/cpp/util/errors.h"
#include "src/main/cpp/util/exit_code.h"
#include "src/main/cpp/util/file.h"
+#include "src/main/cpp/util/file_linux.h"
#include "src/main/cpp/util/port.h"
#include "src/main/cpp/util/strings.h"
diff --git a/src/main/cpp/util/BUILD b/src/main/cpp/util/BUILD
index 912d1ad..3602055 100644
--- a/src/main/cpp/util/BUILD
+++ b/src/main/cpp/util/BUILD
@@ -3,12 +3,6 @@
cc_library(
name = "util",
- srcs = [
- "errors.cc",
- "file.cc",
- "numbers.cc",
- "port.cc",
- ],
hdrs = [
"errors.h",
"file.h",
@@ -18,11 +12,60 @@
visibility = ["//visibility:public"],
deps = [
":blaze_exit_code",
+ ":errors",
+ ":file",
+ ":numbers",
+ ":port",
":strings",
],
)
cc_library(
+ name = "file_linux",
+ srcs = ["file_linux.cc"],
+ hdrs = ["file_linux.h"],
+ visibility = ["//src/main/cpp:__pkg__"],
+ deps = [
+ ":blaze_exit_code",
+ ":errors",
+ ":file",
+ ":strings",
+ ],
+)
+
+cc_library(
+ name = "file",
+ srcs = ["file.cc"],
+ hdrs = ["file.h"],
+ visibility = ["//src/tools/singlejar:__pkg__"],
+ deps = [
+ ":blaze_exit_code",
+ ":errors",
+ ":strings",
+ ],
+)
+
+cc_library(
+ name = "errors",
+ srcs = ["errors.cc"],
+ hdrs = ["errors.h"],
+ deps = [":port"],
+)
+
+cc_library(
+ name = "port",
+ srcs = ["port.cc"],
+ hdrs = ["port.h"],
+)
+
+cc_library(
+ name = "numbers",
+ srcs = ["numbers.cc"],
+ hdrs = ["numbers.h"],
+ deps = [":strings"],
+)
+
+cc_library(
name = "md5",
srcs = ["md5.cc"],
hdrs = ["md5.h"],
diff --git a/src/main/cpp/util/file.cc b/src/main/cpp/util/file.cc
index d6b62a0..f453176 100644
--- a/src/main/cpp/util/file.cc
+++ b/src/main/cpp/util/file.cc
@@ -15,7 +15,6 @@
#include <limits.h> // PATH_MAX
#include <sys/stat.h>
-#include <unistd.h> // access
#include <cstdlib>
#include <vector>
@@ -72,29 +71,4 @@
}
}
-string Which(const string &executable) {
- char *path_cstr = getenv("PATH");
- if (path_cstr == NULL || path_cstr[0] == '\0') {
- die(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR,
- "Could not get PATH to find %s", executable.c_str());
- }
-
- string path(path_cstr);
- std::vector<std::string> pieces = blaze_util::Split(path, ':');
- for (auto piece : pieces) {
- if (piece.empty()) {
- piece = ".";
- }
-
- struct stat file_stat;
- string candidate = blaze_util::JoinPath(piece, executable);
- if (access(candidate.c_str(), X_OK) == 0 &&
- stat(candidate.c_str(), &file_stat) == 0 &&
- S_ISREG(file_stat.st_mode)) {
- return candidate;
- }
- }
- return "";
-}
-
} // namespace blaze_util
diff --git a/src/main/cpp/util/file.h b/src/main/cpp/util/file.h
index 9aefdcb..6e7707b 100644
--- a/src/main/cpp/util/file.h
+++ b/src/main/cpp/util/file.h
@@ -31,11 +31,6 @@
string JoinPath(const string &path1, const string &path2);
-// Checks each element of the PATH variable for executable. If none is found, ""
-// is returned. Otherwise, the full path to executable is returned. Can die if
-// looking up PATH fails.
-string Which(const string &executable);
-
} // namespace blaze_util
#endif // BAZEL_SRC_MAIN_CPP_UTIL_FILE_H_
diff --git a/src/main/cpp/util/file_linux.cc b/src/main/cpp/util/file_linux.cc
new file mode 100644
index 0000000..a79a1a8
--- /dev/null
+++ b/src/main/cpp/util/file_linux.cc
@@ -0,0 +1,55 @@
+// Copyright 2014 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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 "src/main/cpp/util/file_linux.h"
+
+#include <sys/stat.h>
+#include <stdlib.h> // getenv
+#include <unistd.h> // access
+#include <vector>
+
+#include "src/main/cpp/util/file.h"
+#include "src/main/cpp/util/exit_code.h"
+#include "src/main/cpp/util/errors.h"
+#include "src/main/cpp/util/strings.h"
+
+using std::pair;
+
+namespace blaze_util {
+
+string Which(const string &executable) {
+ char *path_cstr = getenv("PATH");
+ if (path_cstr == NULL || path_cstr[0] == '\0') {
+ die(blaze_exit_code::LOCAL_ENVIRONMENTAL_ERROR,
+ "Could not get PATH to find %s", executable.c_str());
+ }
+
+ string path(path_cstr);
+ std::vector<std::string> pieces = blaze_util::Split(path, ':');
+ for (auto piece : pieces) {
+ if (piece.empty()) {
+ piece = ".";
+ }
+
+ struct stat file_stat;
+ string candidate = blaze_util::JoinPath(piece, executable);
+ if (access(candidate.c_str(), X_OK) == 0 &&
+ stat(candidate.c_str(), &file_stat) == 0 &&
+ S_ISREG(file_stat.st_mode)) {
+ return candidate;
+ }
+ }
+ return "";
+}
+
+} // namespace blaze_util
diff --git a/src/main/cpp/util/file_linux.h b/src/main/cpp/util/file_linux.h
new file mode 100644
index 0000000..018353a
--- /dev/null
+++ b/src/main/cpp/util/file_linux.h
@@ -0,0 +1,33 @@
+// Copyright 2016 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// 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.
+
+// This header file defines file utilities we only need under Linux.
+
+#ifndef BAZEL_SRC_MAIN_CPP_UTIL_FILE_LINUX_H_
+#define BAZEL_SRC_MAIN_CPP_UTIL_FILE_LINUX_H_
+
+#include <string>
+
+namespace blaze_util {
+
+using std::string;
+
+// Checks each element of the PATH variable for executable. If none is found, ""
+// is returned. Otherwise, the full path to executable is returned. Can die if
+// looking up PATH fails.
+string Which(const string &executable);
+
+} // namespace blaze_util
+
+#endif // BAZEL_SRC_MAIN_CPP_UTIL_FILE_LINUX_H_
