Nuitka-winsvc 2.3.11__cp311-cp311-win_amd64.whl → 2.4.1__cp311-cp311-win_amd64.whl

nuitka/utils/ReExecute.py

@@ -12,8 +12,6 @@ spell-checker: ignore execl, Popen
 import os
 import sys
 
-from nuitka.Options import shallExecuteImmediately
-
 
 def callExecProcess(args, uac):
     """Do exec in a portable way preserving exit code.
@@ -57,6 +55,10 @@ def callExecProcess(args, uac):
         os.execl(*args)
 
 
+def setLaunchingNuitkaProcessEnvironmentValue(environment_variable_name, value):
+    os.environ[environment_variable_name] = str(os.getpid()) + ":" + value
+
+
 def reExecuteNuitka(pgo_filename):
     # Execute with full path as the process name, so it can find itself and its
     # libraries.
@@ -75,18 +77,18 @@ def reExecuteNuitka(pgo_filename):
 
     args += ["-S", our_filename]
 
-    os.environ["NUITKA_BINARY_NAME"] = sys.modules["__main__"].__file__
-    os.environ["NUITKA_PACKAGE_HOME"] = os.path.dirname(
-        os.path.abspath(sys.modules["nuitka"].__path__[0])
+    setLaunchingNuitkaProcessEnvironmentValue(
+        "NUITKA_BINARY_NAME", sys.modules["__main__"].__file__
+    )
+    setLaunchingNuitkaProcessEnvironmentValue(
+        "NUITKA_PACKAGE_HOME",
+        os.path.dirname(os.path.abspath(sys.modules["nuitka"].__path__[0])),
     )
 
     if pgo_filename is not None:
         args.append("--pgo-python-input=%s" % pgo_filename)
     else:
-        os.environ["NUITKA_SYS_PREFIX"] = sys.prefix
-
-    if shallExecuteImmediately():
-        args.append("--run")
+        setLaunchingNuitkaProcessEnvironmentValue("NUITKA_SYS_PREFIX", sys.prefix)
 
     # Same arguments as before.
     args += sys.argv[1:]
@@ -103,7 +105,7 @@ def reExecuteNuitka(pgo_filename):
         if site_filename.endswith(".pyc"):
             site_filename = site_filename[:-4] + ".py"
 
-        os.environ["NUITKA_SITE_FILENAME"] = site_filename
+        setLaunchingNuitkaProcessEnvironmentValue("NUITKA_SITE_FILENAME", site_filename)
 
         # Note: As side effect, this might modify the "sys.path" too.
         os.environ["NUITKA_PTH_IMPORTED"] = repr(detectPthImportedPackages())
@@ -112,21 +114,23 @@ def reExecuteNuitka(pgo_filename):
         if user_site is not None:
             os.environ["NUITKA_USER_SITE"] = repr(user_site)
 
-    os.environ["NUITKA_PYTHONPATH"] = repr(sys.path)
+    setLaunchingNuitkaProcessEnvironmentValue("NUITKA_PYTHONPATH", repr(sys.path))
 
     # In some environments, initial "sys.path" does not contain enough to load
     # "ast" module, which however we use to decode "NUITKA_PYTHONPATH", this
     # helps solve the chicken and egg problem.
     import ast
 
-    os.environ["NUITKA_PYTHONPATH_AST"] = os.path.dirname(ast.__file__)
+    setLaunchingNuitkaProcessEnvironmentValue(
+        "NUITKA_PYTHONPATH_AST", os.path.dirname(ast.__file__)
+    )
 
     if sys.flags.no_site:
         os.environ["NUITKA_NOSITE_FLAG"] = "1"
 
     os.environ["PYTHONHASHSEED"] = "0"
 
-    os.environ["NUITKA_REEXECUTION"] = "1"
+    setLaunchingNuitkaProcessEnvironmentValue("NUITKA_RE_EXECUTION", "1")
 
     # Does not return:
     callExecProcess(args, uac=False)

nuitka/utils/SharedLibraries.py

@@ -287,6 +287,23 @@ def getOtoolDependencyOutput(filename, package_specific_dirs):
         return _getOToolCommandOutput("-L", filename)
 
 
+def parseOtoolListingOutput(output):
+    paths = OrderedSet()
+
+    for line in output.split(b"\n")[1:]:
+        if str is not bytes:
+            line = line.decode("utf8")
+
+        if not line:
+            continue
+
+        filename = line.split(" (", 1)[0].strip()
+
+        paths.add(filename)
+
+    return paths
+
+
 def _getDLLVersionMacOS(filename):
     output = _getOToolCommandOutput("-D", filename).splitlines()
 
@@ -469,24 +486,31 @@ def callInstallNameTool(filename, mapping, id_path, rpath):
         This is obviously macOS specific.
     """
     command = ["install_name_tool"]
