Nuitka-winsvc 2.5.6__cp311-cp311-win_amd64.whl → 2.6__cp311-cp311-win_amd64.whl

nuitka/PostProcessing.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Postprocessing tasks for create binaries or modules.
@@ -12,10 +12,12 @@ import sys
 from nuitka import Options, OutputDirectories
 from nuitka.build.DataComposerInterface import getConstantBlobFilename
 from nuitka.ModuleRegistry import getImportedModuleNames
+from nuitka.PythonFlavors import isSelfCompiledPythonUninstalled
 from nuitka.PythonVersions import getTargetPythonDLLPath, python_version
 from nuitka.Tracing import postprocessing_logger
 from nuitka.utils.Execution import wrapCommandForDebuggerForExec
 from nuitka.utils.FileOperations import (
+    addFileExecutablePermission,
     getFileContents,
     getFileSize,
     hasFilenameExtension,
@@ -205,6 +207,76 @@ def _addWindowsIconFromIcons(onefile):
         )
 
 
+def createScriptFileForExecution(result_filename):
+    script_filename = OutputDirectories.getResultRunFilename(onefile=False)
+
+    # TODO: This is probably a prefix kind that should be used more often, e.g.
+    # in reporting.
+    if isSelfCompiledPythonUninstalled():
+        sys_prefix = os.path.dirname(sys.executable)
+    else:
+        sys_prefix = sys.prefix
+
+    python_home = makeFilesystemEncodable(sys_prefix)
+    python_path = os.pathsep.join(makeFilesystemEncodable(e) for e in sys.path)
+
+    debugger_call = (
+        (" ".join(wrapCommandForDebuggerForExec(command=())) + " ")
+        if Options.shallRunInDebugger()
+        else ""
+    )
+    exe_filename = os.path.basename(makeFilesystemEncodable(result_filename))
+
+    if isWin32Windows():
+        script_contents = """
+@echo off
+rem This script was created by Nuitka to execute '%(exe_filename)s' with Python DLL being found.
+set PATH=%(dll_directory)s;%%PATH%%
+set PYTHONHOME=%(python_home)s
+set NUITKA_PYTHONPATH=%(python_path)s
+%(debugger_call)s"%%~dp0%(exe_filename)s" %%*
+""" % {
+            "debugger_call": debugger_call,
+            "dll_directory": makeFilesystemEncodable(
+                os.path.dirname(getTargetPythonDLLPath())
+            ),
+            "python_home": python_home,
+            "python_path": python_path,
+            "exe_filename": exe_filename,
+        }
+    else:
+        # TODO: Setting PYTHONPATH should not be needed, but it fails to work
+        # unlike on Windows for unknown reasons.
+
+        script_contents = """\
+#!/bin/sh
+# Absolute path to this script, e.g. /home/user/bin/foo.sh
+SCRIPT=$(readlink -f "$0")
+# Absolute path this script is in, thus /home/user/bin
+SCRIPT_PATH=$(dirname "$SCRIPT")
+
+PYTHONHOME=%(python_home)s
+export PYTHONHOME
+NUITKA_PYTHONPATH="%(python_path)s"
+export NUITKA_PYTHONPATH
+PYTHONPATH="%(python_path)s"
+export PYTHONPATH
+
+%(debugger_call)s"$SCRIPT_PATH/%(exe_filename)s" $@
+
+""" % {
+            "debugger_call": debugger_call,
+            "python_home": python_home,
+            "python_path": python_path,
+            "exe_filename": exe_filename,
+        }
+
+    putTextFileContents(script_filename, script_contents)
+
+    if not isWin32Windows():
+        addFileExecutablePermission(script_filename)
+
+
 def executePostProcessingResources(manifest, onefile):
     """Adding Windows resources to the binary.
 
@@ -280,7 +352,7 @@ def executePostProcessing():
     """
 
     # Lots of cases to deal with,
-    # pylint: disable=too-many-branches,too-many-locals,too-many-statements
+    # pylint: disable=too-many-branches,too-many-statements
 
     result_filename = OutputDirectories.getResultFullpath(onefile=False)
 
