From 426dfd487e1b60c2c709b2f37a696e610d37d554 Mon Sep 17 00:00:00 2001 From: StefanoBelli Date: Mon, 30 Mar 2020 12:22:48 +0200 Subject: [PATCH] Final commit, project abandoned --- .travis.yml | 4 +--- CMakeLists.txt | 2 +- Doxyfile | 2 +- src/CMakeLists.txt | 8 +------- src/https.cpp | 8 -------- 5 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6287e28..e165703 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,16 +15,14 @@ addons: packages: - cmake - doxygen - - libgcrypt-dev - pkg-config - libjsoncpp1 - libjsoncpp-dev before_script: - - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update && brew install pkg-config jsoncpp doxygen curl && brew upgrade cmake libgcrypt; fi + - if [[ $TRAVIS_OS_NAME == "osx" ]]; then brew update && brew install pkg-config jsoncpp doxygen curl; fi script: - - pkg-config --variable pc_path pkg-config - cmake . -DCMAKE_BUILD_TYPE="Release" -DCMAKE_CXX_FLAGS="-Wall -Wextra -O2 -finline-functions" -DXXTELEBOT_PKG_CONFIG="not_needed_here" - make -j3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 88d1fe1..447d96e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.2) project(xxtelebot LANGUAGES CXX - VERSION 1.4.1.0) + VERSION 1.4.1.1) # M.m set(TGBOTAPI_VER_MAJOR 4) diff --git a/Doxyfile b/Doxyfile index 2325f07..1d4fa9b 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "xxtelebot" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 1.4.1.0 +PROJECT_NUMBER = 1.4.1.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8ccdfbe..73b99b9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,13 +1,8 @@ cmake_minimum_required(VERSION 3.2) find_package(PkgConfig REQUIRED) -find_package(CURL REQUIRED VERSION 7.56.0) +find_package(CURL 7.56.0 REQUIRED) find_package(Threads REQUIRED) -#find_library(GCRYPT_LIBRARY NAMES gcrypt libgcrypt) - -#if(NOT GCRYPT_LIBRARY) -# message(FATAL_ERROR "Could not find gcrypt library") -#endif() pkg_check_modules(JSONCPP QUIET jsoncpp) @@ -42,7 +37,6 @@ target_link_libraries(xxtelebot PRIVATE ${CURL_LIBRARIES} ${JSONCPP_LIBRARIES} -# ${GCRYPT_LIBRARY} Threads::Threads ) diff --git a/src/https.cpp b/src/https.cpp index 5c17ba1..c73957c 100644 --- a/src/https.cpp +++ b/src/https.cpp @@ -1,5 +1,4 @@ #include -//#include #include #include #include @@ -9,8 +8,6 @@ #define SEPARATE(k, sstr) \ if (k) sstr << ',' -//GCRY_THREAD_OPTION_PTHREAD_IMPL; /*deprecated*/ - using namespace tgbot::utils::http; static size_t write_data(const char *ptr, unused size_t nbs, size_t count, @@ -19,16 +16,11 @@ static size_t write_data(const char *ptr, unused size_t nbs, size_t count, return count; } -//static void __GnuTLS_ProvideLockingMethod() { -// gcry_control(GCRYCTL_SET_THREAD_CBS); -//} - void tgbot::utils::http::__internal_Curl_GlobalInit() { if(curl_global_sslset(CURLSSLBACKEND_GNUTLS, NULL, NULL) != CURLSSLSET_OK) throw std::runtime_error("curl_global_sslset() error: libcurl does not support GnuTLS"); curl_global_init(CURL_GLOBAL_SSL); -// __GnuTLS_ProvideLockingMethod(); } CURL *tgbot::utils::http::curlEasyInit() {