aboutsummaryrefslogtreecommitdiff
path: root/include/Conf.hpp
diff options
context:
space:
mode:
authordec05eba <dec05eba@protonmail.com>2018-01-14 18:36:20 +0100
committerdec05eba <dec05eba@protonmail.com>2018-01-26 09:13:15 +0100
commit91ab79f1475371e6e57d00f24f98bccb7749d15a (patch)
tree40fa847c783ecdc165ad1fc6b7c5cd2a026d25b9 /include/Conf.hpp
parentb7b7b3d359765e3ffb011dc34ff928e614766666 (diff)
Add git dependencies
Diffstat (limited to 'include/Conf.hpp')
-rw-r--r--include/Conf.hpp17
1 files changed, 13 insertions, 4 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp
index 90f150a..13245c1 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -228,7 +228,9 @@ namespace sibs
}
}
- virtual ~SibsConfig(){}
+ SibsConfig operator=(SibsConfig &other) = delete;
+
+ virtual ~SibsConfig();
Compiler getCompiler() const
{
@@ -257,9 +259,14 @@ namespace sibs
this->testPath = testPath;
}
- virtual const std::vector<Dependency>& getDependencies() const
+ virtual const std::vector<PackageListDependency*>& getPackageListDependencies() const
+ {
+ return packageListDependencies;
+ }
+
+ virtual const std::vector<GitDependency*>& getGitDependencies() const
{
- return dependencies;
+ return gitDependencies;
}
virtual const FileString& getProjectPath() const
@@ -380,6 +387,7 @@ namespace sibs
protected:
virtual void processObject(StringView name) override;
virtual void processField(StringView name, const ConfigValue &value) override;
+ void parseDependencies(const StringView &name, const ConfigValue &value);
virtual void finished() override;
void failInvalidFieldUnderObject(const StringView &fieldName) const;
void validatePackageTypeDefined() const;
@@ -399,7 +407,8 @@ namespace sibs
std::string packageName;
FileString testPath;
PackageType packageType;
- std::vector<Dependency> dependencies;
+ std::vector<PackageListDependency*> packageListDependencies;
+ std::vector<GitDependency*> gitDependencies;
std::vector<std::string> includeDirs;
std::vector<std::string> exposeIncludeDirs;
std::vector<Platform> platforms;