@@ -372,31 +444,8 @@ Error, expected 'libpython dependency not found. Please report the bug."""
         cleanupHeaderForAndroid(result_filename)
 
     # Might have to create a CMD file, potentially with debugger run.
-    if Options.shallCreateCmdFileForExecution():
-        cmd_filename = OutputDirectories.getResultRunFilename(onefile=False)
-
-        cmd_contents = """
-@echo off
-rem This script was created by Nuitka to execute '%(exe_filename)s' with Python DLL being found.
-set PATH=%(dll_directory)s;%%PATH%%
-set PYTHONHOME=%(python_home)s
-set NUITKA_PYTHONPATH=%(python_path)s
-%(debugger_call)s"%%~dp0%(exe_filename)s" %%*
-""" % {
-            "debugger_call": (
-                (" ".join(wrapCommandForDebuggerForExec()) + " ")
-                if Options.shallRunInDebugger()
-                else ""
-            ),
-            "dll_directory": makeFilesystemEncodable(
-                os.path.dirname(getTargetPythonDLLPath())
-            ),
-            "python_home": makeFilesystemEncodable(sys.prefix),
-            "python_path": ";".join(makeFilesystemEncodable(e) for e in sys.path),
-            "exe_filename": os.path.basename(makeFilesystemEncodable(result_filename)),
-        }
-
-        putTextFileContents(cmd_filename, cmd_contents)
+    if Options.shallCreateScriptFileForExecution():
+        createScriptFileForExecution(result_filename=result_filename)
 
     # Create a ".pyi" file for created modules
     if Options.shallMakeModule() and Options.shallCreatePyiFile():

nuitka/Progress.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Progress bars in Nuitka.

nuitka/PythonFlavors.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Python flavors specifics.
@@ -99,6 +99,9 @@ def isHomebrewPython():
     if not isMacOS():
         return False
 
+    if isGithubActionsPython():
+        return True
+
     candidate = os.path.join(
         getSystemPrefixPath(), "lib", "python" + python_version_str, "sitecustomize.py"
     )
@@ -177,6 +180,9 @@ def isUninstalledPython():
     if isDebianPackagePython():
         return False
 
+    if isSelfCompiledPythonUninstalled():
+        return True
+
     if isStaticallyLinkedPython():
         return False
 
@@ -364,6 +370,8 @@ def getPythonFlavorName():
         return "Arch Python"
     elif isAlpinePackagePython():
         return "Alpine Python"
+    elif isGithubActionsPython():
+        return "GitHub Actions Python"
     elif isHomebrewPython():
         return "Homebrew Python"
     elif isRyePython():
@@ -382,8 +390,6 @@ def getPythonFlavorName():
         return "CPython Official"
     elif isSelfCompiledPythonUninstalled():
         return "Self Compiled Uninstalled"
-    elif isGithubActionsPython():
-        return "GitHub Actions Python"
     elif isManyLinuxPython():
         return "Manylinux Python"
     else:

nuitka/PythonOperators.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Python operator tables

nuitka/PythonVersions.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Python version specifics.
@@ -196,14 +196,18 @@ def needsDuplicateArgumentColOffset():
         return True
 
 
+def getRunningPythonDllHandle():
+    # We trust ctypes internals here, pylint: disable=protected-access
+    # spell-checker: ignore pythonapi
+    return ctypes.pythonapi._handle
+
+
 def getRunningPythonDLLPath():
     from nuitka.utils.SharedLibraries import (
         getWindowsRunningProcessModuleFilename,
     )
 
-    # We trust ctypes internals here, pylint: disable=protected-access
-    # spell-checker: ignore pythonapi
-    return getWindowsRunningProcessModuleFilename(ctypes.pythonapi._handle)
+    return getWindowsRunningProcessModuleFilename(getRunningPythonDllHandle())
 
 
 def getTargetPythonDLLPath():

nuitka/Serialization.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Write and read constants data files and provide identifiers.

nuitka/SourceCodeReferences.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Source code reference record.

