Got clang format style file path resolution working
This commit is contained in:
parent
c492613179
commit
8f81a08d21
@ -105,8 +105,9 @@ void format_file( char const* path )
|
|||||||
resolved_path = String::make(GlobalAllocator, StrC(Project_Path));
|
resolved_path = String::make(GlobalAllocator, StrC(Project_Path));
|
||||||
resolved_path.append(path);
|
resolved_path.append(path);
|
||||||
|
|
||||||
String clang_format_path = String::make(GlobalAllocator, StrC(Root_Path));
|
String style_arg = String::make(GlobalAllocator, txt("-style=file:"));
|
||||||
clang_format_path.append("/scripts/.clang-format");
|
style_arg.append(Root_Path);
|
||||||
|
style_arg.append("/scripts/.clang-format ");
|
||||||
|
|
||||||
// Need to execute clang format on the generated file to get it to match the original.
|
// Need to execute clang format on the generated file to get it to match the original.
|
||||||
#define clang_format "clang-format "
|
#define clang_format "clang-format "
|
||||||
@ -114,14 +115,13 @@ void format_file( char const* path )
|
|||||||
#define cf_verbose "-verbose "
|
#define cf_verbose "-verbose "
|
||||||
String command = String::make( GlobalAllocator, clang_format );
|
String command = String::make( GlobalAllocator, clang_format );
|
||||||
command.append( cf_format_inplace );
|
command.append( cf_format_inplace );
|
||||||
command.append_fmt("-style=file:%S ", *StrC(clang_format_path));
|
|
||||||
command.append( cf_verbose );
|
command.append( cf_verbose );
|
||||||
|
command.append( style_arg );
|
||||||
command.append( resolved_path );
|
command.append( resolved_path );
|
||||||
log_fmt("\tRunning clang-format on file:\n");
|
log_fmt("\tRunning clang-format on file:\n");
|
||||||
system( command );
|
system( command );
|
||||||
log_fmt("\tclang-format finished reformatting.\n");
|
log_fmt("\tclang-format finished reformatting.\n");
|
||||||
|
|
||||||
|
|
||||||
FString command_fstr = FString( command.Data, command.length());
|
FString command_fstr = FString( command.Data, command.length());
|
||||||
UE_LOG(LogTemp, Log, TEXT("clang format command: %s"), *command_fstr );
|
UE_LOG(LogTemp, Log, TEXT("clang format command: %s"), *command_fstr );
|
||||||
#undef cf_cmd
|
#undef cf_cmd
|
||||||
|
Loading…
Reference in New Issue
Block a user