Skip to content

Use /artifacts in place of /bin #227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jashook merged 2 commits into from
Nov 17, 2019
Merged

Use /artifacts in place of /bin #227

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40d82f0
Use /artifacts in place of /bin
Nov 14, 2019
e769ee7
Change to reflect root dir usage
Nov 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/jit-format/jit-format.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class Config
private string _os = null;
private string _build = null;
private string _rootPath = null;
private string _repoRootPath = null;
private IReadOnlyList<string> _filenames = Array.Empty<string>();
private IReadOnlyList<string> _projects = Array.Empty<string>();
private string _srcDirectory = null;
Expand Down Expand Up @@ -212,7 +213,7 @@ private void validate()
// If the user didn't specify a compile_commands.json, we need to see if one exists, and if not, create it.
if (!_untidy && _compileCommands == null)
{
string[] compileCommandsPath = { _rootPath, "bin", "nmakeobj", "Windows_NT." + _arch + "." + _build, "compile_commands.json" };
string[] compileCommandsPath = { _rootPath, "..", "..", "artifacts", "nmakeobj", "Windows_NT." + _arch + "." + _build, "compile_commands.json" };
_compileCommands = Path.Combine(compileCommandsPath);
_rewriteCompileCommands = true;

Expand Down Expand Up @@ -243,7 +244,7 @@ private void validate()
// If the user didn't specify a compile_commands.json, we need to see if one exists, and if not, create it.
if (!_untidy && _compileCommands == null)
{
string[] compileCommandsPath = { _rootPath, "bin", "obj", _os + "." + _arch + "." + _build, "compile_commands.json" };
string[] compileCommandsPath = { _rootPath, "..", "..", "artifacts", "obj", "coreclr", _os + "." + _arch + "." + _build, "compile_commands.json" };
_compileCommands = Path.Combine(compileCommandsPath);
_rewriteCompileCommands = true;

Expand Down Expand Up @@ -429,7 +430,7 @@ public static int Main(string[] args)

if (config.DoClangTidy)
{
string[] newCompileCommandsDirPath = { config.CoreCLRRoot, "bin", "obj", config.OS + "." + config.Arch + "." + config.Build };
string[] newCompileCommandsDirPath = { config.CoreCLRRoot, "..", "..", "artifacts", "obj", "coreclr", config.OS + "." + config.Arch + "." + config.Build };
string compileCommands = config.CompileCommands;
string newCompileCommandsDir = Path.Combine(newCompileCommandsDirPath);
string newCompileCommands = Path.Combine(newCompileCommandsDir, "compile_commands_full.json");
Expand Down