Skip to content

Commit be7e394

Browse files
committed
Fixed a bug with commands --managerfile=filemanager.h --code=c where the generated file manager files were using .cpp file extension instead of the expected .c file extension.
1 parent 21fe6d8 commit be7e394

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

src/bin2cpp/bin2cpp.samples.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Test for:
1010
* Segment C generator
1111
* filemanager
1212
* registerfile
13-
--file=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C\testFileManager.1.bin --output=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C --headerfile=_testFileManager.1.h --identifier=testFileManager1_c --managerfile=filemanager.h --override --code=c
14-
--file=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C\testFileManager.2.bin --output=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C --headerfile=_testFileManager.2.h --identifier=testFileManager2_c --registerfile --override --code=c
13+
--file=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C\testFileManager_C.1.bin --output=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C --headerfile=_testFileManager_C.1.h --identifier=testFileManager1_c --managerfile=filemanager.h --override --code=c
14+
--file=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C\testFileManager_C.2.bin --output=..\..\test\bin2cpp_unittest\generated_files\testFileManager_C --headerfile=_testFileManager_C.2.h --identifier=testFileManager2_c --registerfile --override --code=c
1515

1616
Test directories:
1717
--dir=..\..\..\samples\demo_website\www --output=..\..\temp --code=c

src/bin2cpp/main.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -823,12 +823,14 @@ APP_ERROR_CODES processManagerFiles(const Context & c)
823823
info << "...";
824824
ra::logging::Log(ra::logging::LOG_INFO, info.c_str());
825825

826+
const std::string& sourceFileExtension = "." + getDefaultCodeSourceFileExtension(c.code);
827+
826828
//prepare output files path
827829
std::string cppFilename = c.managerHeaderFilename;
828-
ra::strings::Replace(cppFilename, ".hpp", ".cpp");
829-
ra::strings::Replace(cppFilename, ".h", ".cpp");
830+
ra::strings::Replace(cppFilename, ".hpp", sourceFileExtension);
831+
ra::strings::Replace(cppFilename, ".h", sourceFileExtension);
830832
std::string outputHeaderPath = c.outputDirPath + ra::filesystem::GetPathSeparatorStr() + c.managerHeaderFilename;
831-
std::string outputCppPath = c.outputDirPath + ra::filesystem::GetPathSeparatorStr() + cppFilename;
833+
std::string outputSourcePath = c.outputDirPath + ra::filesystem::GetPathSeparatorStr() + cppFilename;
832834

833835
ManagerGenerator generator;
834836

@@ -840,7 +842,7 @@ APP_ERROR_CODES processManagerFiles(const Context & c)
840842
if (!headerResult)
841843
return APP_ERROR_UNABLETOCREATEOUTPUTFILES;
842844

843-
bool cppResult = generateOutputFile(c, outputCppPath, &generator);
845+
bool cppResult = generateOutputFile(c, outputSourcePath, &generator);
844846
if (!cppResult)
845847
return APP_ERROR_UNABLETOCREATEOUTPUTFILES;
846848

0 commit comments

Comments
 (0)