check and fix packages urls (#575)

* check-urls.py maintenance script * Removed non-existent package 'EnumGroup' * Removed missing version '1.1.4-hunter-1' from 'doctest' * Removed missing version '1.3.2-cmake3' from 'libogg' * Removed missing versions '0.11-p1', '0.11-hunter' from 'RapidJSON' * Removed duplicate version '22_r01' from 'Android-Google-APIs' * Removed duplicate version '1.0.2o' from 'OpenSSL' * Removed missing version '5.6.0-alpha' from 'Qt' * Fixed urls in package 'Qt' * Fixed urls in package 'libpcre' * Fixed urls in package 'crc32c' * Fixed urls in package 'tomcrypt' * Changed ftp url to http one in 'x264' * Changed variable urls to direct ones in 'ceres-solver' * Changed variable urls to direct ones in 'Boost' * Moved comment from URL in 'pip_decorator' * add output of check-urls.py to .gitignore * add ability for check-urls.py to check single project
cpp-pm · Aug 18, 2022 · d4f3a43 · d4f3a43
1 parent 67874f3
commit d4f3a43
Show file tree

Hide file tree

Showing 20 changed files with 85 additions and 186 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,7 @@ _Base
 CMakeSettings.json
 
 # Default vscode python virtual env folder
-env
+env
+
+# Maintenance output
+maintenance/checked.txt
diff --git 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/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

diff --git 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
 )

diff --git a/cmake/projects/EnumGroup/hunter.cmake b/cmake/projects/EnumGroup/hunter.cmake
diff --git 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

diff --git 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
 )
@@ -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
@@ -233,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
 )
@@ -244,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
 )
@@ -255,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
 )

diff --git 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(

diff --git a/cmake/projects/ceres-solver/hunter.cmake b/cmake/projects/ceres-solver/hunter.cmake
@@ -10,18 +10,14 @@ 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
     ceres-solver
     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
 )

diff --git 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(

diff --git 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

diff --git 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(