aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/Conf.hpp6
-rw-r--r--include/Dependency.hpp23
-rw-r--r--include/GitRepository.hpp16
-rw-r--r--include/GlobalLib.hpp3
4 files changed, 0 insertions, 48 deletions
diff --git a/include/Conf.hpp b/include/Conf.hpp
index dbe89d4..12164ea 100644
--- a/include/Conf.hpp
+++ b/include/Conf.hpp
@@ -277,11 +277,6 @@ namespace sibs
{
return packageListDependencies;
}
-
- virtual const std::vector<GitDependency*>& getGitDependencies() const
- {
- return gitDependencies;
- }
virtual const FileString& getProjectPath() const
{
@@ -464,7 +459,6 @@ namespace sibs
FileString testPath;
PackageType packageType;
std::vector<PackageListDependency*> packageListDependencies;
- std::vector<GitDependency*> gitDependencies;
std::vector<Platform> platforms;
std::unordered_map<std::string, std::string> defines;
OptimizationLevel optimizationLevel;
diff --git a/include/Dependency.hpp b/include/Dependency.hpp
index f505503..4660a05 100644
--- a/include/Dependency.hpp
+++ b/include/Dependency.hpp
@@ -8,7 +8,6 @@
namespace sibs
{
class PackageListDependency;
- class GitDependency;
class Dependency
{
@@ -16,7 +15,6 @@ namespace sibs
enum class Source
{
PACKAGE_LIST,
- GIT
};
virtual ~Dependency(){}
@@ -28,12 +26,6 @@ namespace sibs
assert(getSource() == Source::PACKAGE_LIST);
return (PackageListDependency*)this;
}
-
- const GitDependency* asGitDependency() const
- {
- assert(getSource() == Source::GIT);
- return (GitDependency*)this;
- }
};
class PackageListDependency : public Dependency
@@ -48,21 +40,6 @@ namespace sibs
std::string name;
PackageVersionRange version;
};
-
- class GitDependency : public Dependency
- {
- public:
- virtual ~GitDependency(){}
- virtual Source getSource() const
- {
- return Source::GIT;
- }
-
- std::string name;
- std::string url;
- std::string branch;
- std::string revision;
- };
}
#endif //SIBS_DEPENDENCY_HPP
diff --git a/include/GitRepository.hpp b/include/GitRepository.hpp
deleted file mode 100644
index 98399a0..0000000
--- a/include/GitRepository.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include "Result.hpp"
-#include "FileUtil.hpp"
-
-namespace sibs
-{
- class GitDependency;
-
- class GitRepository
- {
- public:
- static Result<bool> clone(GitDependency *gitDependency, const FileString &repoDirPath);
- static Result<bool> pull(GitDependency *gitDependency, const FileString &repoDirPath);
- };
-}
diff --git a/include/GlobalLib.hpp b/include/GlobalLib.hpp
index b6ac60c..92739df 100644
--- a/include/GlobalLib.hpp
+++ b/include/GlobalLib.hpp
@@ -8,7 +8,6 @@
namespace sibs
{
class PackageListDependency;
- class GitDependency;
class GlobalLib
{
@@ -22,9 +21,7 @@ namespace sibs
static Result<bool> getLibs(const std::vector<PackageListDependency*> &libs, const SibsConfig &parentConfig, const FileString &globalLibRootDir, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback);
static Result<bool> validatePackageExists(const FileString &globalLibRootDir, const std::string &name);
static Result<bool> getLibsLinkerFlags(const SibsConfig &parentConfig, const FileString &globalLibRootDir, const std::string &name, const PackageVersionRange &versionRange, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback);
- static Result<bool> getLibsLinkerFlags(const SibsConfig &parentConfig, const FileString &globalLibRootDir, GitDependency *gitDependency, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback);
static Result<bool> downloadDependency(PackageListDependency *dependency, Platform platform);
- static Result<bool> downloadDependency(GitDependency *dependency, Platform platform);
private:
static Result<bool> getLibsLinkerFlagsCommon(const SibsConfig &parentConfig, const FileString &packageDir, const std::string &dependencyName, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback);
};