Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.4.8__cp311-cp311-win_amd64.whl

nuitka/utils/Download.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Download utilities and extract locally when allowed.
 
 Mostly used on Windows, for dependency walker and ccache binaries.
@@ -24,6 +10,7 @@ import os
 
 from nuitka import Tracing
 from nuitka.__past__ import urlretrieve
+from nuitka.Progress import withNuitkaDownloadProgressBar
 
 from .AppDirs import getCacheDir
 from .FileOperations import (
@@ -34,20 +21,38 @@ from .FileOperations import (
 )
 
 
-def getDownload(url, download_path):
-    try:
-        urlretrieve(url, download_path)
-    except Exception:  # Any kind of error, pylint: disable=broad-except
-        urlretrieve(url.replace("https://", "http://"), download_path)
+def getDownload(name, url, download_path):
+    # requests api, spell-checker: ignore reporthook
+
+    with withNuitkaDownloadProgressBar(desc="Download %s" % name) as reporthook:
+        try:
+            try:
+                urlretrieve(url, download_path, reporthook=reporthook)
+            except Exception:  # Any kind of error, pylint: disable=broad-except
+                urlretrieve(
+                    url.replace("https://", "http://"),
+                    download_path,
+                    reporthook=reporthook,
+                )
+        except KeyboardInterrupt:
+            deleteFile(download_path, must_exist=False)
+
+            raise
+
+
+def getDownloadCacheName():
+    return "downloads"
 
 
 def getDownloadCacheDir():
-    return os.path.join(getCacheDir(), "downloads")
+    return getCacheDir(getDownloadCacheName())
 
 
 def getCachedDownload(
+    name,
     url,
     binary,
+    unzip,
     flatten,
     is_arch_specific,
     specificity,
@@ -99,75 +104,86 @@ Fully automatic, cached. Proceed and download"""
             Tracing.general.info("Downloading '%s'." % url)
 
             try:
-                getDownload(url=url, download_path=download_path)
+                getDownload(
+                    name=name,
+                    url=url,
+                    download_path=download_path,
+                )
             except Exception as e:  # Any kind of error, pylint: disable=broad-except
                 Tracing.general.sysexit(
                     "Failed to download '%s' due to '%s'. Contents should manually be copied to '%s'."
                     % (url, e, download_path)
                 )
 
-    if not os.path.isfile(exe_path) and os.path.isfile(download_path):
-        Tracing.general.info("Extracting to '%s'" % exe_path)
+    if unzip:
+        if not os.path.isfile(exe_path) and os.path.isfile(download_path):
+            Tracing.general.info("Extracting to '%s'" % exe_path)
 
-        import zipfile
+            import zipfile
 
-        try:
-            # Not all Python versions support using it as a context manager, pylint: disable=consider-using-with
-            zip_file = zipfile.ZipFile(download_path)
+            try:
+                # Not all Python versions support using it as a context manager, pylint: disable=consider-using-with
+                zip_file = zipfile.ZipFile(download_path)
 
-            for zip_info in zip_file.infolist():
-                if zip_info.filename[-1] == "/":
-                    continue
+                for zip_info in zip_file.infolist():
+                    if zip_info.filename[-1] == "/":
+                        continue
 
-                if flatten:
-                    zip_info.filename = os.path.basename(zip_info.filename)
+                    if flatten:
+                        zip_info.filename = os.path.basename(zip_info.filename)
 
-                zip_file.extract(zip_info, nuitka_download_dir)
+                    zip_file.extract(zip_info, nuitka_download_dir)
 
-        except Exception:  # Catching anything zip throws, pylint: disable=broad-except
-            Tracing.general.info("Problem with the downloaded zip file, deleting it.")
+            except (
+                # Catching anything zip throws, pylint: disable=broad-except
+                Exception
+            ):
+                Tracing.general.info(
+                    "Problem with the downloaded zip file, deleting it."
+                )
 
-            deleteFile(binary, must_exist=False)
-            deleteFile(download_path, must_exist=True)
+                deleteFile(binary, must_exist=False)
+                deleteFile(download_path, must_exist=True)
 
-            Tracing.general.sysexit(
-                "Error, need '%s' as extracted from '%s'." % (binary, url)
-            )
+                Tracing.general.sysexit(
+                    "Error, need '%s' as extracted from '%s'." % (binary, url)
+                )
 
-    # Check success here, and make sure it's executable.
-    if os.path.isfile(exe_path):
-        addFileExecutablePermission(exe_path)
-    else:
-        if reject:
-            Tracing.general.sysexit(reject)
+        # Check success here, and make sure it's executable.
+        if os.path.isfile(exe_path):
+            addFileExecutablePermission(exe_path)
+        else:
+            if reject:
+                Tracing.general.sysexit(reject)
 
-        exe_path = None
+            exe_path = None
 
-    return exe_path
+        return exe_path
+    else:
+        return download_path
 
 
 def getCachedDownloadedMinGW64(target_arch, assume_yes_for_downloads):
     # Large URLs, pylint: disable=line-too-long
 
     if target_arch == "x86_64":
-        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/11.3.0-14.0.3-10.0.0-msvcrt-r3/winlibs-x86_64-posix-seh-gcc-11.3.0-llvm-14.0.3-mingw-w64msvcrt-10.0.0-r3.zip"
+        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-16.0.6-11.0.1-msvcrt-r1/winlibs-x86_64-posix-seh-gcc-13.2.0-llvm-16.0.6-mingw-w64msvcrt-11.0.1-r1.zip"
         binary = r"mingw64\bin\gcc.exe"
     elif target_arch == "x86":
-        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/11.3.0-14.0.3-10.0.0-msvcrt-r3/winlibs-i686-posix-dwarf-gcc-11.3.0-llvm-14.0.3-mingw-w64msvcrt-10.0.0-r3.zip"
+        url = "https://github.com/brechtsanders/winlibs_mingw/releases/download/13.2.0-16.0.6-11.0.1-msvcrt-r1/winlibs-i686-posix-dwarf-gcc-13.2.0-llvm-16.0.6-mingw-w64msvcrt-11.0.1-r1.zip"
         binary = r"mingw32\bin\gcc.exe"
     elif target_arch == "arm64":
-        url = None
+        return None
     else:
         assert False, target_arch
 
-    if url is None:
-        return None
-
     gcc_binary = getCachedDownload(
+        name="mingw64",
         url=url,
         is_arch_specific=target_arch,
         specificity=url.rsplit("/", 2)[1],
         binary=binary,
+        unzip=True,
         flatten=False,
         message="Nuitka will use gcc from MinGW64 of winlibs to compile on Windows.",
         reject="Only this specific gcc is supported with Nuitka.",
@@ -175,3 +191,19 @@ def getCachedDownloadedMinGW64(target_arch, assume_yes_for_downloads):
     )
 
     return gcc_binary
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/utils/Execution.py

@@ -1,27 +1,12 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Program execution related stuff.
 
 Basically a layer for os, subprocess, shutil to come together. It can find
 binaries (needed for exec) and run them capturing outputs.
 """
 
-
 import os
 from contextlib import contextmanager
 
@@ -35,7 +20,8 @@ from .Utils import getArchitecture, isWin32OrPosixWindows, isWin32Windows
 # Cache, so we avoid repeated command lookups.
 _executable_command_cache = {}
 
-# We emulate and use APIs of stdlib, spell-checker: ignore popenargs,creationflags,preexec_fn,setsid
+# We emulate and use APIs of stdlib,
+# spell-checker: ignore popenargs,creationflags,preexec_fn,setsid,debuginfod
 
 
 def _getExecutablePath(filename, search_path):
@@ -72,7 +58,7 @@ def getExecutablePath(filename, extra_dir=None):
     """Find an execute in PATH environment."""
 
     # Search in PATH environment.
-    search_path = os.environ.get("PATH", "")
+    search_path = os.getenv("PATH", "")
 
     if extra_dir is not None:
         search_path = extra_dir + os.pathsep + search_path
@@ -121,6 +107,10 @@ def check_output(*popenargs, **kwargs):
     Note: We use same name as in Python stdlib, violating our rules to
     make it more recognizable what this does.
     """
+    logger = kwargs.pop("logger", None)
+
+    if logger is not None:
+        logger.info("Executing command '%s'." % popenargs[0], keep_format=True)
 
     if "stdout" in kwargs:
         raise ValueError("stdout argument not allowed, it will be overridden.")
@@ -155,7 +145,7 @@ def check_call(*popenargs, **kwargs):
     logger = kwargs.pop("logger", None)
 
     if logger is not None:
-        logger.info("Executing command '%s'." % popenargs[0])
+        logger.info("Executing command '%s'." % popenargs[0], keep_format=True)
 
     try:
         subprocess.check_call(*popenargs, **kwargs)
@@ -170,13 +160,17 @@ def callProcess(*popenargs, **kwargs):
     logger = kwargs.pop("logger", None)
 
     if logger is not None:
-        logger.info("Executing command '%s'." % popenargs[0])
+        logger.info("Executing command '%s'." % popenargs[0], keep_format=True)
 
     return subprocess.call(*popenargs, **kwargs)
 
 
 @contextmanager
-def withEnvironmentPathAdded(env_var_name, *paths):
+def withEnvironmentPathAdded(env_var_name, *paths, **kw):
+    # Workaround star args with keyword args on older Python
+    prefix = kw.pop("prefix", False)
+    assert not kw, kw
+
     assert os.path.sep not in env_var_name
 
     paths = [path for path in paths if path]
@@ -188,7 +182,13 @@ def withEnvironmentPathAdded(env_var_name, *paths):
 
         if env_var_name in os.environ:
             old_path = os.environ[env_var_name]
-            os.environ[env_var_name] += os.pathsep + path
+
+            if not old_path:
+                os.environ[env_var_name] = path
+            elif prefix:
+                os.environ[env_var_name] = path + os.pathsep + os.environ[env_var_name]
+            else:
+                os.environ[env_var_name] += os.pathsep + path
         else:
             old_path = None
             os.environ[env_var_name] = path
@@ -229,6 +229,9 @@ def withEnvironmentVarOverridden(env_var_name, value):
 def withEnvironmentVarsOverridden(mapping):
     """Change multiple environment variables and restore them after context."""
 
+    if mapping is None:
+        mapping = {}
+
     old_values = {}
 
     for env_var_name, value in mapping.items():
@@ -287,7 +290,17 @@ def wrapCommandForDebuggerForExec(*args):
             general.sysexit("Error, no 'gdb' or 'lldb' binary found in path.")
 
     if gdb_path is not None:
-        args = (gdb_path, "gdb", "-ex=run", "-ex=where", "-ex=quit", "--args") + args
+        args = (
+            gdb_path,
+            "gdb",
+            "-q",
+            "-ex=set pagination off",
+            "-ex=set debuginfod enabled off",
+            "-ex=run",
+            "-ex=where",
+            "-ex=quit",
+            "--args",
+        ) + args
     else:
         args = (lldb_path, "lldb", "-o", "run", "-o", "bt", "-o", "quit", "--") + args
 
@@ -343,20 +356,21 @@ def executeToolChecked(
     if not isExecutableCommand(tool):
         if optional:
             logger.warning(absence_message)
-            return 0, b"", b""
+            return ""
         else:
             logger.sysexit(absence_message)
 
     # Allow to avoid repeated scans in PATH for the tool.
     command[0] = getExecutablePath(tool)
 
-    process = subprocess.Popen(
-        command,
-        stdin=getNullInput(),
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        shell=False,
-    )
+    with withEnvironmentVarOverridden("LC_ALL", "C"):
+        process = subprocess.Popen(
+            command,
+            stdin=getNullInput(),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            shell=False,
+        )
 
     stdout, stderr = process.communicate()
     result = process.poll()
@@ -419,8 +433,17 @@ def createProcess(
 
 
 def executeProcess(
-    command, env=None, stdin=False, shell=False, external_cwd=False, timeout=None
+    command,
+    env=None,
+    stdin=False,
+    shell=False,
+    external_cwd=False,
+    timeout=None,
+    logger=None,
 ):
+    if logger is not None:
+        logger.info("Executing command '%s'." % " ".join(command), keep_format=True)
+
     process = createProcess(
         command=command, env=env, stdin=stdin, shell=shell, external_cwd=external_cwd
     )
@@ -442,3 +465,19 @@ def executeProcess(
     exit_code = process.wait()
 
     return stdout, stderr, exit_code
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.