Browse Source

Projucer: Code tidy up

tags/2021-05-28
Tom Poole 6 years ago
parent
commit
235bbd46cf
3 changed files with 14 additions and 10 deletions
  1. +8
    -4
      extras/Projucer/Source/Application/jucer_CommandLine.cpp
  2. +5
    -5
      extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp
  3. +1
    -1
      extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.h

+ 8
- 4
extras/Projucer/Source/Application/jucer_CommandLine.cpp View File

@@ -776,11 +776,15 @@ namespace
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());
}
//==============================================================================


+ 5
- 5
extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.cpp View File

@@ -142,20 +142,20 @@ Result PIPGenerator::createJucerFile()
if (xml->writeToFile (outputFile, {}))
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");
if (! outputFile.existsAsFile() && (outputFile.create() != Result::ok()))
return false;
return Result::fail ("Failed to create Main.cpp - " + outputFile.getFullPathName());
outputFile.replaceWithText (getMainFileTextForType());
return true;
return Result::ok();
}
//==============================================================================


+ 1
- 1
extras/Projucer/Source/Utility/PIPs/jucer_PIPGenerator.h View File

@@ -45,7 +45,7 @@ public:
//==============================================================================
Result createJucerFile();
bool createMainCpp();
Result createMainCpp();
private:
//==============================================================================


Loading…
Cancel
Save