nuitka/Tracing.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Outputs to the user.
@@ -491,6 +491,7 @@ tools_logger = OurLogger("Nuitka-Tools")
 wheel_logger = OurLogger("Nuitka-Wheel", base_style="blue")
 cache_logger = OurLogger("Nuitka-Cache")
 reports_logger = OurLogger("Nuitka-Reports")
+offsets_logger = OurLogger("Nuitka-Offsets")
 
 
 def queryUser(question, choices, default, default_non_interactive):

nuitka/TreeXML.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ XML node tree handling

nuitka/Variables.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Variables link the storage and use of a Python variable together.

nuitka/Version.py

@@ -20,8 +20,8 @@
 """
 
 version_string = """\
-Nuitka V2.5.6
-Copyright (C) 2024 Kay Hayen."""
+Nuitka V2.6
+Copyright (C) 2025 Kay Hayen."""
 
 
 def getNuitkaVersion():

nuitka/__init__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Dummy file to make this directory a package. """

nuitka/__main__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """
@@ -65,6 +65,9 @@ def main():
         )
         sys.exit(1)
 
+    # Make sure this is removed if it exists.
+    getLaunchingNuitkaProcessEnvironmentValue("NUITKA_SITE_FILENAME")
+
     nuitka_binary_name = getLaunchingNuitkaProcessEnvironmentValue("NUITKA_BINARY_NAME")
     if nuitka_binary_name is not None:
         sys.argv[0] = nuitka_binary_name

