Skip to content

Commit f3237b9

Browse files
Miscellaneous changes
1 parent d2f09ca commit f3237b9

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

Src/runcpp2/CompilingLinking.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ namespace
110110

111111
//Include Directories
112112
{
113-
//TODO(NOW): Use filtered dependencies instead
114113
for(int i = 0; i < availableDependencies.size(); ++i)
115114
{
116115
for(int j = 0; j < availableDependencies.at(i)->AbsoluteIncludePaths.size(); ++j)
@@ -285,7 +284,6 @@ namespace
285284
AppendAndRemoveFlags(profile, scriptInfo.OverrideLinkFlags, linkFlags);
286285

287286
//Add link flags for the dependencies
288-
//TODO(NOW): Use the filtered dependencies
289287
for(int i = 0; i < availableDependencies.size(); ++i)
290288
{
291289
std::string targetProfileName;

Src/runcpp2/ConfigParsing.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ extern "C" const size_t DefaultScriptDependencies_size;
1515

1616
namespace
1717
{
18-
bool ParseUserConfig( const std::string& userConfigString,
19-
std::vector<runcpp2::Data::Profile>& outProfiles,
20-
std::string& outPreferredProfile)
18+
bool ParseUserConfig( const std::string& userConfigString,
19+
std::vector<runcpp2::Data::Profile>& outProfiles,
20+
std::string& outPreferredProfile)
2121
{
2222
ssLOG_FUNC_DEBUG();
2323

@@ -181,6 +181,8 @@ bool runcpp2::WriteDefaultConfig(const std::string& userConfigPath)
181181
bool runcpp2::ReadUserConfig( std::vector<Data::Profile>& outProfiles,
182182
std::string& outPreferredProfile)
183183
{
184+
INTERNAL_RUNCPP2_SAFE_START();
185+
184186
ssLOG_FUNC_DEBUG();
185187

186188
std::string configPath = GetConfigFilePath();
@@ -215,6 +217,8 @@ bool runcpp2::ReadUserConfig( std::vector<Data::Profile>& outProfiles,
215217
}
216218

217219
return true;
220+
221+
INTERNAL_RUNCPP2_SAFE_CATCH_RETURN(false);
218222
}
219223

220224
bool runcpp2::ParseScriptInfo( const std::string& scriptInfo,

Src/runcpp2/runcpp2.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ namespace
2525

2626
if(!ghc::filesystem::exists(runcpp2Dir))
2727
{
28-
std::error_code _;
29-
if(!ghc::filesystem::create_directory(runcpp2Dir, _))
28+
std::error_code e;
29+
if(!ghc::filesystem::create_directory(runcpp2Dir, e))
3030
{
3131
ssLOG_ERROR("Failed to create runcpp2 directory");
3232
return false;
@@ -55,6 +55,7 @@ namespace
5555
args.push_back(runArgs[i].c_str());
5656
}
5757

58+
//TODO: Don't redirect output
5859
System2CommandInfo runCommandInfo = {};
5960
runCommandInfo.RunDirectory = processedScriptDir.c_str();
6061
runCommandInfo.RedirectOutput = true;

TODO.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1+
- Add option to watch new changes
12
- Add option to add Default Script Info to script
3+
- Add wildcard support for filenames and extensions
4+
25
- Add tests and examples (On Windows as well)
36
- Make SearchLibraryNames and SearchDirectories optional (?)
47
- Add System Source Type for dependencies
58
- Allow cache to be in the config folder
69
- Output compile_command.json
710
- Allow Languages to override FileExtensions in compiler profile (?)
11+
- Add ability to add defines for cross-compiler

0 commit comments

Comments
 (0)