+
+    needs_call = False
     for old_path, new_path in mapping:
-        command += ("-change", old_path, new_path)
+        if old_path != new_path:
+            command += ("-change", old_path, new_path)
+            needs_call = True
 
     if rpath is not None:
         command += ("-add_rpath", os.path.join(rpath, "."))
+        needs_call = True
 
     if id_path is not None:
         command += ("-id", id_path)
+        needs_call = True
 
     command.append(filename)
 
-    with withMadeWritableFileMode(filename):
-        executeToolChecked(
-            logger=postprocessing_logger,
-            command=command,
-            absence_message=_install_name_tool_usage,
-            stderr_filter=_filterInstallNameToolErrorOutput,
-        )
+    if needs_call:
+        with withMadeWritableFileMode(filename):
+            executeToolChecked(
+                logger=postprocessing_logger,
+                command=command,
+                absence_message=_install_name_tool_usage,
+                stderr_filter=_filterInstallNameToolErrorOutput,
+            )
 
 
 def getPyWin32Dir():

nuitka/utils/Signing.py

@@ -48,6 +48,7 @@ def detectMacIdentity():
     if str is not bytes:
         output = output.decode("utf8")
 
+    signing_name = None
     result = None
 
     for line in output.splitlines():
@@ -96,7 +97,8 @@ def addMacOSCodeSignature(filenames):
         identity = detectMacIdentity()
 
     command = [
-        "codesign",
+        # Need to avoid Anaconda codesign.
+        "/usr/bin/codesign",
         "-s",
         identity,
         "--force",

nuitka/utils/StaticLibraries.py

@@ -12,6 +12,7 @@ from nuitka.PythonFlavors import (
     isAnacondaPython,
     isDebianPackagePython,
     isNuitkaPython,
+    isRyePython,
 )
 from nuitka.PythonVersions import (
     getPythonABI,
@@ -22,7 +23,12 @@ from nuitka.PythonVersions import (
 from nuitka.Tracing import general
 
 from .FileOperations import getFileContentByLine, getFileList
-from .Utils import getLinuxDistribution, isDebianBasedLinux, isWin32Windows
+from .Utils import (
+    getLinuxDistribution,
+    isDebianBasedLinux,
+    isMacOS,
+    isWin32Windows,
+)
 
 _ldconf_paths = None
 
@@ -38,14 +44,15 @@ def locateStaticLinkLibrary(dll_name):
 
 def _locateStaticLinkLibrary(dll_name):
     # singleton, pylint: disable=global-statement
+
     #
     global _ldconf_paths
 
     if _ldconf_paths is None:
         _ldconf_paths = OrderedSet()
 
-        for conf_filemame in getFileList("/etc/ld.so.conf.d", only_suffixes=".conf"):
-            for conf_line in getFileContentByLine(conf_filemame):
+        for conf_filename in getFileList("/etc/ld.so.conf.d", only_suffixes=".conf"):
+            for conf_line in getFileContentByLine(conf_filename):
                 conf_line = conf_line.split("#", 1)[0]
                 conf_line = conf_line.strip()
 
@@ -142,53 +149,56 @@ def _getSystemStaticLibPythonPath():
         for candidate in candidates:
             if os.path.exists(candidate):
                 return candidate
-    else:
-        candidate = os.path.join(
-            sys_prefix, "lib", "libpython" + python_abi_version + ".a"
-        )
 
-        if os.path.exists(candidate):
-            return candidate
+        return None
 
-        # For Python2 this works. TODO: Figure out Debian and Python3.
-        if (
-            python_version < 0x300
-            and isDebianPackagePython()
-            and isDebianSuitableForStaticLinking()
-        ):
-            candidate = locateStaticLinkLibrary("python" + python_abi_version)
-        else:
-            candidate = None
+    if isMacOS() and isRyePython():
+        return None
 
-        if candidate is not None and os.path.exists(candidate):
-            # Also check libz, can be missing
-            if not locateStaticLinkLibrary("z"):
-                general.warning(
-                    "Error, missing 'libz-dev' installation needed for static lib-python."
-                )
+    candidate = os.path.join(sys_prefix, "lib", "libpython" + python_abi_version + ".a")
 
-            return candidate
+    if os.path.exists(candidate):
+        return candidate
 
-        # This is not necessarily only for Python3 on Debian, but maybe others as well,
-        # but that's what's been tested.
-        if python_version >= 0x300 and isDebianPackagePython() and isDebianBasedLinux():
-            candidate = os.path.join(
-                _getSysConfigVarLIBPL(),
-                "libpython" + python_abi_version + "-pic.a",
+    # For Python2 this works. TODO: Figure out Debian and Python3.
+    if (
+        python_version < 0x300
+        and isDebianPackagePython()
+        and isDebianSuitableForStaticLinking()
+    ):
+        candidate = locateStaticLinkLibrary("python" + python_abi_version)
+    else:
+        candidate = None
+
+    if candidate is not None and os.path.exists(candidate):
+        # Also check libz, can be missing
+        if not locateStaticLinkLibrary("z"):
+            general.warning(
+                "Error, missing 'libz-dev' installation needed for static lib-python."
             )
 
-            if os.path.exists(candidate):
-                return candidate
+        return candidate
 
-        libpl = _getSysConfigVarLIBPL()
-        if libpl is not None:
-            candidate = os.path.join(
-                libpl,
-                "libpython" + python_abi_version + ".a",
-            )
+    # This is not necessarily only for Python3 on Debian, but maybe others as well,
+    # but that's what's been tested. spell-checker: ignore libpl
+    if python_version >= 0x300 and isDebianPackagePython() and isDebianBasedLinux():
+        candidate = os.path.join(
+            _getSysConfigVarLIBPL(),
+            "libpython" + python_abi_version + "-pic.a",
+        )
 
-            if os.path.exists(candidate):
-                return candidate
+        if os.path.exists(candidate):
+            return candidate
+
+    libpl = _getSysConfigVarLIBPL()
+    if libpl is not None:
+        candidate = os.path.join(
+            libpl,
+            "libpython" + python_abi_version + ".a",
+        )
+
+        if os.path.exists(candidate):
+            return candidate
 
     return None
 

nuitka/utils/Timing.py

@@ -83,7 +83,7 @@ class TimerReport(object):
         )
 
         if exception_type is None and above_threshold and self.decider():
-            self.logger.info(self.message % self.timer.getDelta())
+            self.logger.info(self.message % self.timer.getDelta(), keep_format=True)
 
 
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and

nuitka/utils/Utils.py

@@ -376,7 +376,13 @@ def withNoWarning():
 
 
 def decoratorRetries(
-    logger, purpose, consequence, attempts=5, sleep_time=1, exception_type=OSError
+    logger,
+    purpose,
+    consequence,
+    extra_recommendation=None,
+    attempts=5,
+    sleep_time=1,
+    exception_type=OSError,
 ):
     """Make retries for errors on Windows.
 
@@ -384,6 +390,10 @@ def decoratorRetries(
     a virus checker warning.
     """
 
+    recommendation = "Disable Anti-Virus, e.g. Windows Defender for build folders."
+    if extra_recommendation is not None:
+        recommendation = "%s. %s" % (extra_recommendation, recommendation)
+
     def inner(func):
         if os.name != "nt":
             return func
@@ -398,8 +408,9 @@ def decoratorRetries(
                         logger.warning(
                             """\
 Failed to %s in attempt %d due to %s.
-Disable Anti-Virus, e.g. Windows Defender for build folders. Retrying after a second of delay."""
-                            % (purpose, attempt, str(e))
+%s
+Retrying after a second of delay."""
+                            % (purpose, attempt, str(e), recommendation)
                         )
 
                     else:
@@ -407,15 +418,17 @@ Disable Anti-Virus, e.g. Windows Defender for build folders. Retrying after a se
                             logger.warning(
                                 """\
 Failed to %s in attempt %d.
-Disable Anti-Virus, e.g. Windows Defender for build folders. Retrying after a second of delay."""
-                                % (purpose, attempt)
+%s
+Retrying after a second of delay."""
+                                % (purpose, attempt, recommendation)
                             )
                         else:
                             logger.warning(
                                 """\
 Failed to %s in attempt %d with error code %d.
-Disable Anti-Virus, e.g. Windows Defender for build folders. Retrying after a second of delay."""
-                                % (purpose, attempt, e.errno)
+%s
+Retrying after a second of delay."""
+                                % (purpose, attempt, e.errno, recommendation)
                             )
 
                     time.sleep(sleep_time)
@@ -443,6 +456,15 @@ def raiseWindowsError(message):
     )
 
 
+def getLaunchingNuitkaProcessEnvironmentValue(environment_variable_name):
+    # Hack, we need this to bootstrap and it's actually living in __main__
+    # module of nuitka package and renamed to where we can get at easily for
+    # other uses. pylint: disable=no-name-in-module,redefined-outer-name
+    from nuitka import getLaunchingNuitkaProcessEnvironmentValue
+
+    return getLaunchingNuitkaProcessEnvironmentValue(environment_variable_name)
+
+
 #     Part of "Nuitka", an optimizing Python compiler that is compatible and
 #     integrates with CPython, but also works on its own.
 #