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

{Nuitka_winsvc-2.3.9.dist-info → Nuitka_winsvc-2.4.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.1.0)
+Generator: setuptools (71.1.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win_amd64
 

nuitka/CacheCleanup.py

@@ -22,7 +22,12 @@ def _cleanCacheDirectory(cache_name, cache_dir):
         cache_logger.info(
             "Cleaning cache '%s' directory '%s'." % (cache_name, cache_dir)
         )
-        removeDirectory(cache_dir, ignore_errors=False)
+        removeDirectory(
+            cache_dir,
+            logger=cache_logger,
+            ignore_errors=False,
+            extra_recommendation=None,
+        )
         cache_logger.info("Done.")
 
 

nuitka/HardImportRegistry.py

@@ -10,6 +10,9 @@ know how to handle these.
 import os
 import sys
 
+from nuitka import Options
+from nuitka.Constants import isConstant
+from nuitka.nodes.BuiltinOpenNodes import makeBuiltinOpenRefNode
 from nuitka.nodes.ConstantRefNodes import ExpressionConstantSysVersionInfoRef
 from nuitka.PythonVersions import (
     getFutureModuleKeys,
@@ -161,8 +164,10 @@ module_sys_trust = {
     "maxsize": trust_constant,
     "byteorder": trust_constant,
     "builtin_module_names": trust_constant,
-    "stdout": trust_exist,
-    "stderr": trust_exist,
+    # TODO: Their lookups would have to be nodes, and copy with them being
+    # potentially unassigned.
+    #    "stdout": trust_exist,
+    #    "stderr": trust_exist,
     "exit": trust_node,
 }
 
@@ -175,6 +180,7 @@ else:
 module_builtins_trust = {}
 if python_version >= 0x300:
     module_builtins_trust["open"] = trust_node
+    trust_node_factory[("builtins", "open")] = makeBuiltinOpenRefNode
 
 if python_version < 0x300:
     module_sys_trust["exc_type"] = trust_may_exist
@@ -192,6 +198,27 @@ module_typing_trust = {
     "TYPE_CHECKING": trust_constant,
 }
 
+
+def makeTypingModuleTrust():
+    result = {}
+
+    if python_version >= 0x350:
+        import typing
+
+        constant_typing_values = ("TYPE_CHECKING", "Text")
+        for name in typing.__all__:
+            if name not in constant_typing_values:
+                trust = trust_exist
+                if Options.is_debug:
+                    assert not isConstant(getattr(typing, name))
+            else:
+                trust = trust_constant
+                if Options.is_debug:
+                    assert isConstant(getattr(typing, name))
+
+            result[name] = trust
+
+
 module_os_trust = {
     "name": trust_constant,
     "listdir": trust_node,

nuitka/MainControl.py

@@ -69,7 +69,7 @@ from nuitka.PythonVersions import (
     python_version_str,
 )
 from nuitka.Serialization import ConstantAccessor
-from nuitka.Tracing import general, inclusion_logger
+from nuitka.Tracing import general, inclusion_logger, pgo_logger
 from nuitka.tree import SyntaxErrors
 from nuitka.tree.ReformulationMultidist import createMultidistMainSourceCode
 from nuitka.utils import InstanceCounters
@@ -130,24 +130,19 @@ def _createMainModule():
     directory paths.
 
     """
-    # Many cases and details to deal with, pylint: disable=too-many-branches,too-many-locals
+    # Many cases and details to deal with, pylint: disable=too-many-branches
 
     Plugins.onBeforeCodeParsing()
 
-    main_filenames = Options.getMainEntryPointFilenames()
-
     # First, build the raw node tree from the source code.
-    if len(main_filenames) > 1:
+    if Options.isMultidistMode():
         assert not Options.shallMakeModule()
 
         main_module = buildMainModuleTree(
-            # TODO: Should not be given.
-            filename=main_filenames[0],
-            source_code=createMultidistMainSourceCode(main_filenames),
+            source_code=createMultidistMainSourceCode(),
         )
     else:
         main_module = buildMainModuleTree(
-            filename=main_filenames[0],
             source_code=None,
         )
 
@@ -162,7 +157,11 @@ def _createMainModule():
                 % distribution_name
             )
 
-        addDistributionMetadataValue(distribution_name, distribution)
+        addDistributionMetadataValue(
+            distribution_name=distribution_name,
+            distribution=distribution,
+            reason="user requested",
+        )
 
     # First remove old object files and old generated files, old binary or
     # module, and standalone mode program directory if any, they can only do
@@ -175,11 +174,19 @@ def _createMainModule():
     # Prepare the ".dist" directory, throwing away what was there before.
     if Options.isStandaloneMode():
         standalone_dir = OutputDirectories.getStandaloneDirectoryPath(bundle=False)
-        resetDirectory(path=standalone_dir, ignore_errors=True)
+        resetDirectory(
+            path=standalone_dir,
+            logger=general,
+            ignore_errors=True,
+            extra_recommendation="Stop previous binary.",
+        )
 
         if Options.shallCreateAppBundle():
             resetDirectory(
-                path=changeFilenameExtension(standalone_dir, ".app"), ignore_errors=True
+                path=changeFilenameExtension(standalone_dir, ".app"),
+                logger=general,
+                ignore_errors=True,
+                extra_recommendation=None,
             )
 
     # Delete result file, to avoid confusion with previous build and to
@@ -253,15 +260,11 @@ def _createMainModule():
         checkFreezingModuleSet()
 
     # Check if distribution meta data is included, that cannot be used.
-    for distribution_name, (
-        package_name,
-        _metadata,
-        _entry_points,
-    ) in getDistributionMetadataValues():
-        if not ModuleRegistry.hasDoneModule(package_name):
+    for distribution_name, meta_data_value in getDistributionMetadataValues():
+        if not ModuleRegistry.hasDoneModule(meta_data_value.module_name):
             inclusion_logger.sysexit(
                 "Error, including metadata for distribution '%s' without including related package '%s'."
-                % (distribution_name, package_name)
+                % (distribution_name, meta_data_value.module_name)
             )
 
     # Allow plugins to comment on final module set.
@@ -526,11 +529,11 @@ def _runCPgoBinary():
                 source_dir=OutputDirectories.getSourceDirectoryPath(), key="PATH"
             ),
         ):
-            _exit_code = _runPgoBinary()
+            exit_code_pgo = _runPgoBinary()
 
         pgo_data_collected = os.path.exists(msvc_pgc_filename)
     else:
-        _exit_code = _runPgoBinary()
+        exit_code_pgo = _runPgoBinary()
 
         # gcc file suffix, spell-checker: ignore gcda
         gcc_constants_pgo_filename = os.path.join(
@@ -539,12 +542,21 @@ def _runCPgoBinary():
 
         pgo_data_collected = os.path.exists(gcc_constants_pgo_filename)
 
+    if exit_code_pgo != 0:
+        pgo_logger.warning(
+            """\
+Error, the C PGO compiled program error exited. Make sure it works \
+fully before using '--pgo-c' option."""
+        )
+
     if not pgo_data_collected:
-        general.sysexit(
-            "Error, no PGO information produced, did the created binary run at all?"
+        pgo_logger.sysexit(
+            """\
+Error, no C PGO compiled program did not produce expected information, \
+did the created binary run at all?"""
         )
 
-    general.info("Successfully collected C level PGO information.", style="blue")
+    pgo_logger.info("Successfully collected C level PGO information.", style="blue")
 
 
 def _runPythonPgoBinary():
@@ -559,7 +571,9 @@ def _runPythonPgoBinary():
 
     if not os.path.exists(pgo_filename):
         general.sysexit(
-            "Error, no Python PGO information produced, did the created binary run (exit code %d) as expected?"
+            """\
+Error, no Python PGO information produced, did the created binary
+run (exit code %d) as expected?"""
             % exit_code
         )
 
@@ -621,6 +635,8 @@ def runSconsBackend():
         if Options.isOnefileTempDirMode():
             options["onefile_temp_mode"] = asBoolStr(True)
 
+    # TODO: Some things are going to hate that, we might need to bundle
+    # for accelerated mode still.
     if Options.shallCreateAppBundle():
         options["macos_bundle_mode"] = asBoolStr(True)
 
@@ -630,6 +646,9 @@ def runSconsBackend():
     if Options.getForcedStderrPath():
         options["forced_stderr_path"] = Options.getForcedStderrPath()
 
+    if Options.isProfile():
+        options["profile_mode"] = asBoolStr(True)
+
     if Options.shallTreatUninstalledPython():
         options["uninstalled_python"] = asBoolStr(True)
 
@@ -638,9 +657,6 @@ def runSconsBackend():
             len(ModuleRegistry.getUncompiledTechnicalModules())
         )
 
-    if Options.isProfile():
-        options["profile_mode"] = asBoolStr(True)
-
     if hasPythonFlagNoWarnings():
         options["no_python_warnings"] = asBoolStr(True)
 
@@ -707,7 +723,7 @@ def runSconsBackend():
     # Allow plugins to build definitions.
     env_values.update(Plugins.getBuildDefinitions())
 
-    if Options.shallCreatePgoInput():
+    if Options.shallCreatePythonPgoInput():
         options["pgo_mode"] = "python"
 
         result = runScons(
@@ -726,11 +742,11 @@ def runSconsBackend():
         return True, options
 
         # Need to restart compilation from scratch here.
-    if Options.isPgoMode():
+    if Options.isCPgoMode():
         # For C level PGO, we have a 2 pass system. TODO: Make it more global for onefile
         # and standalone mode proper support, which might need data files to be
         # there, which currently are not yet there, so it won't run.
-        if Options.isPgoMode():
+        if Options.isCPgoMode():
             options["pgo_mode"] = "generate"
 
             result = runScons(
@@ -996,7 +1012,7 @@ def _main():
         )
 
     # Relaunch in case of Python PGO input to be produced.
-    if Options.shallCreatePgoInput():
+    if Options.shallCreatePythonPgoInput():
         # Will not return.
         pgo_filename = OutputDirectories.getPgoRunInputFilename()
         general.info(
@@ -1036,7 +1052,6 @@ def _main():
     copyDataFiles(standalone_entry_points=getStandaloneEntryPoints())
 
     if Options.isStandaloneMode():
-
         Plugins.onStandaloneDistributionFinished(dist_dir)
 
         if Options.isOnefileMode():
@@ -1045,7 +1060,12 @@ def _main():
             if Options.isRemoveBuildDir():
                 general.info("Removing dist folder '%s'." % dist_dir)
 
-                removeDirectory(path=dist_dir, ignore_errors=False)
+                removeDirectory(
+                    path=dist_dir,
+                    logger=general,
+                    ignore_errors=False,
+                    extra_recommendation=None,
+                )
             else:
                 general.info(
                     "Keeping dist folder '%s' for inspection, no need to use it."
@@ -1062,7 +1082,12 @@ def _main():
         readSconsReport(source_dir)
         readSconsErrorReport(source_dir)
 
-        removeDirectory(path=source_dir, ignore_errors=False)
+        removeDirectory(
+            path=source_dir,
+            logger=general,
+            ignore_errors=False,
+            extra_recommendation=None,
+        )
         assert not os.path.exists(source_dir)
     else:
         general.info("Keeping build directory '%s'." % source_dir)
@@ -1131,6 +1156,8 @@ def main():
     except BaseException:
         try:
             writeCompilationReports(aborted=True)
+        except KeyboardInterrupt:
+            general.warning("""Report writing was prevented by user interrupt.""")
         except BaseException as e:  # Catch all the things, pylint: disable=broad-except
             general.warning(
                 """\

nuitka/ModuleRegistry.py

@@ -279,14 +279,22 @@ def getModuleInfluences(module_name):
 module_timing_infos = {}
 
 ModuleOptimizationTimingInfo = collections.namedtuple(
-    "ModuleOptimizationTimingInfo", ("pass_number", "time_used")
+    "ModuleOptimizationTimingInfo",
+    ("pass_number", "time_used", "micro_passes", "merge_counts"),
 )
 
 
-def addModuleOptimizationTimeInformation(module_name, pass_number, time_used):
+def addModuleOptimizationTimeInformation(
+    module_name, pass_number, time_used, micro_passes, merge_counts
+):
     module_timing_info = list(module_timing_infos.get(module_name, []))
     module_timing_info.append(
-        ModuleOptimizationTimingInfo(pass_number=pass_number, time_used=time_used)
+        ModuleOptimizationTimingInfo(
+            pass_number=pass_number,
+            time_used=time_used,
+            micro_passes=micro_passes,
+            merge_counts=merge_counts,
+        )
     )
     module_timing_infos[module_name] = tuple(module_timing_info)
 

nuitka/OptionParsing.py

@@ -19,6 +19,7 @@ import sys
 from string import Formatter
 
 from nuitka.PythonFlavors import getPythonFlavorName
+from nuitka.PythonVersions import isPythonWithGil
 from nuitka.utils.CommandLineOptions import SUPPRESS_HELP, makeOptionsParser
 from nuitka.utils.FileOperations import getFileContentByLine
 from nuitka.utils.Utils import (
@@ -764,6 +765,25 @@ Executing all self checks possible to find errors in Nuitka, do not use for
 production. Defaults to off.""",
 )
 
+debug_group.add_option(
+    "--no-debug-immortal-assumptions",
+    action="store_false",
+    dest="debug_immortal",
+    default=None,
+    help="""\
+Disable check normally done with "--debug". With Python3.12+ do not check known
+immortal object assumptions. Some C libraries corrupt them. Defaults to check
+being made if "--debug" is on.""",
+)
+
+debug_group.add_option(
+    "--debug-immortal-assumptions",
+    action="store_true",
+    dest="debug_immortal",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
 debug_group.add_option(
     "--unstripped",
     "--unstriped",
@@ -952,8 +972,9 @@ c_compiler_group.add_option(
     metavar="N",
     default=None,
     help="""\
-Specify the allowed number of parallel C compiler jobs. Defaults to the
-system CPU count.""",
+Specify the allowed number of parallel C compiler jobs. Negative values
+are system CPU minus the given value. Defaults to the full system CPU
+count unless low memory mode is activated, then it defaults to 1.""",
 )
 
 c_compiler_group.add_option(
@@ -1082,7 +1103,7 @@ del caching_group
 pgo_group = parser.add_option_group("PGO compilation choices")
 
 pgo_group.add_option(
-    "--pgo",
+    "--pgo-c",
     action="store_true",
     dest="is_c_pgo",
     default=False,
@@ -1293,39 +1314,6 @@ del tracing_group
 
 os_group = parser.add_option_group("General OS controls")
 
-os_group.add_option(
-    "--disable-console",
-    "--macos-disable-console",
-    "--windows-disable-console",
-    action="store_true",
-    dest="disable_console",
-    default=None,
-    help=SUPPRESS_HELP,
-)
-
-os_group.add_option(
-    "--enable-console",
-    action="store_false",
-    dest="disable_console",
-    default=None,
-    help=SUPPRESS_HELP,
-)
-
-os_group.add_option(
-    "--windows-console-mode",
-    action="store",
-    dest="console_mode",
-    choices=("force", "disable", "attach"),
-    metavar="CONSOLE_MODE",
-    default=None,
-    help="""\
-Select console mode to use. Default mode is 'force' and creates a
-console window if not available, i.e. the program was started from one. With
-'disable' it doesn't create or use a console. With 'attach' an existing console
-will be used for outputs. Default is 'force'.
-""",
-)
-
 os_group.add_option(
     "--force-stdout-spec",
     "--windows-force-stdout-spec",
@@ -1360,11 +1348,18 @@ del os_group
 windows_group = parser.add_option_group("Windows specific controls")
 
 windows_group.add_option(
-    "--windows-dependency-tool",
+    "--windows-console-mode",
     action="store",
-    dest="dependency_tool",
+    dest="console_mode",
+    choices=("force", "disable", "attach"),
+    metavar="CONSOLE_MODE",
     default=None,
-    help=SUPPRESS_HELP,
+    help="""\
+Select console mode to use. Default mode is 'force' and creates a
+console window unless the program was started from one. With 'disable'
+it doesn't create or use a console at all. With 'attach' an existing
+console will be used for outputs. Default is 'force'.
+""",
 )
 
 windows_group.add_option(
@@ -1418,6 +1413,32 @@ Request Windows User Control, to enforce running from a few folders only, remote
 desktop access. (Windows only). Defaults to off.""",
 )
 
+windows_group.add_option(
+    "--disable-console",
+    "--macos-disable-console",
+    "--windows-disable-console",
+    action="store_true",
+    dest="disable_console",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
+windows_group.add_option(
+    "--enable-console",
+    action="store_false",
+    dest="disable_console",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
+windows_group.add_option(
+    "--windows-dependency-tool",
+    action="store",
+    dest="dependency_tool",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
 windows_group.add_option(
     "--windows-service",
     action="store_true",
@@ -1799,6 +1820,23 @@ Default empty.""",
 
 del plugin_group
 
+target_group = parser.add_option_group("Cross compilation")
+
+
+target_group.add_option(
+    "--target",
+    action="store",
+    dest="target_desc",
+    metavar="TARGET_DESC",
+    default=None,
+    help="""\
+Cross compilation target. Highly experimental and in development, not
+supposed to work yet. We are working on '--target=wasi' and nothing
+else yet.""",
+)
+
+del target_group
+
 
 def _considerPluginOptions(logger):
     # Cyclic dependency on plugins during parsing of command line.
@@ -1878,6 +1916,7 @@ def _expandProjectArg(arg, filename_arg, for_eval):
         "Version": getNuitkaVersion(),
         "Commercial": wrap(getCommercialVersion()),
         "MAIN_DIRECTORY": wrap(os.path.dirname(filename_arg) or "."),
+        "GIL": isPythonWithGil(),
     }
 
     if isLinux():