From 1a6c67af3851748a0a604e3b3e99bd63f3f576a0 Mon Sep 17 00:00:00 2001 From: dec05eba Date: Tue, 3 Nov 2020 06:11:09 +0100 Subject: Remove ability to use git projects as dependencies. Users can add them as git submodules instead --- include/Conf.hpp | 6 ------ include/Dependency.hpp | 23 ----------------------- include/GitRepository.hpp | 16 ---------------- include/GlobalLib.hpp | 3 --- 4 files changed, 48 deletions(-) delete mode 100644 include/GitRepository.hpp (limited to 'include') 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& getGitDependencies() const - { - return gitDependencies; - } virtual const FileString& getProjectPath() const { @@ -464,7 +459,6 @@ namespace sibs FileString testPath; PackageType packageType; std::vector packageListDependencies; - std::vector gitDependencies; std::vector platforms; std::unordered_map 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 clone(GitDependency *gitDependency, const FileString &repoDirPath); - static Result 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 getLibs(const std::vector &libs, const SibsConfig &parentConfig, const FileString &globalLibRootDir, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback); static Result validatePackageExists(const FileString &globalLibRootDir, const std::string &name); static Result getLibsLinkerFlags(const SibsConfig &parentConfig, const FileString &globalLibRootDir, const std::string &name, const PackageVersionRange &versionRange, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback); - static Result getLibsLinkerFlags(const SibsConfig &parentConfig, const FileString &globalLibRootDir, GitDependency *gitDependency, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback); static Result downloadDependency(PackageListDependency *dependency, Platform platform); - static Result downloadDependency(GitDependency *dependency, Platform platform); private: static Result getLibsLinkerFlagsCommon(const SibsConfig &parentConfig, const FileString &packageDir, const std::string &dependencyName, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback); }; -- cgit v1.2.3