Skip to content

Fix .cpppp when passing .hpp header name #46

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
end2endzone merged 1 commit into from
Jun 4, 2021
Merged

Fix .cpppp when passing .hpp header name #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/bin2cpp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,11 +544,11 @@ APP_ERROR_CODES processSingleFile(const ARGUMENTS & args, bin2cpp::IGenerator *
ra::logging::Log(ra::logging::LOG_INFO, info.c_str());

//prepare output files path
std::string outputHeaderPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + args.headerFilename;
std::string outputCppPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + args.headerFilename;
std::string cppFilename = args.headerFilename;
ra::strings::Replace(outputCppPath, ".h", ".cpp");
ra::strings::Replace(cppFilename, ".hpp", ".cpp");
ra::strings::Replace(cppFilename, ".h", ".cpp");
std::string outputHeaderPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + args.headerFilename;
std::string outputCppPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + cppFilename;

//check if input file exists
if (!ra::filesystem::FileExists(args.inputFile.c_str()))
Expand Down Expand Up @@ -671,11 +671,11 @@ APP_ERROR_CODES processManagerFiles(const ARGUMENTS & args, bin2cpp::IGenerator
ra::logging::Log(ra::logging::LOG_INFO, info.c_str());

//prepare output files path
std::string cppFilename = args.managerHeaderFilename;
ra::strings::Replace(cppFilename, ".hpp", ".cpp");
ra::strings::Replace(cppFilename, ".h", ".cpp");
std::string outputHeaderPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + args.managerHeaderFilename;
std::string outputCppPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + args.managerHeaderFilename;
std::string cppFilename = args.headerFilename;
ra::strings::Replace(outputCppPath, ".h", ".cpp");
ra::strings::Replace(cppFilename, ".h", ".cpp");
std::string outputCppPath = args.outputFolder + ra::filesystem::GetPathSeparatorStr() + cppFilename;

//process files
bool headerResult = generateManagerFile(outputHeaderPath, generator, args.overrideExisting);
Expand Down