@@ -776,11 +776,15 @@ namespace | |||||
PIPGenerator generator (pipFile, outputDir); | PIPGenerator generator (pipFile, outputDir); | ||||
if (! generator.createJucerFile()) | |||||
throw CommandLineError ("Failed to create .jucer file in " + outputDir.getFullPathName()+ "."); | |||||
auto createJucerFileResult = generator.createJucerFile(); | |||||
if (! generator.createMainCpp()) | |||||
throw CommandLineError ("Failed to create Main.cpp."); | |||||
if (! createJucerFileResult) | |||||
throw CommandLineError (createJucerFileResult.getErrorMessage()); | |||||
auto createMainCppResult = generator.createMainCpp(); | |||||
if (! createMainCppResult) | |||||
throw CommandLineError (createMainCppResult.getErrorMessage()); | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -142,20 +142,20 @@ Result PIPGenerator::createJucerFile() | |||||
if (xml->writeToFile (outputFile, {})) | if (xml->writeToFile (outputFile, {})) | ||||
return Result::ok(); | return Result::ok(); | ||||
else | |||||
return Result::fail ("Failed to create .jucer file in " + outputDirectory.getFullPathName()+ "."); | |||||
return Result::fail ("Failed to create .jucer file in " + outputDirectory.getFullPathName()); | |||||
} | } | ||||
bool PIPGenerator::createMainCpp() | |||||
Result PIPGenerator::createMainCpp() | |||||
{ | { | ||||
auto outputFile = outputDirectory.getChildFile ("Source").getChildFile ("Main.cpp"); | auto outputFile = outputDirectory.getChildFile ("Source").getChildFile ("Main.cpp"); | ||||
if (! outputFile.existsAsFile() && (outputFile.create() != Result::ok())) | if (! outputFile.existsAsFile() && (outputFile.create() != Result::ok())) | ||||
return false; | |||||
return Result::fail ("Failed to create Main.cpp - " + outputFile.getFullPathName()); | |||||
outputFile.replaceWithText (getMainFileTextForType()); | outputFile.replaceWithText (getMainFileTextForType()); | ||||
return true; | |||||
return Result::ok(); | |||||
} | } | ||||
//============================================================================== | //============================================================================== | ||||
@@ -45,7 +45,7 @@ public: | |||||
//============================================================================== | //============================================================================== | ||||
Result createJucerFile(); | Result createJucerFile(); | ||||
bool createMainCpp(); | |||||
Result createMainCpp(); | |||||
private: | private: | ||||
//============================================================================== | //============================================================================== | ||||