From 212d66a65a7e2d774db17fdf40cb59636c3721ab Mon Sep 17 00:00:00 2001 From: drodin Date: Wed, 26 Jan 2022 10:28:26 +0700 Subject: [PATCH 01/19] check-urls.py maintenance script --- maintenance/check-urls.py | 49 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 maintenance/check-urls.py diff --git a/maintenance/check-urls.py b/maintenance/check-urls.py new file mode 100644 index 0000000000..8f668aa678 --- /dev/null +++ b/maintenance/check-urls.py @@ -0,0 +1,49 @@ +from os.path import dirname, abspath, join +from glob import glob +import re +import pycurl + +def getResponseStausCode(url): + try: + c = pycurl.Curl() + c.setopt(pycurl.WRITEFUNCTION, lambda x: None) + # c.setopt(pycurl.HEADERFUNCTION, lambda x: None) + c.setopt(pycurl.URL, url) + c.setopt(pycurl.HEADER, 1) + c.setopt(pycurl.NOBODY, 1) + c.setopt(pycurl.FOLLOWLOCATION, 1) + c.perform() + return c.getinfo(pycurl.HTTP_CODE) + except pycurl.error: + return 999 + +hunterDir = dirname(dirname(abspath(__file__))) +projectsDir = join(hunterDir, 'cmake', 'projects') + +projectsFiles = join(projectsDir, '**', '*.cmake') + +checkedFile = join(hunterDir, 'checked.txt') +try: + checkedStream = open(checkedFile, "r+") + checked = checkedStream.readlines() +except FileNotFoundError: + checkedStream = open(checkedFile, "w") + checked = [] + +projects = dict() + +for projectFile in glob(projectsFiles, recursive=True): + file = open(projectFile, "r") + content = file.read() + file.close() + + entries = re.findall(r'hunter_add_version\s*\(\s*PACKAGE_NAME\s+"*(.*?)"*\s+VERSION\s+"*(.*?)"*\s+URL\s+"*(.*?)"*\s+SHA1\s+"*(.*?)"*\s+.*?\)', content, re.MULTILINE | re.DOTALL) + if len(entries): + for name, version, url, _ in entries: + if not any(url == x.rstrip('\n') for x in checked): + statusCode = getResponseStausCode(url) + print(str(statusCode) + ' ' + url) + if statusCode > 200: + checkedStream.write(str(statusCode) + ' ' + url + '\n') + +checkedStream.close() From 00ca6d8c022c705af03e5241ac4d9b4d95cf2706 Mon Sep 17 00:00:00 2001 From: drodin Date: Thu, 20 Jan 2022 13:12:45 +0700 Subject: [PATCH 02/19] Removed non-existent package 'EnumGroup' --- cmake/configs/default.cmake | 1 - cmake/projects/EnumGroup/hunter.cmake | 31 --------------------------- docs/packages/pkg/EnumGroup.rst | 19 ---------------- examples/EnumGroup/CMakeLists.txt | 18 ---------------- examples/EnumGroup/boo.cpp | 4 ---- 5 files changed, 73 deletions(-) delete mode 100644 cmake/projects/EnumGroup/hunter.cmake delete mode 100644 docs/packages/pkg/EnumGroup.rst delete mode 100644 examples/EnumGroup/CMakeLists.txt delete mode 100644 examples/EnumGroup/boo.cpp diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake index a93d158994..2b0a440586 100644 --- a/cmake/configs/default.cmake +++ b/cmake/configs/default.cmake @@ -58,7 +58,6 @@ hunter_default_version(CreateLaunchers VERSION 0.2.1) hunter_default_version(CsvParserCPlusPlus VERSION 1.0.1) hunter_default_version(EGL-Registry VERSION 0.0.0-dc0b58d-p0) hunter_default_version(Eigen VERSION 3.4.0) -hunter_default_version(EnumGroup VERSION 0.0.1) hunter_default_version(Expat VERSION 2.2.9-p0) hunter_default_version(FLAC VERSION 1.3.4-p0) hunter_default_version(FP16 VERSION 0.0.0-febbb1c-p0) diff --git a/cmake/projects/EnumGroup/hunter.cmake b/cmake/projects/EnumGroup/hunter.cmake deleted file mode 100644 index a2f650f040..0000000000 --- a/cmake/projects/EnumGroup/hunter.cmake +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2016-2018, Ruslan Baratov -# All rights reserved. - -# !!! DO NOT PLACE HEADER GUARDS HERE !!! - -include(hunter_add_version) -include(hunter_cacheable) -include(hunter_download) -include(hunter_pick_scheme) -include(hunter_cmake_args) - -hunter_add_version( - PACKAGE_NAME - EnumGroup - VERSION - 0.0.1 - URL - "https://github.com/Person-93/EnumGroup/archive/0.0.1.tar.gz" - SHA1 - e842e9c81865db3006e1b457b5bedea401ae5734 -) - -hunter_cmake_args( - EnumGroup - CMAKE_ARGS - ENUM_GROUP_WITH_TESTS=OFF -) - -hunter_pick_scheme(DEFAULT url_sha1_cmake) -hunter_cacheable(EnumGroup) -hunter_download(PACKAGE_NAME EnumGroup) diff --git a/docs/packages/pkg/EnumGroup.rst b/docs/packages/pkg/EnumGroup.rst deleted file mode 100644 index 347b4e5adc..0000000000 --- a/docs/packages/pkg/EnumGroup.rst +++ /dev/null @@ -1,19 +0,0 @@ -.. spelling:: - - EnumGroup - -.. index:: unsorted ; EnumGroup - -.. _pkg.EnumGroup: - -EnumGroup -========= - -- `Official `__ -- `Example `__ -- Added by `EnumGroup_developer `__ (`pr-1368 `__) - -.. literalinclude:: /../examples/EnumGroup/CMakeLists.txt - :language: cmake - :start-after: # DOCUMENTATION_START { - :end-before: # DOCUMENTATION_END } diff --git a/examples/EnumGroup/CMakeLists.txt b/examples/EnumGroup/CMakeLists.txt deleted file mode 100644 index 079da7ed4b..0000000000 --- a/examples/EnumGroup/CMakeLists.txt +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 2016-2018, Ruslan Baratov -# All rights reserved. - -cmake_minimum_required(VERSION 3.0) - -# Emulate HunterGate: -# * https://github.com/hunter-packages/gate -include("../common.cmake") - -project(download-EnumGroup) - -# DOCUMENTATION_START { -hunter_add_package(EnumGroup) -find_package(EnumGroup CONFIG REQUIRED) - -add_executable(boo boo.cpp) -target_link_libraries(boo PUBLIC EnumGroup::EnumGroup) -# DOCUMENTATION_END } diff --git a/examples/EnumGroup/boo.cpp b/examples/EnumGroup/boo.cpp deleted file mode 100644 index 759bc1187a..0000000000 --- a/examples/EnumGroup/boo.cpp +++ /dev/null @@ -1,4 +0,0 @@ -#include - -int main() { -} From ca0d272fb3deb904ab12c0b2cdcf4eda184a33f5 Mon Sep 17 00:00:00 2001 From: drodin Date: Thu, 20 Jan 2022 13:14:13 +0700 Subject: [PATCH 03/19] Removed missing version '1.1.4-hunter-1' from 'doctest' --- cmake/projects/doctest/hunter.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/projects/doctest/hunter.cmake b/cmake/projects/doctest/hunter.cmake index ba46881dad..d1c08162fc 100644 --- a/cmake/projects/doctest/hunter.cmake +++ b/cmake/projects/doctest/hunter.cmake @@ -10,17 +10,6 @@ include(hunter_pick_scheme) include(hunter_cacheable) # List of versions here... -hunter_add_version( - PACKAGE_NAME - doctest - VERSION - "1.1.4-hunter-1" - URL - "https://github.com/piribes/doctest/archive/1.1.4-hunter-1.tar.gz" - SHA1 - 684580f4cf1f40ca7750bea90facc4564a807c2a -) - hunter_add_version( PACKAGE_NAME doctest From 978a480c35297a6a09066b214a7804653ef16cd1 Mon Sep 17 00:00:00 2001 From: drodin Date: Thu, 20 Jan 2022 13:14:46 +0700 Subject: [PATCH 04/19] Removed missing version '1.3.2-cmake3' from 'libogg' --- cmake/projects/libogg/hunter.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/projects/libogg/hunter.cmake b/cmake/projects/libogg/hunter.cmake index 3ec2e96350..6e03b13c49 100644 --- a/cmake/projects/libogg/hunter.cmake +++ b/cmake/projects/libogg/hunter.cmake @@ -15,17 +15,6 @@ hunter_add_version( 1c83a80374670c6c3cd2ffba59397a0329b69544 ) -hunter_add_version( - PACKAGE_NAME - libogg - VERSION - "1.3.2-cmake3" - URL - "https://github.com/Meralis40/ogg/archive/v1.3.2-cmake3.tar.gz" - SHA1 - 646672cabc9eec253c9199a872541e3a182f6062 -) - hunter_pick_scheme(DEFAULT url_sha1_cmake) hunter_cacheable(libogg) hunter_download( From c912d948c27cf8c501b06ea130bb6d855b51a5f4 Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 24 Jan 2022 13:04:12 +0700 Subject: [PATCH 05/19] Removed missing versions '0.11-p1', '0.11-hunter' from 'RapidJSON' --- cmake/projects/RapidJSON/hunter.cmake | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/cmake/projects/RapidJSON/hunter.cmake b/cmake/projects/RapidJSON/hunter.cmake index 7584558039..2894a9fa73 100644 --- a/cmake/projects/RapidJSON/hunter.cmake +++ b/cmake/projects/RapidJSON/hunter.cmake @@ -97,28 +97,6 @@ hunter_add_version( bb0bfb8ad5cf2b575b57efbf2957619735a1696e ) -hunter_add_version( - PACKAGE_NAME - RapidJSON - VERSION - "0.11-p1" - URL - "https://github.com/hunter-packages/rapidjson/archive/v0.11-p1.tar.gz" - SHA1 - 1d027e4d1e9cf03b4dcdeaf8459e2e10607d5913 -) - -hunter_add_version( - PACKAGE_NAME - RapidJSON - VERSION - "0.11-hunter" - URL - "https://github.com/hunter-packages/rapidjson/archive/v0.11-hunter.tar.gz" - SHA1 - 3cae7f5043e2bfbeb83c033b90a1a9fb69fd2371 -) - # C++ versions should be passed in by the toolchain. # Since this is a header-only library, the RAPIDJSON_BUILD_CXX11 setting is irrelevant. hunter_cmake_args( From aed7c2906442865567ed08df0aebb85e6655b95f Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 24 Jan 2022 19:07:23 +0700 Subject: [PATCH 06/19] Removed duplicate version '22_r01' from 'Android-Google-APIs' --- cmake/projects/Android-Google-APIs/hunter.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/projects/Android-Google-APIs/hunter.cmake b/cmake/projects/Android-Google-APIs/hunter.cmake index b29d48a787..b6d7b8f17d 100755 --- a/cmake/projects/Android-Google-APIs/hunter.cmake +++ b/cmake/projects/Android-Google-APIs/hunter.cmake @@ -56,17 +56,6 @@ hunter_add_version( ee6acf1b01020bfa8a8e24725dbc4478bee5e792 ) -hunter_add_version( - PACKAGE_NAME - Android-Google-APIs - VERSION - "22_r01" - URL - "https://dl.google.com/android/repository/google_apis-22_r01.zip" - SHA1 - 5def0f42160cba8acff51b9c0c7e8be313de84f5 -) - hunter_add_version( PACKAGE_NAME Android-Google-APIs From 30c6307ef0a3bbcad5186c21c3f03d3940144fa4 Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 24 Jan 2022 19:08:08 +0700 Subject: [PATCH 07/19] Removed duplicate version '1.0.2o' from 'OpenSSL' --- cmake/projects/OpenSSL/hunter.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake index f8cfa78d12..53a7568305 100755 --- a/cmake/projects/OpenSSL/hunter.cmake +++ b/cmake/projects/OpenSSL/hunter.cmake @@ -462,17 +462,6 @@ hunter_add_version( f0af7e246a677fd52945e5438eb11ce0de391a4c ) -hunter_add_version( - PACKAGE_NAME - OpenSSL - VERSION - "1.0.2o" - URL - "https://github.com/openssl/openssl/archive/OpenSSL_1_0_2o.tar.gz" - SHA1 - ec7ad3650206f1045d48f2fe9ed4ad93a1228ec5 -) - hunter_add_version( PACKAGE_NAME OpenSSL From e3520153389c6ea758906961266a97187827d365 Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 13 Jun 2022 10:36:21 +0700 Subject: [PATCH 08/19] Removed missing version '5.6.0-alpha' from 'Qt' --- cmake/projects/Qt/hunter.cmake | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/cmake/projects/Qt/hunter.cmake b/cmake/projects/Qt/hunter.cmake index 6eff7f8dbc..143f67b14e 100644 --- a/cmake/projects/Qt/hunter.cmake +++ b/cmake/projects/Qt/hunter.cmake @@ -205,17 +205,6 @@ hunter_add_version( da8682218c7ed731d1affbdd1abee3c7393fb3e7 ) -hunter_add_version( - PACKAGE_NAME - Qt - VERSION - "5.6.0-alpha" - URL - "http://download.qt.io/development_releases/qt/5.6/5.6.0-alpha/single/qt-everywhere-opensource-src-5.6.0-alpha.7z" - SHA1 - d902b7df94219d2ed2f5c868839c85ce9daa056a -) - hunter_add_version( PACKAGE_NAME Qt From 412d8c1f3e403536c43ee2bc421236a55adc3f4a Mon Sep 17 00:00:00 2001 From: drodin Date: Thu, 20 Jan 2022 13:15:50 +0700 Subject: [PATCH 09/19] Fixed urls in package 'Qt' --- cmake/projects/Qt/hunter.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/projects/Qt/hunter.cmake b/cmake/projects/Qt/hunter.cmake index 143f67b14e..aa073430a2 100644 --- a/cmake/projects/Qt/hunter.cmake +++ b/cmake/projects/Qt/hunter.cmake @@ -24,7 +24,7 @@ hunter_add_version( VERSION "5.5.0" URL - "http://download.qt.io/official_releases/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.7z" + "https://download.qt.io/new_archive/qt/5.5/5.5.0/single/qt-everywhere-opensource-src-5.5.0.7z" SHA1 df2c0a7a20f219f921246b260df086600515955d ) @@ -222,7 +222,7 @@ hunter_add_version( VERSION "5.10.1" URL - "http://download.qt.io/archive/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz" + "https://download.qt.io/new_archive/qt/5.10/5.10.1/single/qt-everywhere-src-5.10.1.tar.xz" SHA1 3d71e887287bdea664ac6f8db4aaa4a7d913be59 ) @@ -233,7 +233,7 @@ hunter_add_version( VERSION "5.11.1" URL - "http://download.qt.io/archive/qt/5.11/5.11.1/single/qt-everywhere-src-5.11.1.tar.xz" + "https://download.qt.io/new_archive/qt/5.11/5.11.1/single/qt-everywhere-src-5.11.1.tar.xz" SHA1 0ac866442a960d4038a51ba3096b2cc5d796b5ee ) @@ -244,7 +244,7 @@ hunter_add_version( VERSION "5.11.3" URL - "https://download.qt.io/archive/qt/5.11/5.11.3/single/qt-everywhere-src-5.11.3.tar.xz" + "https://download.qt.io/new_archive/qt/5.11/5.11.3/single/qt-everywhere-src-5.11.3.tar.xz" SHA1 3f6c0df4fa7524ed11557ed55db35ef551cd2782 ) From fef79cc8a3ab5411b9c752f3c20cb845a16a0741 Mon Sep 17 00:00:00 2001 From: drodin Date: Thu, 20 Jan 2022 13:15:31 +0700 Subject: [PATCH 10/19] Fixed urls in package 'libpcre' --- cmake/projects/libpcre/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/libpcre/hunter.cmake b/cmake/projects/libpcre/hunter.cmake index 09c166b3cc..646d32778c 100644 --- a/cmake/projects/libpcre/hunter.cmake +++ b/cmake/projects/libpcre/hunter.cmake @@ -16,7 +16,7 @@ hunter_add_version( VERSION "8.41" URL - "https://ftp.pcre.org/pub/pcre/pcre-8.41.tar.bz2" + "https://ftp.exim.org/pub/pcre/pcre-8.41.tar.bz2" SHA1 7d1f4aae4191512744a718cc2b81bcf995ec1437 ) From cadb596d87fa2710ff6066e957278dd196a23566 Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 13 Jun 2022 10:49:39 +0700 Subject: [PATCH 11/19] Fixed urls in package 'crc32c' --- cmake/projects/crc32c/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/crc32c/hunter.cmake b/cmake/projects/crc32c/hunter.cmake index 1cf7dfe198..d46b79b6b1 100644 --- a/cmake/projects/crc32c/hunter.cmake +++ b/cmake/projects/crc32c/hunter.cmake @@ -9,7 +9,7 @@ include(hunter_pick_scheme) hunter_add_version( PACKAGE_NAME crc32c VERSION "1.0.5" - URL "https://github.com/hunter-packages/crc32c/archive/hunter-1.0.5.tar.gz" + URL "https://github.com/hunter-packages/crc32c/archive/refs/tags/hunter-1.0.5.tar.gz" SHA1 "dc7fa8cb877b9cb12a4e22e553087fdd6ce28cce") hunter_add_version( From d4937a364225f940857b8ee95087a6c9b349ce86 Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 13 Jun 2022 10:49:57 +0700 Subject: [PATCH 12/19] Fixed urls in package 'tomcrypt' --- cmake/projects/tomcrypt/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/tomcrypt/hunter.cmake b/cmake/projects/tomcrypt/hunter.cmake index 8b29b7f1f8..3ee235ce8e 100644 --- a/cmake/projects/tomcrypt/hunter.cmake +++ b/cmake/projects/tomcrypt/hunter.cmake @@ -15,7 +15,7 @@ hunter_add_version( VERSION "1.17-p1" URL - "https://github.com/hunter-packages/libtomcrypt/archive/1.17-p1.tar.gz" + "https://github.com/hunter-packages/libtomcrypt/archive/refs/tags/1.17-p1.tar.gz" SHA1 3c9c61ee441b77517525528f5c191fa19801fd30 ) From c498d9423991abecb611b7366548d2457f0548be Mon Sep 17 00:00:00 2001 From: drodin Date: Tue, 25 Jan 2022 17:36:45 +0700 Subject: [PATCH 13/19] Changed ftp url to http one in 'x264' --- cmake/projects/x264/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/x264/hunter.cmake b/cmake/projects/x264/hunter.cmake index bba098573a..43dfe6d0fa 100644 --- a/cmake/projects/x264/hunter.cmake +++ b/cmake/projects/x264/hunter.cmake @@ -14,7 +14,7 @@ hunter_add_version( VERSION "snapshot-20170420-2245" URL - "ftp://ftp.videolan.org/pub/x264/snapshots/x264-snapshot-20170420-2245.tar.bz2" + "https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20170420-2245.tar.bz2" SHA1 679b8c4f39f375090bf64e5c80c83303e4ddc37c ) From 20c71b6e1b98aad3dc4565ed333126460659e0b1 Mon Sep 17 00:00:00 2001 From: drodin Date: Tue, 25 Jan 2022 17:35:19 +0700 Subject: [PATCH 14/19] Changed variable urls to direct ones in 'ceres-solver' --- cmake/projects/ceres-solver/hunter.cmake | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/cmake/projects/ceres-solver/hunter.cmake b/cmake/projects/ceres-solver/hunter.cmake index 6271e7518d..8f046e28c8 100644 --- a/cmake/projects/ceres-solver/hunter.cmake +++ b/cmake/projects/ceres-solver/hunter.cmake @@ -10,10 +10,6 @@ include(hunter_cacheable) # starting with 1.12.0-p2 ceres-solver is cacheable hunter_cacheable(ceres-solver) -# use base url for hunter fork -set(_hunter_ceres_base_url_fork "https://github.com/hunter-packages/ceres-solver/archive") - - # List of versions hunter_add_version( PACKAGE_NAME @@ -21,7 +17,7 @@ hunter_add_version( VERSION "1.12.0-p2" URL - "${_hunter_ceres_base_url_fork}/v1.12.0-p2.tar.gz" + "https://github.com/hunter-packages/ceres-solver/archive/v1.12.0-p2.tar.gz" SHA1 04724b04aaa17fdd1feaa7d21e8a37723f78d9fc ) @@ -32,7 +28,7 @@ hunter_add_version( VERSION "1.12.0-p1" URL - "${_hunter_ceres_base_url_fork}/v1.12.0-p1.tar.gz" + "https://github.com/hunter-packages/ceres-solver/archive/v1.12.0-p1.tar.gz" SHA1 d8676dcfe72c19d77aa099a894b94515761e8e94 ) @@ -43,7 +39,7 @@ hunter_add_version( VERSION "1.12.0-p0" URL - "${_hunter_ceres_base_url_fork}/v1.12.0-p0.tar.gz" + "https://github.com/hunter-packages/ceres-solver/archive/v1.12.0-p0.tar.gz" SHA1 c8a24d83bf4b26b99fd8fc3bed28a267e6247c85 ) @@ -54,7 +50,7 @@ hunter_add_version( VERSION "1.14.0-p0" URL - "${_hunter_ceres_base_url_fork}/v1.14.0-p0.tar.gz" + "https://github.com/hunter-packages/ceres-solver/archive/v1.14.0-p0.tar.gz" SHA1 e27d6c0720977667a7789fd7e865e7362dc58695 ) @@ -64,7 +60,7 @@ hunter_add_version( VERSION "1.14.0-p1" URL - "${_hunter_ceres_base_url_fork}/v1.14.0-p1.tar.gz" + "https://github.com/hunter-packages/ceres-solver/archive/v1.14.0-p1.tar.gz" SHA1 fb63a3f1ee8c39a6eda1c3e1611aeb3789015fdf ) From e8dbd714099e1981237f92630aace4b83e20b990 Mon Sep 17 00:00:00 2001 From: drodin Date: Tue, 25 Jan 2022 17:35:29 +0700 Subject: [PATCH 15/19] Changed variable urls to direct ones in 'Boost' --- cmake/projects/Boost/hunter.cmake | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/cmake/projects/Boost/hunter.cmake b/cmake/projects/Boost/hunter.cmake index 8f5ba459f4..e04a6e527a 100644 --- a/cmake/projects/Boost/hunter.cmake +++ b/cmake/projects/Boost/hunter.cmake @@ -13,16 +13,14 @@ include(hunter_check_toolchain_definition) # Disable searching in locations not specified by these hint variables. set(Boost_NO_SYSTEM_PATHS ON) -# use base url for official boost releases -set(_hunter_boost_base_url "https://boostorg.jfrog.io/artifactory/main/release") - +# for official boost releases use base url https://boostorg.jfrog.io/artifactory/main/release hunter_add_version( PACKAGE_NAME Boost VERSION "1.65.1" URL - "${_hunter_boost_base_url}/1.65.1/source/boost_1_65_1.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/1.65.1/source/boost_1_65_1.tar.bz2" SHA1 4a5b0c3c1b1b9a4d6cb6a6cc395e903e76f76720 ) @@ -33,7 +31,7 @@ hunter_add_version( VERSION "1.65.0" URL - "${_hunter_boost_base_url}/1.65.0/source/boost_1_65_0.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/1.65.0/source/boost_1_65_0.tar.bz2" SHA1 f9260074ecfb31f3e65322fae9c15cc423c0ad59 ) @@ -44,7 +42,7 @@ hunter_add_version( VERSION "1.66.0" URL - "${_hunter_boost_base_url}/1.66.0/source/boost_1_66_0.7z" + "https://boostorg.jfrog.io/artifactory/main/release/1.66.0/source/boost_1_66_0.7z" SHA1 075d0b43980614054b1f1bafd189f863bba6600e ) @@ -66,7 +64,7 @@ hunter_add_version( VERSION "1.67.0" URL - "${_hunter_boost_base_url}/1.67.0/source/boost_1_67_0.7z" + "https://boostorg.jfrog.io/artifactory/main/release/1.67.0/source/boost_1_67_0.7z" SHA1 64c278c23defe155e630a307ae2c0615348b14b3 ) @@ -198,7 +196,7 @@ hunter_add_version( VERSION "1.75.0" URL - "${_hunter_boost_base_url}/1.75.0/source/boost_1_75_0.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2" SHA1 6109efd3bdd8b9220d7d85b5e125f7f28721b9a9 ) @@ -209,7 +207,7 @@ hunter_add_version( VERSION "1.76.0" URL - "${_hunter_boost_base_url}/1.76.0/source/boost_1_76_0.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2" SHA1 8064156508312dde1d834fec3dca9b11006555b6 ) @@ -220,7 +218,7 @@ hunter_add_version( VERSION "1.77.0" URL - "${_hunter_boost_base_url}/1.77.0/source/boost_1_77_0.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.tar.bz2" SHA1 0cb4f947d094fc311e13ffacaff00418130ef5ef ) @@ -231,20 +229,19 @@ hunter_add_version( VERSION "1.78.0" URL - "${_hunter_boost_base_url}/1.78.0/source/boost_1_78_0.tar.bz2" + "https://boostorg.jfrog.io/artifactory/main/release/1.78.0/source/boost_1_78_0.tar.bz2" SHA1 7ccc47e82926be693810a687015ddc490b49296d ) -# up until 1.63 sourcefourge was used -set(_hunter_boost_base_url "https://downloads.sourceforge.net/project/boost/boost/") +# up until 1.63 sourcefourge was used, base url https://downloads.sourceforge.net/project/boost/boost hunter_add_version( PACKAGE_NAME Boost VERSION "1.64.0" URL - "${_hunter_boost_base_url}/1.64.0/boost_1_64_0.tar.bz2" + "https://downloads.sourceforge.net/project/boost/boost/1.64.0/boost_1_64_0.tar.bz2" SHA1 51421ef259a4530edea0fbfc448460fcc5c64edb ) @@ -255,7 +252,7 @@ hunter_add_version( VERSION "1.63.0" URL - "${_hunter_boost_base_url}/1.63.0/boost_1_63_0.tar.bz2" + "https://downloads.sourceforge.net/project/boost/boost/1.63.0/boost_1_63_0.tar.bz2" SHA1 9f1dd4fa364a3e3156a77dc17aa562ef06404ff6 ) @@ -266,7 +263,7 @@ hunter_add_version( VERSION "1.62.0" URL - "${_hunter_boost_base_url}/1.62.0/boost_1_62_0.tar.bz2" + "https://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2" SHA1 5fd97433c3f859d8cbab1eaed4156d3068ae3648 ) @@ -278,7 +275,7 @@ hunter_add_version( VERSION "1.61.0" URL - "${_hunter_boost_base_url}/1.61.0/boost_1_61_0.tar.bz2" + "https://downloads.sourceforge.net/project/boost/boost/1.61.0/boost_1_61_0.tar.bz2" SHA1 f84b1a1ce764108ec3c2b7bd7704cf8dfd3c9d01 ) From 696985ee858f50873aed080efe196ea0f2e079d8 Mon Sep 17 00:00:00 2001 From: drodin Date: Tue, 25 Jan 2022 17:36:08 +0700 Subject: [PATCH 16/19] Moved comment from URL in 'pip_decorator' --- cmake/projects/pip_decorator/hunter.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/projects/pip_decorator/hunter.cmake b/cmake/projects/pip_decorator/hunter.cmake index efb4eb1375..c39c6ac799 100644 --- a/cmake/projects/pip_decorator/hunter.cmake +++ b/cmake/projects/pip_decorator/hunter.cmake @@ -8,13 +8,13 @@ include(hunter_cacheable) include(hunter_download) include(hunter_pick_scheme) +# GitHub is missing 4.4.0 release: https://github.com/micheles/decorator/releases hunter_add_version( PACKAGE_NAME pip_decorator VERSION 4.4.0 URL - # GitHub is missing 4.4.0 release: https://github.com/micheles/decorator/releases "https://files.pythonhosted.org/packages/ba/19/1119fe7b1e49b9c8a9f154c930060f37074ea2e8f9f6558efc2eeaa417a2/decorator-4.4.0.tar.gz" SHA1 de59d002bcf83b16421e6ea6fe40256b5fccedad From e3d8fc456bf491a1160a5b1883ed276fe201f89f Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 13 Jun 2022 16:09:24 +0700 Subject: [PATCH 17/19] Update maintenance/check-urls.py Co-authored-by: NeroBurner --- maintenance/check-urls.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/maintenance/check-urls.py b/maintenance/check-urls.py index 8f668aa678..900c78ac71 100644 --- a/maintenance/check-urls.py +++ b/maintenance/check-urls.py @@ -33,9 +33,8 @@ def getResponseStausCode(url): projects = dict() for projectFile in glob(projectsFiles, recursive=True): - file = open(projectFile, "r") - content = file.read() - file.close() + with open(projectFile, "r") as file: + content = file.read() entries = re.findall(r'hunter_add_version\s*\(\s*PACKAGE_NAME\s+"*(.*?)"*\s+VERSION\s+"*(.*?)"*\s+URL\s+"*(.*?)"*\s+SHA1\s+"*(.*?)"*\s+.*?\)', content, re.MULTILINE | re.DOTALL) if len(entries): From 1c9cd26babf4278aeb6155218bf2686c9ab99e1a Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 13 Jun 2022 16:13:31 +0700 Subject: [PATCH 18/19] add output of check-urls.py to .gitignore --- .gitignore | 5 ++++- maintenance/check-urls.py | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ad826a51ce..de135bbc29 100644 --- a/.gitignore +++ b/.gitignore @@ -35,4 +35,7 @@ _Base CMakeSettings.json # Default vscode python virtual env folder -env \ No newline at end of file +env + +# Maintenance output +maintenance/checked.txt diff --git a/maintenance/check-urls.py b/maintenance/check-urls.py index 900c78ac71..aedc99b873 100644 --- a/maintenance/check-urls.py +++ b/maintenance/check-urls.py @@ -22,7 +22,7 @@ def getResponseStausCode(url): projectsFiles = join(projectsDir, '**', '*.cmake') -checkedFile = join(hunterDir, 'checked.txt') +checkedFile = join(hunterDir, 'maintenance', 'checked.txt') try: checkedStream = open(checkedFile, "r+") checked = checkedStream.readlines() From ac61f83550672e517ef0383d2a0d9d2488d04c13 Mon Sep 17 00:00:00 2001 From: drodin Date: Mon, 13 Jun 2022 16:36:07 +0700 Subject: [PATCH 19/19] ability for check-urls.py to check single project --- maintenance/check-urls.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/maintenance/check-urls.py b/maintenance/check-urls.py index aedc99b873..1b201ee781 100644 --- a/maintenance/check-urls.py +++ b/maintenance/check-urls.py @@ -1,6 +1,7 @@ from os.path import dirname, abspath, join from glob import glob import re +import sys import pycurl def getResponseStausCode(url): @@ -20,7 +21,11 @@ def getResponseStausCode(url): hunterDir = dirname(dirname(abspath(__file__))) projectsDir = join(hunterDir, 'cmake', 'projects') -projectsFiles = join(projectsDir, '**', '*.cmake') +project = '' +if len(sys.argv) > 1: + project = sys.argv[1] + +projectsFiles = join(projectsDir, project, '**', '*.cmake') checkedFile = join(hunterDir, 'maintenance', 'checked.txt') try: