From 5c7f4b0a488a859a94e073cf0946a9552e68ae7c Mon Sep 17 00:00:00 2001 From: Kristina Chodorow Date: Fri, 23 Sep 2016 16:37:26 +0000 Subject: Revert creating a convenience symlink usiing the workspace name Switch back to using the directory name, since there's no good way to get the workspace name from `clean` (yet). Fixes #1795. -- MOS_MIGRATED_REVID=134083065 --- .../java/com/google/devtools/build/lib/buildtool/ExecutionTool.java | 3 ++- .../devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/google/devtools/build/lib/buildtool') diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java index 5ee730e022..891c2cff38 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/ExecutionTool.java @@ -360,9 +360,10 @@ public class ExecutionTool { ? targetConfigurations.get(0) : null; if (targetConfigurations.size() == 1) { String productName = runtime.getProductName(); + String dirName = env.getWorkspaceName(); String workspaceName = analysisResult.getWorkspaceName(); OutputDirectoryLinksUtils.createOutputDirectoryLinks( - workspaceName, env.getWorkspace(), env.getDirectories().getExecRoot(workspaceName), + dirName, env.getWorkspace(), env.getDirectories().getExecRoot(workspaceName), env.getDirectories().getOutputPath(workspaceName), getReporter(), targetConfiguration, request.getBuildOptions().getSymlinkPrefix(productName), productName); } diff --git a/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java b/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java index 798a31cdce..ae085ed2bf 100644 --- a/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java +++ b/src/main/java/com/google/devtools/build/lib/buildtool/OutputDirectoryLinksUtils.java @@ -38,7 +38,7 @@ public class OutputDirectoryLinksUtils { private static final String NO_CREATE_SYMLINKS_PREFIX = "/"; - public static final String getOutputSymlinkName(String productName) { + public static String getOutputSymlinkName(String productName) { return productName + "-out"; } @@ -51,7 +51,7 @@ public class OutputDirectoryLinksUtils { * directories. Issues a warning if it fails, e.g. because workspaceDirectory * is readonly. */ - public static void createOutputDirectoryLinks(String workspaceName, + static void createOutputDirectoryLinks(String workspaceName, Path workspace, Path execRoot, Path outputPath, EventHandler eventHandler, @Nullable BuildConfiguration targetConfig, String symlinkPrefix, String productName) { -- cgit v1.2.3