Use correct versions for windows and refactor the download script

Author: mxamin

.github/workflows/cache_libs.yml

@@ -28,23 +28,23 @@ on:
         required: false
         type: string
       WIN_LIBICONV_VERSION:
-        default: "1.18"
+        default: "1.18-1"
         required: false
         type: string
       WIN_LIBXML2_VERSION:
-        default: "2.14.6"
+        default: "2.11.9-3"
         required: false
         type: string
       WIN_LIBXSLT_VERSION:
-        default: "1.1.43"
+        default: "1.1.39"
         required: false
         type: string
       WIN_OPENSSL_VERSION:
-        default: "3.6.0"
+        default: "3.0.16.pl1"
         required: false
         type: string
       WIN_XMLSEC1_VERSION:
-        default: "1.3.9"
+        default: "1.3.7"
         required: false
         type: string
       WIN_ZLIB_VERSION:
@@ -122,7 +122,7 @@ jobs:
     - name: Download latest libraries
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: python buildlibxmlsec.py --download-only
+      run: python build_libs_xmlsec.py --download-only
 
     - name: Check Windows library versions
       if: ${{ contains(matrix.os, 'windows-') }}

build_libs_xmlsec.py

@@ -0,0 +1,55 @@
+import argparse
+import os
+import sys
+from pathlib import Path
+
+from build_support.lib_xmlsec_dependency_builder import LibXmlsecDependencyBuilder
+
+
+def _console_info(message):
+    print(message)
+
+
+def main(argv=None):
+    parser = argparse.ArgumentParser(description='Download and build static dependency libraries for python-xmlsec.')
+    parser.add_argument(
+        '--platform',
+        default=sys.platform,
+        help='Target platform (default: current interpreter platform).',
+    )
+    parser.add_argument(
+        '--plat-name',
+        default=os.environ.get('PYXMLSEC_PLAT_NAME'),
+        help='Target platform tag for cross-compiling (for example macosx-11.0-arm64).',
+    )
+    parser.add_argument(
+        '--libs-dir',
+        default=os.environ.get('PYXMLSEC_LIBS_DIR', 'libs'),
+        help='Directory where source/binary archives are stored.',
+    )
+    parser.add_argument(
+        '--buildroot',
+        default=Path('build', 'tmp'),
+        type=Path,
+        help='Build root for extracted/build artifacts.',
+    )
+    parser.add_argument(
+        '--download-only',
+        action='store_true',
+        help='Only download dependency archives; do not extract/build.',
+    )
+
+    args = parser.parse_args(argv)
+    builder = LibXmlsecDependencyBuilder(
+        platform_name=args.platform,
+        info=_console_info,
+        libs_dir=Path(args.libs_dir),
+        buildroot=args.buildroot,
+        plat_name=args.plat_name,
+    )
+    builder.prepare(download_only=args.download_only)
+    return 0
+
+
+if __name__ == '__main__':
+    raise SystemExit(main())

build_support/buildlibxmlsec.py …support/lib_xmlsec_dependency_builder.pybuild_support/buildlibxmlsec.py renamed to build_support/lib_xmlsec_dependency_builder.py build_support/buildlibxmlsec.py renamed to build_support/lib_xmlsec_dependency_builder.py

@@ -1,4 +1,3 @@
-import argparse
 import multiprocessing
 import os
 import platform
@@ -8,7 +7,6 @@
 import zipfile
 from dataclasses import dataclass
 from distutils.errors import DistutilsError
-from pathlib import Path
 from urllib.parse import urljoin
 from urllib.request import urlcleanup
 
@@ -34,7 +32,7 @@ def triplet(self) -> str:
         return f'{self.host}-{self.arch}-{self.compiler}'
 
 
-class LibXmlSecDependencyBuilder:
+class LibXmlsecDependencyBuilder:
     WINDOWS_LIBS_DOWNLOAD_RELEASE_URL = 'https://github.com/mxamin/python-xmlsec-win-binaries/releases/download/2025.07.10/'
     LIB_VERSION_ENV_VARS = {
         'openssl_version': 'PYXMLSEC_OPENSSL_VERSION',
@@ -362,7 +360,7 @@ def _build_libxslt(self, env, prefix_arg, host_arg):
         subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}'], cwd=str(libxslt_dir), env=env)
         subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}', 'install'], cwd=str(libxslt_dir), env=env)
 
-    def _build_xmlsec1(self, env, prefix_arg, host_arg):
+def _build_xmlsec1(self, env, prefix_arg, host_arg):
         self.info('Building xmlsec1')
         xmlsec1_dir = next(self.build_libs_dir.glob('xmlsec1-*'))
         subprocess.check_call(
@@ -398,50 +396,4 @@ def _build_xmlsec1(self, env, prefix_arg, host_arg):
         subprocess.check_call(['make', f'-j{multiprocessing.cpu_count() + 1}', 'install'], cwd=str(xmlsec1_dir), env=env)
 
 
-def _console_info(message):
-    print(message)
-
-
-def main(argv=None):
-    parser = argparse.ArgumentParser(description='Download and build static dependency libraries for python-xmlsec.')
-    parser.add_argument(
-        '--platform',
-        default=sys.platform,
-        help='Target platform (default: current interpreter platform).',
-    )
-    parser.add_argument(
-        '--plat-name',
-        default=os.environ.get('PYXMLSEC_PLAT_NAME'),
-        help='Target platform tag for cross-compiling (for example macosx-11.0-arm64).',
-    )
-    parser.add_argument(
-        '--libs-dir',
-        default=os.environ.get('PYXMLSEC_LIBS_DIR', 'libs'),
-        help='Directory where source/binary archives are stored.',
-    )
-    parser.add_argument(
-        '--buildroot',
-        default=Path('build', 'tmp'),
-        type=Path,
-        help='Build root for extracted/build artifacts.',
-    )
-    parser.add_argument(
-        '--download-only',
-        action='store_true',
-        help='Only download dependency archives; do not extract/build.',
-    )
-
-    args = parser.parse_args(argv)
-    builder = LibXmlSecDependencyBuilder(
-        platform_name=args.platform,
-        info=_console_info,
-        libs_dir=Path(args.libs_dir),
-        buildroot=args.buildroot,
-        plat_name=args.plat_name,
-    )
-    builder.prepare(download_only=args.download_only)
-    return 0
-
-
-if __name__ == '__main__':
-    raise SystemExit(main())
+__all__ = ('CrossCompileInfo', 'LibXmlsecDependencyBuilder')

build_support/static_build.py

@@ -1,7 +1,7 @@
 import sys
 from distutils.errors import DistutilsError
 
-from .buildlibxmlsec import CrossCompileInfo, LibXmlSecDependencyBuilder
+from .lib_xmlsec_dependency_builder import CrossCompileInfo, LibXmlsecDependencyBuilder
 
 
 class StaticBuildHelper:
@@ -12,7 +12,7 @@ def __init__(self, builder):
 
     def prepare(self, platform_name):
         self.info(f'starting static build on {sys.platform}')
-        deps_builder = LibXmlSecDependencyBuilder(
+        deps_builder = LibXmlsecDependencyBuilder(
             platform_name=platform_name,
             info=self.info,
             plat_name=getattr(self.builder, 'plat_name', None),