From e6d3524ec3b12f725f170365102bdd9b73e9233a Mon Sep 17 00:00:00 2001 From: Laurent Le Brun Date: Fri, 6 Mar 2015 16:05:23 +0000 Subject: The info command keys now contain the correct product name e.g. $ bazel info bazel-bin -- MOS_MIGRATED_REVID=87943280 --- .../devtools/build/lib/runtime/commands/InfoKey.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/runtime/commands') diff --git a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoKey.java b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoKey.java index d2e7bc0718..94dd9d5cd9 100644 --- a/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoKey.java +++ b/src/main/java/com/google/devtools/build/lib/runtime/commands/InfoKey.java @@ -13,6 +13,7 @@ // limitations under the License. package com.google.devtools.build.lib.runtime.commands; +import com.google.devtools.build.lib.Constants; /** * An enumeration of all the valid info keys, excepting the make environment @@ -23,13 +24,17 @@ public enum InfoKey { WORKSPACE("workspace", "The working directory of the server."), INSTALL_BASE("install_base", "The installation base directory."), OUTPUT_BASE("output_base", - "A directory for shared Blaze state as well as tool and strategy specific subdirectories."), + "A directory for shared " + Constants.PRODUCT_NAME + " state as well as tool and strategy " + + "specific subdirectories."), EXECUTION_ROOT("execution_root", "A directory that makes all input and output files visible to the build."), OUTPUT_PATH("output_path", "Output directory"), - BLAZE_BIN("blaze-bin", "Configuration dependent directory for binaries."), - BLAZE_GENFILES("blaze-genfiles", "Configuration dependent directory for generated files."), - BLAZE_TESTLOGS("blaze-testlogs", "Configuration dependent directory for logs from a test run."), + BLAZE_BIN(Constants.PRODUCT_NAME + "-bin", + "Configuration dependent directory for binaries."), + BLAZE_GENFILES(Constants.PRODUCT_NAME + "-genfiles", + "Configuration dependent directory for generated files."), + BLAZE_TESTLOGS(Constants.PRODUCT_NAME + "-testlogs", + "Configuration dependent directory for logs from a test run."), // logs COMMAND_LOG("command_log", "Location of the log containg the output from the build commands."), @@ -37,8 +42,8 @@ public enum InfoKey { "Location of a log containing machine readable message in LogMessage protobuf format."), // misc - RELEASE("release", "Blaze release identifier"), - SERVER_PID("server_pid", "Blaze process id"), + RELEASE("release", Constants.PRODUCT_NAME + " release identifier"), + SERVER_PID("server_pid", Constants.PRODUCT_NAME + " process id"), PACKAGE_PATH("package_path", "The search path for resolving package labels."), // memory statistics -- cgit v1.2.3