diff options
author | dec05eba <dec05eba@protonmail.com> | 2018-01-04 01:01:35 +0100 |
---|---|---|
committer | dec05eba <dec05eba@protonmail.com> | 2018-01-04 01:01:42 +0100 |
commit | a548abb5a6a83c9318e9db3cf71170a7610e2758 (patch) | |
tree | e8556530f15102054f6175dc7a3438aaaaf8d77e /include | |
parent | e862bb76a2f4c9c293fe2638c7fb034de2af709c (diff) |
Use packages list to find packages
Diffstat (limited to 'include')
-rw-r--r-- | include/GlobalLib.hpp | 1 | ||||
-rw-r--r-- | include/Package.hpp | 21 | ||||
-rw-r--r-- | include/PkgConfig.hpp | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/include/GlobalLib.hpp b/include/GlobalLib.hpp index b098543..e0cc25c 100644 --- a/include/GlobalLib.hpp +++ b/include/GlobalLib.hpp @@ -17,6 +17,7 @@ namespace sibs DEPENDENCY_VERSION_NO_MATCH = 20 }; + static Result<bool> getLibs(const std::vector<Dependency> &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 std::string &version, LinkerFlagCallbackFunc staticLinkerFlagCallbackFunc, LinkerFlagCallbackFunc dynamicLinkerFlagCallbackFunc, GlobalIncludeDirCallbackFunc globalIncludeDirCallback); static Result<bool> downloadDependency(const Dependency &dependency); diff --git a/include/Package.hpp b/include/Package.hpp index 106a48d..475e11b 100644 --- a/include/Package.hpp +++ b/include/Package.hpp @@ -1,6 +1,10 @@ #ifndef SIBS_PACKAGE_HPP #define SIBS_PACKAGE_HPP +#include "../external/rapidjson/document.h" +#include "Result.hpp" +#include <string> + namespace sibs { enum class PackageType : int @@ -20,6 +24,23 @@ namespace sibs // Identical to DYNAMIC LIBRARY }; + + class Package + { + public: + /* + * Get package list from url which contains json file. + * Returns json document structure (rapidjson) + */ + static Result<rapidjson::Document*> getPackageList(const char *url); + + /* + * Return the first url in list. + * TODO: If we fail to fetch package from first url, try other other ones in the list (or if the first url is too slow / takes too long to respond). + * TODO: Add version matching with wildcard etc. If we specify "1.2.*", then it should get the latest version that matches; etc... + */ + static Result<std::string> getPackageUrl(const char *packageName, const char *packageVersion); + }; } #endif //SIBS_PACKAGE_HPP diff --git a/include/PkgConfig.hpp b/include/PkgConfig.hpp index da78b91..e525843 100644 --- a/include/PkgConfig.hpp +++ b/include/PkgConfig.hpp @@ -13,6 +13,7 @@ namespace sibs class PkgConfig { public: + static Result<bool> validatePkgConfigPackageVersionExists(const Dependency &dependency); static Result<bool> validatePackageExists(const std::string &name); static Result<bool> validatePackageVersionAtLeast(const std::string &name, const std::string &version); static Result<std::string> getDynamicLibsLinkerFlags(const std::vector<Dependency> &libs); |