Skip to content

Commit 041db0c

Browse files
Updating dependencies steps to output directly to console
1 parent c63b0a6 commit 041db0c

File tree

2 files changed

+16
-8
lines changed

2 files changed

+16
-8
lines changed

Src/runcpp2/DependenciesHelper.cpp

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ namespace
248248
const std::unordered_map< PlatformName,
249249
runcpp2::Data::ProfilesCommands> steps,
250250
const std::string& dependenciesCopiedDirectory,
251-
bool required)
251+
bool required,
252+
bool redirectIO)
252253
{
253254
ssLOG_FUNC_INFO();
254255

@@ -291,18 +292,22 @@ namespace
291292
std::string output;
292293

293294
if(!runcpp2::RunCommand(commands->at(k),
294-
true,
295+
redirectIO,
295296
processedDependencyPath,
296297
output,
297298
returnCode))
298299
{
299300
ssLOG_ERROR("Failed to run command with result: " << returnCode);
300301
ssLOG_ERROR("Was trying to run: " << commands->at(k));
301-
ssLOG_ERROR("Output: \n" << output);
302+
if(redirectIO)
303+
ssLOG_ERROR("Output: \n" << output);
302304
return false;
303305
}
304306
else
305-
ssLOG_INFO("Output: \n" << output);
307+
{
308+
if(redirectIO)
309+
ssLOG_INFO("Output: \n" << output);
310+
}
306311
}
307312

308313
return true;
@@ -499,6 +504,7 @@ bool runcpp2::CleanupDependencies( const runcpp2::Data::Profile& profile,
499504
if(!RunDependenciesSteps( profile,
500505
availableDependencies.at(i)->Cleanup,
501506
dependenciesLocalCopiesPaths.at(i),
507+
false,
502508
false))
503509
{
504510
ssLOG_ERROR("Failed to cleanup dependency " << availableDependencies.at(i)->Name);
@@ -586,7 +592,8 @@ bool runcpp2::SetupDependenciesIfNeeded(const runcpp2::Data::Profile& profile,
586592
if(!RunDependenciesSteps( profile,
587593
availableDependencies.at(i)->Setup,
588594
dependenciesLocalCopiesPaths.at(i),
589-
true))
595+
true,
596+
false))
590597
{
591598
ssLOG_ERROR("Failed to setup dependency " <<
592599
availableDependencies.at(i)->Name);
@@ -694,7 +701,8 @@ bool runcpp2::BuildDependencies(const runcpp2::Data::Profile& profile,
694701
if(!RunDependenciesSteps( profile,
695702
availableDependencies.at(i)->Build,
696703
dependenciesLocalCopiesPaths.at(i),
697-
true))
704+
true,
705+
false))
698706
{
699707
ssLOG_ERROR("Failed to build dependency " << availableDependencies.at(i)->Name);
700708
return false;
@@ -971,7 +979,7 @@ bool runcpp2::GatherDependenciesBinaries( const std::vector<Data::DependencyIn
971979
//Do a check to see if any dependencies are copied
972980
if(outBinariesPaths.size() - nonLinkFilesCount < minimumDependenciesCopiesCount)
973981
{
974-
ssLOG_WARNING("We could missing some link files for dependencies");
982+
ssLOG_WARNING("We could be missing some link files for dependencies");
975983

976984
for(int i = 0; i < outBinariesPaths.size(); ++i)
977985
ssLOG_WARNING("outBinariesPaths[" << i << "]: " << outBinariesPaths.at(i));

Src/runcpp2/ProfileHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ int runcpp2::GetPreferredProfileIndex( const std::string& scriptPath,
202202

203203
if(availableProfiles.empty())
204204
{
205-
ssLOG_ERROR("No compilers/linkers found");
205+
ssLOG_ERROR("No compilers/linkers found that can be used for " << scriptPath);
206206
return -1;
207207
}
208208

0 commit comments

Comments
 (0)