Skip to content

Commit

Permalink
[projmgr] Skip writing cbuild-run in case of configuration errors
Browse files Browse the repository at this point in the history
  • Loading branch information
brondani authored Dec 13, 2024
1 parent 2b0b83d commit edb05a4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tools/projmgr/include/ProjMgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class ProjMgr {
bool ValidateCreatedFor(const std::string& createdFor);

bool Configure();
bool GenerateYMLConfigurationFiles();
bool GenerateYMLConfigurationFiles(bool previousResult);
bool UpdateRte();
bool ParseAndValidateContexts();
};
Expand Down
6 changes: 3 additions & 3 deletions tools/projmgr/src/ProjMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -507,7 +507,7 @@ bool ProjMgr::PopulateContexts(void) {
return true;
}

bool ProjMgr::GenerateYMLConfigurationFiles() {
bool ProjMgr::GenerateYMLConfigurationFiles(bool previousResult) {
// Generate cbuild pack file
const bool isUsingContexts = m_contextSet || m_context.size() != 0;
if (!m_emitter.GenerateCbuildPack(m_processedContexts, isUsingContexts, m_frozenPacks)) {
Expand All @@ -525,7 +525,7 @@ bool ProjMgr::GenerateYMLConfigurationFiles() {
}

// Generate cbuild-run file
if (m_contextSet && !m_processedContexts.empty()) {
if (previousResult && m_contextSet && !m_processedContexts.empty()) {
if (!m_runDebug.CollectSettings(m_processedContexts)) {
result = false;
}
Expand Down Expand Up @@ -684,7 +684,7 @@ bool ProjMgr::RunConvert(void) {
bool Success = Configure();

// Generate YML build configuration files
Success &= GenerateYMLConfigurationFiles();
Success &= GenerateYMLConfigurationFiles(Success);

// Generate Cprjs
if (m_cbuildgen) {
Expand Down

0 comments on commit edb05a4

Please sign in to comment.