nuitka/__past__.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """

nuitka/build/Backend.scons

@@ -1,5 +1,5 @@
 # -*- python -*-
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """
@@ -40,11 +40,8 @@ from nuitka.Tracing import (
 )
 from nuitka.utils.FileOperations import (
     changeFilenameExtension,
-    deleteFile,
     getExternalUsePath,
     getFilenameExtension,
-    getNormalizedPath,
-    isFilesystemEncodable,
 )
 from nuitka.utils.Json import loadJsonFromFilename
 from nuitka.utils.Utils import (
@@ -84,6 +81,7 @@ from .SconsUtils import (
     initScons,
     isClangName,
     isGccName,
+    makeResultPathFileSystemEncodable,
     prepareEnvironment,
     provideStaticSourceFile,
     raiseNoCompilerFoundErrorExit,
@@ -361,10 +359,12 @@ env = checkWindowsCompilerFound(
     clang_mode=clang_mode,
     msvc_version=msvc_version,
     assume_yes_for_downloads=assume_yes_for_downloads,
+    download_ok=True,
 )
 
 env.the_compiler = env["CC"]
 env.the_cc_name = os.path.normcase(os.path.basename(env.the_compiler))
+env.module_mode = module_mode
 env.standalone_mode = standalone_mode
 env.debug_mode = debug_mode
 env.debugger_mode = debugger_mode
@@ -443,20 +443,6 @@ setupCCompiler(
 
 # Avoid them as appearing to be different files. TODO: Find out which
 # clang version has this, clang-8 does not.
-if env.gcc_mode and not env.clang_mode and env.gcc_version >= (8,):
-    if source_dir != "." and not full_names:
-        # TODO: This also lies for modules codes.
-        env.Append(
-            CCFLAGS=[
-                "--file-prefix-map=%s=%s" % (os.path.normpath(source_dir), "."),
-                "--file-prefix-map=%s=%s"
-                % (
-                    os.path.normpath(os.path.join(env.source_dir, "static_src")),
-                    os.path.normpath(os.path.join(env.nuitka_src, "static_src")),
-                ),
-            ]
-        )
-
 if env.msvc_mode:
     # With Clang on Windows, there is also an linker to use. spell-checker: ignore bigobj
     env.Append(
@@ -471,7 +457,7 @@ if env.msvc_mode:
     # No incremental linking.
     env.Append(LINKFLAGS=["/INCREMENTAL:NO"])
 
-    if module_mode:
+    if env.module_mode:
         # Make sure we handle import library on our own and put it into the
         # build directory, spell-checker: ignore IMPLIB
 
@@ -483,8 +469,9 @@ if env.msvc_mode:
             ]
         )
 
-if not module_mode:
+if not env.module_mode:
     enableWindowsStackSize(env=env, target_arch=target_arch)
+
 if env.debug_mode:
     if env.gcc_mode:
         # Allow gcc/clang to point out all kinds of inconsistency to us by
@@ -514,6 +501,9 @@ if env.debug_mode:
         )
 
     elif env.msvc_mode:
+        if "allow-c-warnings" not in env.experimental_flags and not env.debugger_mode:
+            env.Append(CCFLAGS=["/WX"])
+
         # Disable warnings that system headers already show.
         env.Append(
             CCFLAGS=[
@@ -525,12 +515,11 @@ if env.debug_mode:
                 "/wd4189",
                 "/wd4211",
                 "/wd4115",
-                "/WX",
             ]
         )
 
         # Disable warnings, that CPython headers already show.
-        if python_version >= (3, 4):
+        if python_version >= (3,):
             env.Append(CCFLAGS=["/wd4512", "/wd4510", "/wd4610"])
 
         if python_version >= (3, 13):
@@ -672,15 +661,28 @@ if env.static_libpython and (
 ):
     env.Append(CPPDEFINES=["_NUITKA_USE_UNEXPOSED_API"])
 
+if env.static_libpython and python_version >= (3, 12):
+    env.Append(
+        CPPPATH=[
+            os.path.join(env.nuitka_src, "inline_copy", "python_hacl", "hacl_312"),
+            os.path.join(
+                env.nuitka_src, "inline_copy", "python_hacl", "hacl_312", "include"
+            ),
+        ]
+    )
+
+    env.Append(CPPDEFINES=["_NUITKA_INLINE_COPY_HACL"])
+
+    # Remove it from static link libraries as well, if present, so far they are
+    # bugs and do not exist.
+    link_module_libs = [
+        link_module_lib
+        for link_module_lib in link_module_libs
+        if "libHacl_Hash_SHA2" not in link_module_libs
+    ]
+
 if os.name == "nt":
     if env.nuitka_python:
-        env.Append(
-            LINKFLAGS=[
-                "/LTCG",
-                "/USEPROFILE:PGD=" + os.path.join(python_prefix_external, "python.pgd"),
-            ]
-        )
-
         link_data = loadJsonFromFilename(
             os.path.join(python_prefix_external, "link.json")
         )
@@ -728,7 +730,7 @@ if os.name == "nt":
 
         if not env.msys2_mingw_python:
             addWinLib()
-elif not module_mode:
+elif not env.module_mode:
     # Add the python library path to the library path
     if env.self_compiled_python_uninstalled:
         python_lib_path = python_prefix_external
@@ -804,7 +806,7 @@ elif not module_mode:
         env.Append(LINKFLAGS=["-rpath=" + python_lib_path])
 
 if isMacOS():
-    if module_mode:
+    if env.module_mode:
         # Dynamic lookup needed for extension modules.
         env.Append(LINKFLAGS=["-undefined", "dynamic_lookup"])
     else:
@@ -833,20 +835,8 @@ env.Append(
     ]
 )
 
-if env.static_libpython and python_version >= (3, 12):
-    env.Append(
-        CPPPATH=[
-            os.path.join(env.nuitka_src, "inline_copy", "python_hacl", "hacl_312"),
-            os.path.join(
-                env.nuitka_src, "inline_copy", "python_hacl", "hacl_312", "include"
-            ),
-        ]
-    )
-
-    env.Append(CPPDEFINES=["_NUITKA_INLINE_COPY_HACL"])
-
 # Set load libpython from binary directory default
-if env.gcc_mode and not isMacOS() and not os.name == "nt" and not module_mode:
+if env.gcc_mode and not isMacOS() and not os.name == "nt" and not env.module_mode:
     if env.standalone_mode:
         rpath = "$$ORIGIN"
     else:
