diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Conf.cpp | 16 | ||||
| -rw-r--r-- | src/FileUtil.cpp | 2 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/Conf.cpp b/src/Conf.cpp index b1e05bb..97d562c 100644 --- a/src/Conf.cpp +++ b/src/Conf.cpp @@ -413,6 +413,22 @@ namespace sibs else throw ParserException("Expected package.tests to be a single value, was a list"); } + else if(name.equals("include_dirs")) + { + if(value.isList()) + { + // TODO: Checking for duplicate declaration should be done in the config parser + if(!includeDirs.empty()) + throw ParserException("Found duplicate declaration of package.include_dirs"); + + for(const StringView &includeDir : value.asList()) + { + includeDirs.emplace_back(string(includeDir.data, includeDir.size)); + } + } + else + throw ParserException("Expected package.include_dirs to be a list, was a single value"); + } } else if(currentObject.equals("dependencies")) { diff --git a/src/FileUtil.cpp b/src/FileUtil.cpp index 7248537..d075f2b 100644 --- a/src/FileUtil.cpp +++ b/src/FileUtil.cpp @@ -223,7 +223,7 @@ namespace sibs string result = resolved; free(resolved); - return Result<string>::Ok(resolved); + return Result<string>::Ok(result); } #else #error "TODO: Implement createDirectoryRecursive and getRealPath on windows" diff --git a/src/main.cpp b/src/main.cpp index e645b70..79d4d9d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -300,7 +300,7 @@ int newProject(int argc, const char **argv) newProjectCreateConf(projectName, projectTypeConf, projectPath); createProjectSubDir(projectPath + "/src"); createProjectSubDir(projectPath + "/include"); - createProjectFile(projectPath + "/src/main.cpp", "#include <cstdio>\n\nint main()\n{ return 0;\n}\n"); + createProjectFile(projectPath + "/src/main.cpp", "#include <cstdio>\n\nint main()\n{\n return 0;\n}\n"); // We are ignoring git init result on purpose. If it fails, just ignore it; not important gitInitProject(projectPath); return 0; |