Skip to content

Commit c771e58

Browse files
Fix typos and updating to use sharedlib path as first arg
1 parent 5e35371 commit c771e58

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

Src/runcpp2/Data/Profile.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ bool runcpp2::Data::Profile::ParseYAML_Node(ryml::ConstNodeRef& profileNode)
6363
ryml::ConstNodeRef currentPlatform = profileNode["Setup"][i];
6464

6565
std::string key = GetKey(currentPlatform);
66-
std::vector<std::string> extensions;
66+
std::vector<std::string> setupSteps;
6767

6868
for(int j = 0; j < currentPlatform.num_children(); ++j)
69-
extensions.push_back(GetValue(currentPlatform[j]));
69+
setupSteps.push_back(GetValue(currentPlatform[j]));
7070

71-
Setup[key] = extensions;
71+
Setup[key] = setupSteps;
7272
}
7373
}
7474

@@ -79,12 +79,12 @@ bool runcpp2::Data::Profile::ParseYAML_Node(ryml::ConstNodeRef& profileNode)
7979
ryml::ConstNodeRef currentPlatform = profileNode["Cleanup"][i];
8080

8181
std::string key = GetKey(currentPlatform);
82-
std::vector<std::string> extensions;
82+
std::vector<std::string> cleanupSteps;
8383

8484
for(int j = 0; j < currentPlatform.num_children(); ++j)
85-
extensions.push_back(GetValue(currentPlatform[j]));
85+
cleanupSteps.push_back(GetValue(currentPlatform[j]));
8686

87-
Cleanup[key] = extensions;
87+
Cleanup[key] = cleanupSteps;
8888
}
8989
}
9090

Src/runcpp2/Data/StageInfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,10 +393,10 @@ bool runcpp2::Data::StageInfo::ConstructCommand(const SubstitutionMap& substitut
393393
{
394394
if(substitutionMap.count(substitutionsInCurrentPart.at(j)) == 0)
395395
{
396-
ssLOG_INFO("Failed to find " << substitutionsInCurrentPart.at(j) << " in " <<
396+
ssLOG_DEBUG("No substitution found for " << substitutionsInCurrentPart.at(j) << " in " <<
397397
currentRunParts.at(i).CommandPart);
398398

399-
ssLOG_INFO("Current run part is type repeat, skipping to next");
399+
ssLOG_DEBUG("Current run part is type repeat, skipping to next");
400400
continue;
401401
}
402402

Src/runcpp2/DependenciesHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ namespace
233233
{
234234
if(!runcpp2::HasValueFromPlatformMap(profile.FilesTypes.ObjectLinkFile.Extension))
235235
{
236-
ssLOG_ERROR("Failed to find shared library extensions for dependency " <<
236+
ssLOG_ERROR("Failed to find object file extensions for dependency " <<
237237
dependencyInfo.Name);
238238

239239
return false;

Src/runcpp2/runcpp2.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ namespace
218218
if(scriptFullMain != nullptr)
219219
{
220220
std::vector<std::string> runArgsCopy = runArgs;
221-
runArgsCopy.insert(runArgsCopy.begin(), scriptPath);
221+
runArgsCopy.insert( runArgsCopy.begin(),
222+
runcpp2::ProcessPath(compiledSharedLibPath.string()));
222223

223224
std::vector<char*> runArgsCStr(runArgsCopy.size());
224225
for(int i = 0; i < runArgsCopy.size(); ++i)

0 commit comments

Comments
 (0)