@@ -872,7 +862,7 @@ addConstantBlobFile(
 env.Append(CPPDEFINES=["_NUITKA_FROZEN=%d" % frozen_modules])
 
 # Tell compiler to create a shared library or program.
-if module_mode:
+if env.module_mode:
     if isGccName(env.the_cc_name):
         env.Append(CCFLAGS=["-shared"])
     elif env.clang_mode:
@@ -893,7 +883,7 @@ else:
         else:
             env.Append(CCFLAGS=["/MT"])  # Multithreaded, static version of C run time.
 
-if module_mode:
+if env.module_mode:
     env.Append(CPPDEFINES=["_NUITKA_MODULE"])
 else:
     env.Append(CPPDEFINES=["_NUITKA_EXE"])
@@ -915,7 +905,7 @@ def discoverSourceFiles():
     static_src_filenames = []
 
     # Main program, unless of course it's a Python module/package we build.
-    if not module_mode:
+    if not env.module_mode:
         static_src_filenames.append("MainProgram.c")
 
     # Compiled types.
@@ -935,23 +925,13 @@ def discoverSourceFiles():
 
 source_files = discoverSourceFiles()
 
-# Remove the target file to avoid cases where it falsely doesn't get rebuild
-# and then lingers from previous builds,
-deleteFile(result_exe, must_exist=False)
+# Remove the target file to avoid cases where it falsely doesn't get rebuild and
+# then lingers from previous builds, and also workaround for MinGW64 not
+# supporting unicode result paths for "-o" basename.
+result_exe = makeResultPathFileSystemEncodable(env=env, result_exe=result_exe)
 
-# Workaround for MinGW64 not supporting unicode result paths for "-o" basename.
-if os.name == "nt" and not isFilesystemEncodable(result_exe):
-    result_exe = os.path.join(
-        os.path.dirname(result_exe),
-        "_nuitka_temp.pyd" if module_mode else "_nuitka_temp.exe",
-    )
-
-    if not isFilesystemEncodable(result_exe):
-        result_exe = getNormalizedPath(os.path.relpath(result_exe))
-
-    deleteFile(result_exe, must_exist=False)
 
-if module_mode:
+if env.module_mode:
     # For Python modules, the standard shared library extension is not what gets
     # used. spell-checker: ignore SHLIBSUFFIX
     module_suffix = getFilenameExtension(result_exe)
@@ -1063,7 +1043,7 @@ createBuildDefinitionsFile()
 
 # The meta path based loader might want to respect that, so it does verbose traces in module
 # mode, mostly for debugging purposes only.
-if module_mode and python_sysflag_verbose:
+if env.module_mode and python_sysflag_verbose:
     env.Append(CPPDEFINES=["_NUITKA_SYSFLAG_VERBOSE=1"])
 
 # Hack to make Scons use tempfile for gcc linking, to avoid line length limits,
@@ -1071,9 +1051,8 @@ if module_mode and python_sysflag_verbose:
 # but useful on other platforms too.
 if env.gcc_mode:
     makeGccUseLinkerFile(
-        source_files=source_files,
-        module_mode=module_mode,
         env=env,
+        source_files=source_files,
     )
 
 # Plugin contributed C defines should be used too.
@@ -1088,7 +1067,6 @@ env.Append(LIBS=link_libraries)
 # Work around windows bugs and use watchdogs to track progress of compilation.
 enableSpawnMonitoring(
     env=env,
-    module_mode=module_mode,
     source_files=source_files,
 )
 

nuitka/build/CCompilerVersion.scons

@@ -1,5 +1,5 @@
 # -*- python -*-
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """
@@ -207,6 +207,7 @@ env = checkWindowsCompilerFound(
     clang_mode=clang_mode,
     msvc_version=msvc_version,
     assume_yes_for_downloads=assume_yes_for_downloads,
+    download_ok=False,
 )
 
 env.the_compiler = env["CC"] or env["CXX"]

nuitka/build/DataComposerInterface.py

@@ -1,4 +1,4 @@
-#     Copyright 2024, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+#     Copyright 2025, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
 
 
 """ Interface to data composer
@@ -55,6 +55,7 @@ def _runDataComposer(source_dir):
 
     blob_filename = getConstantBlobFilename(source_dir)
 
+    # This ends up being "__constants.txt" right now.
     stats_filename = changeFilenameExtension(blob_filename, ".txt")
 
     with withEnvironmentVarsOverridden(mapping):