cmake: put URL in json

Author: scivision

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: ci
 
 env:
-  cmake_version: '3.21.3'
+  cmake_version: '3.22.1'
   CMAKE_BUILD_TYPE: Release
   HOMEBREW_NO_INSTALL_CLEANUP: 1
 

MANIFEST.in

@@ -1 +1 @@
-include src/cmakeutils/CMAKE_VERSION src/cmakeutils/NINJA_VERSION VERSION
+include src/cmakeutils/versions.json

build_cmake.cmake

@@ -34,7 +34,8 @@ if (L LESS 5)  # 3.x or 3.xx
   string(JSON version GET ${_j} cmake ${version})
 endif()
 
-set(host https://github.com/Kitware/CMake/releases/download/v${version}/)
+string(JSON host GET ${_j} cmake source)
+set(host ${host}v${version}/)
 set(stem cmake-${version})
 set(name ${stem}.tar.gz)
 

build_ninja.cmake

@@ -15,10 +15,10 @@ set(CMAKE_TLS_VERIFY true)
 
 if(NOT version)
   file(READ ${CMAKE_CURRENT_LIST_DIR}/src/cmakeutils/versions.json _j)
-  string(JSON version GET ${_j} ninja)
+  string(JSON version GET ${_j} ninja latest)
 endif()
 
-set(host https://github.com/ninja-build/ninja/archive/)
+string(JSON host GET ${_j} ninja source)
 set(name v${version}.zip)
 
 function(checkup ninja)

install_cmake.cmake

@@ -32,7 +32,8 @@ if (L LESS 5)  # 3.x or 3.xx
   string(JSON version GET ${_j} cmake ${version})
 endif()
 
-set(host https://github.com/Kitware/CMake/releases/download/v${version}/)
+string(JSON host GET ${_j} cmake binary)
+set(host ${host}v${version}/)
 
 
 function(checkup exe)

install_ninja.cmake

@@ -15,11 +15,11 @@ set(CMAKE_TLS_VERIFY true)
 
 if(NOT version)
   file(READ ${CMAKE_CURRENT_LIST_DIR}/src/cmakeutils/versions.json _j)
-  string(JSON version GET ${_j} ninja)
+  string(JSON version GET ${_j} ninja latest)
 endif()
 
-set(host https://github.com/ninja-build/ninja/releases/download/v${version}/)
-
+string(JSON host GET ${_j} ninja binary)
+set(host ${host}v${version}/)
 
 function(checkup ninja)
 

pyproject.toml

@@ -2,7 +2,4 @@
 requires = ["setuptools", "wheel"]
 
 [tool.black]
-line-length = 132
-
-[tool.pytest.ini_options]
-addopts = "-ra -v"
+line-length = 100

src/cmakeutils/cmake_compile.py

@@ -34,14 +34,14 @@
 from pathlib import Path
 
 
-from .cmake_setup import default_version, file_checksum
+from .cmake_setup import latest_version, file_checksum
 
 url_stem = "https://github.com/Kitware/CMake/releases/download"
 
 
 def main():
     p = argparse.ArgumentParser()
-    p.add_argument("version", nargs="?", default=default_version())
+    p.add_argument("version", nargs="?", default=latest_version())
     p.add_argument("-prefix", help="where to install CMake")
     p.add_argument("-workdir", help="use existing source code path")
     p = p.parse_args()
@@ -69,7 +69,9 @@ def main():
         print("\nreopen a new terminal to use CMake", p.version)
     else:
         print(f"CMake built under {src_root}")
-        print("To install CMake, rerun using cmake_compile -prefix option set to desired install path.")
+        print(
+            "To install CMake, rerun using cmake_compile -prefix option set to desired install path."
+        )
 
 
 def job_count() -> int:

src/cmakeutils/cmake_setup.py

@@ -21,16 +21,22 @@
 import zipfile
 import tempfile
 
-HEAD = "https://github.com/Kitware/CMake/releases/download/"
 PLATFORMS = ("amd64", "x86_64", "x64", "i86pc")
 
 
-def default_version() -> str:
-    jd = json.load(importlib.resources.open_text("cmakeutils", "versions.json"))["cmake"]
-    return jd[jd["latest"]]
+def latest_version() -> str:
+    cjd = json.load(importlib.resources.open_text("cmakeutils", "versions.json"))["cmake"]
+    return cjd[cjd["latest"]]
+
+
+def get_host() -> str:
+    return json.load(importlib.resources.open_text("cmakeutils", "versions.json"))["cmake"][
+        "binary"
+    ]
 
 
 def url_retrieve(url: str, outfile: Path):
+    print("downloading", url)
     outfile = Path(outfile).expanduser().resolve()
     if outfile.is_dir():
         raise ValueError("Please specify full filepath, including filename")
@@ -114,24 +120,26 @@ def cmake_files(cmake_version: str, odir: Path) -> tuple[Path, str]:
 
     ofn = f"cmake-{cmake_version}-{tail}"
 
-    return odir / ofn, HEAD + f"v{cmake_version}/{ofn}"
+    return odir / ofn, f"{cmake_version}/{ofn}"
 
 
 def download_cmake(outdir: Path, get_version: str) -> Path:
 
+    host = get_host()
+
     outdir = Path(outdir).expanduser()
     outdir.mkdir(parents=True, exist_ok=True)
-    outfile, url = cmake_files(get_version, outdir)
+    outfile, tail = cmake_files(get_version, outdir)
     # %% checksum
     hashstem = f"cmake-{get_version}-SHA-256.txt"
-    hashurl = HEAD + f"v{get_version}/{hashstem}"
+    hashurl = f"{host}v{get_version}/{hashstem}"
     hashfile = outdir / hashstem
 
     if not hashfile.is_file() or hashfile.stat().st_size == 0:
         url_retrieve(hashurl, hashfile)
 
     if not outfile.is_file() or outfile.stat().st_size < 1e6:
-        url_retrieve(url, outfile)
+        url_retrieve(f"{host}v{tail}", outfile)
 
     if not file_checksum(outfile, hashfile, "sha256"):
         raise ValueError(f"{outfile} SHA256 checksum did not match {hashfile}")
@@ -141,8 +149,12 @@ def download_cmake(outdir: Path, get_version: str) -> Path:
 
 def main():
     p = argparse.ArgumentParser()
-    p.add_argument("version", help="request version (default latest)", nargs="?", default=default_version())
-    p.add_argument("-o", "--outdir", help="download archive directory", default=tempfile.gettempdir())
+    p.add_argument(
+        "version", help="request version (default latest)", nargs="?", default=latest_version()
+    )
+    p.add_argument(
+        "-o", "--outdir", help="download archive directory", default=tempfile.gettempdir()
+    )
     p.add_argument("--prefix", help="Path prefix to install CMake under", default="~")
     P = p.parse_args()
 

src/cmakeutils/graph.py

@@ -13,7 +13,9 @@
 
 def main():
     p = argparse.ArgumentParser(description="convert .dot graph to SVG or PNG")
-    p.add_argument("path", help="Path to CMake gfx/ directory from cmake -B build --graphviz=gfx/block.dot")
+    p.add_argument(
+        "path", help="Path to CMake gfx/ directory from cmake -B build --graphviz=gfx/block.dot"
+    )
     p.add_argument("format", help="output format", choices=["svg", "png"], default="svg", nargs="?")
     P = p.parse_args()