Move blaze_exit_code.h into util/ directory.

This is so util/ files do not depend on anything from higer level.

--
Change-Id: I522be6722851f25e79d9c2b85275856cbbd978de
MOS_MIGRATED_REVID=91882837

14 files changed, 20 insertions, 18 deletions

diff --git a/src/main/cpp/BUILD b/src/main/cpp/BUILD
index 0e31cdbc0e..3d8b1dae71 100644
--- a/src/main/cpp/BUILD
+++ b/src/main/cpp/BUILD
@@ -9,6 +9,7 @@ cc_library(
     ],
     hdrs = [
         "util/errors.h",
+        "util/exit_code.h",
         "util/file.h",
         "util/numbers.h",
         "util/port.h",
diff --git a/src/main/cpp/blaze.cc b/src/main/cpp/blaze.cc
index 5c4cb4092d..0cda0df61f 100644
--- a/src/main/cpp/blaze.cc
+++ b/src/main/cpp/blaze.cc
@@ -53,12 +53,12 @@
 #include <utility>
 #include <vector>
 
-#include "src/main/cpp/blaze_exit_code.h"
 #include "src/main/cpp/blaze_startup_options.h"
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/option_processor.h"
 #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/md5.h"
 #include "src/main/cpp/util/numbers.h"
diff --git a/src/main/cpp/blaze_startup_options.cc b/src/main/cpp/blaze_startup_options.cc
index b3602380c4..b620dec864 100644
--- a/src/main/cpp/blaze_startup_options.cc
+++ b/src/main/cpp/blaze_startup_options.cc
@@ -20,9 +20,9 @@
 
 #include <cstdio>
 
-#include "src/main/cpp/blaze_exit_code.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/blaze_util.h"
+#include "src/main/cpp/util/exit_code.h"
 #include "src/main/cpp/util/file.h"
 #include "src/main/cpp/util/strings.h"
 
diff --git a/src/main/cpp/blaze_startup_options.h b/src/main/cpp/blaze_startup_options.h
index 340455aab5..95d769e83b 100644
--- a/src/main/cpp/blaze_startup_options.h
+++ b/src/main/cpp/blaze_startup_options.h
@@ -19,7 +19,7 @@
 #include <string>
 #include <vector>
 
-#include "src/main/cpp/blaze_exit_code.h"
+#include "src/main/cpp/util/exit_code.h"
 
 namespace blaze {
 
diff --git a/src/main/cpp/blaze_startup_options_common.cc b/src/main/cpp/blaze_startup_options_common.cc
index 9f2ebcd084..504a5de1f5 100644
--- a/src/main/cpp/blaze_startup_options_common.cc
+++ b/src/main/cpp/blaze_startup_options_common.cc
@@ -16,9 +16,9 @@
 #include <cassert>
 #include <cstdlib>
 
-#include "src/main/cpp/blaze_exit_code.h"
-#include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/blaze_util.h"
+#include "src/main/cpp/blaze_util_platform.h"
+#include "src/main/cpp/util/exit_code.h"
 #include "src/main/cpp/util/file.h"
 #include "src/main/cpp/util/numbers.h"
 #include "src/main/cpp/util/strings.h"
diff --git a/src/main/cpp/blaze_util.cc b/src/main/cpp/blaze_util.cc
index d94c048850..7b4c86645f 100644
--- a/src/main/cpp/blaze_util.cc
+++ b/src/main/cpp/blaze_util.cc
@@ -29,8 +29,8 @@
 #include <unistd.h>
 #include <sstream>
 
-#include "src/main/cpp/blaze_exit_code.h"
 #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/numbers.h"
 #include "src/main/cpp/util/strings.h"
diff --git a/src/main/cpp/blaze_util.h b/src/main/cpp/blaze_util.h
index 99ef0e6305..e36691eb6e 100644
--- a/src/main/cpp/blaze_util.h
+++ b/src/main/cpp/blaze_util.h
@@ -28,6 +28,7 @@
 #include <string>
 #include <vector>
 
+#include "src/main/cpp/util/exit_code.h"
 #include "src/main/cpp/util/numbers.h"
 #include "src/main/cpp/util/port.h"
 
diff --git a/src/main/cpp/blaze_util_darwin.cc b/src/main/cpp/blaze_util_darwin.cc
index 67dfd74660..1e7da80935 100644
--- a/src/main/cpp/blaze_util_darwin.cc
+++ b/src/main/cpp/blaze_util_darwin.cc
@@ -19,10 +19,10 @@
 #include <unistd.h>
 #include <cstdio>
 
-#include "src/main/cpp/blaze_exit_code.h"
 #include "src/main/cpp/blaze_util.h"
 #include "src/main/cpp/blaze_util_platform.h"
 #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/strings.h"
 
diff --git a/src/main/cpp/blaze_util_linux.cc b/src/main/cpp/blaze_util_linux.cc
index 52ca52e3ba..e128a2b868 100644
--- a/src/main/cpp/blaze_util_linux.cc
+++ b/src/main/cpp/blaze_util_linux.cc
@@ -19,10 +19,10 @@
 #include <sys/types.h>
 #include <pwd.h>
 
-#include "src/main/cpp/blaze_exit_code.h"
-#include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/blaze_util.h"
+#include "src/main/cpp/blaze_util_platform.h"
 #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/strings.h"
 
diff --git a/src/main/cpp/blaze_util_mingw.cc b/src/main/cpp/blaze_util_mingw.cc
index 79353521d8..ff18d273d5 100644
--- a/src/main/cpp/blaze_util_mingw.cc
+++ b/src/main/cpp/blaze_util_mingw.cc
@@ -21,10 +21,10 @@
 #include <cstdlib>
 #include <cstdio>
 
-#include "src/main/cpp/blaze_exit_code.h"
-#include "src/main/cpp/blaze_util_platform.h"
 #include "src/main/cpp/blaze_util.h"
+#include "src/main/cpp/blaze_util_platform.h"
 #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/strings.h"
 
diff --git a/src/main/cpp/option_processor.h b/src/main/cpp/option_processor.h
index 9e391d613b..866b03a36f 100644
--- a/src/main/cpp/option_processor.h
+++ b/src/main/cpp/option_processor.h
@@ -21,8 +21,8 @@
 #include <string>
 #include <vector>
 
-#include "src/main/cpp/blaze_exit_code.h"
 #include "src/main/cpp/blaze_startup_options.h"
+#include "src/main/cpp/util/exit_code.h"
 
 namespace blaze {
 
diff --git a/src/main/cpp/blaze_exit_code.h b/src/main/cpp/util/exit_code.h
index 50cad74a15..6cf9cf00de 100644
--- a/src/main/cpp/blaze_exit_code.h
+++ b/src/main/cpp/util/exit_code.h
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-// blaze_exit_code.h: Exit codes for Blaze.
+// exit_code.h: Exit codes for Blaze.
 // Must be kept in sync with the Java counterpart under
 // com/google/devtools/build/lib/util/ExitCode.java
 
-#ifndef DEVTOOLS_BLAZE_MAIN_BLAZE_EXIT_CODE_H_
-#define DEVTOOLS_BLAZE_MAIN_BLAZE_EXIT_CODE_H_
+#ifndef DEVTOOLS_BLAZE_MAIN_UTIL_EXIT_CODE_H_
+#define DEVTOOLS_BLAZE_MAIN_UTIL_EXIT_CODE_H_
 
 namespace blaze_exit_code {
 
@@ -39,4 +39,4 @@ enum ExitCode {
 
 }  // namespace blaze_exit_code
 
-#endif  // DEVTOOLS_BLAZE_MAIN_BLAZE_EXIT_CODE_H_
+#endif  // DEVTOOLS_BLAZE_MAIN_UTIL_EXIT_CODE_H_
diff --git a/src/main/cpp/util/file.cc b/src/main/cpp/util/file.cc
index 825265e0a5..153482559b 100644
--- a/src/main/cpp/util/file.cc
+++ b/src/main/cpp/util/file.cc
@@ -20,7 +20,7 @@
 #include <cstdlib>
 #include <vector>
 
-#include "src/main/cpp/blaze_exit_code.h"
+#include "src/main/cpp/util/exit_code.h"
 #include "src/main/cpp/util/errors.h"
 #include "src/main/cpp/util/strings.h"
 
diff --git a/src/main/cpp/util/strings.cc b/src/main/cpp/util/strings.cc
index 06f8bc0d6b..63d4fc8209 100644
--- a/src/main/cpp/util/strings.cc
+++ b/src/main/cpp/util/strings.cc
@@ -19,7 +19,7 @@
 
 #include <cassert>
 
-#include "src/main/cpp/blaze_exit_code.h"
+#include "src/main/cpp/util/exit_code.h"
 
 using std::vector;