Nuitka-winsvc 2.4.8__tar.gz → 2.4.11__tar.gz

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/Nuitka_winsvc.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.4.8
+Version: 2.4.11
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.4.8
+Version: 2.4.11
 Summary: Nuitka but support compile as Windows service
 Home-page: https://github.com/tabris17/Nuitka-winsvc
 Author: tabris17

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/doc/nuitka-run.1

@@ -184,7 +184,7 @@ There are many allowed forms. With '\-\-include\-datafiles=/path/to/file/*.txt=f
 will copy a single file and complain if it's multiple.
 With '\-\-include\-datafiles=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive
-copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name=**/*.txt' that
+copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name/=**/*.txt' that
 will preserve directory structure. Default empty.
 .TP
 \fB\-\-include\-data\-dir\fR=\fI\,DIRECTORY\/\fR

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/doc/nuitka.1

@@ -184,7 +184,7 @@ There are many allowed forms. With '\-\-include\-datafiles=/path/to/file/*.txt=f
 will copy a single file and complain if it's multiple.
 With '\-\-include\-datafiles=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive
-copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name=**/*.txt' that
+copy there is a form with 3 values that '\-\-includedata\-files=/path/to/scan=folder_name/=**/*.txt' that
 will preserve directory structure. Default empty.
 .TP
 \fB\-\-include\-data\-dir\fR=\fI\,DIRECTORY\/\fR

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/OptionParsing.py

@@ -401,7 +401,7 @@ allowed forms. With '--include-data-files=/path/to/file/*.txt=folder_name/some.t
 will copy a single file and complain if it's multiple. With
 '--include-data-files=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive copy there is a
-form with 3 values that '--include-data-files=/path/to/scan=folder_name=**/*.txt'
+form with 3 values that '--include-data-files=/path/to/scan=folder_name/=**/*.txt'
 that will preserve directory structure. Default empty.""",
 )
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/Options.py

@@ -53,6 +53,7 @@ from nuitka.PythonVersions import (
 )
 from nuitka.utils.Execution import getExecutablePath
 from nuitka.utils.FileOperations import (
+    getNormalizedPath,
     isLegalPath,
     isPathExecutable,
     openTextFile,
@@ -121,7 +122,7 @@ def checkPathSpec(value, arg_name, allow_disable):
         )
 
     # This changes the '/' to '\' on Windows at least.
-    value = os.path.normpath(value)
+    value = getNormalizedPath(value)
 
     if "\n" in value or "\r" in value:
         Tracing.options_logger.sysexit(
@@ -1571,7 +1572,7 @@ _shall_use_static_lib_python = None
 
 
 def _shallUseStaticLibPython():
-    # return driven, pylint: disable=too-many-return-statements
+    # many cases and return driven, pylint: disable=too-many-branches,too-many-return-statements
 
     if shallMakeModule():
         return False, "not used in module mode"
@@ -1604,11 +1605,20 @@ def _shallUseStaticLibPython():
 
         # For Anaconda default to trying static lib python library, which
         # normally is just not available or if it is even unusable.
-        if isAnacondaPython() and not isWin32Windows():
-            return (
-                True,
-                "Nuitka on Anaconda needs package for static libpython installed. Execute 'conda install libpython-static'.",
-            )
+        if isAnacondaPython():
+            if isMacOS():
+                # TODO: Maybe some linker options can make it happen.
+                return (
+                    False,
+                    "Anaconda on macOS exports not all symbols when using it.",
+                )
+            elif not isWin32Windows():
+                return (
+                    True,
+                    """\
+Nuitka on Anaconda needs package for static libpython installed. \
+Execute 'conda install libpython-static'.""",
+                )
 
         if isPyenvPython():
             return True, "Nuitka on pyenv should not use '--enable-shared'."

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/Version.py

@@ -20,7 +20,7 @@
 """
 
 version_string = """\
-Nuitka V2.4.8
+Nuitka V2.4.11
 Copyright (C) 2024 Kay Hayen."""
 
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/SconsCaching.py

@@ -279,7 +279,11 @@ def _getCcacheStatistics(ccache_logfile):
         # can be matched against it.
         commands = {}
 
-        for line in getFileContentByLine(ccache_logfile):
+        # Due to upstream issues, lines in the log might have different encodings.
+        # All command and result lines use the platform's default encoding,
+        # so we follow this to ensure these lines are correct.
+        # Unrecognized characters are replaced by byte values, e.g. "\xde\xad"
+        for line in getFileContentByLine(ccache_logfile, errors="backslashreplace"):
             match = re_command.match(line)
 
             if match:
@@ -313,7 +317,9 @@ def _getCcacheStatistics(ccache_logfile):
 
                     all_text = []
 
-                    for line2 in getFileContentByLine(ccache_logfile):
+                    for line2 in getFileContentByLine(
+                        ccache_logfile, errors="backslashreplace"
+                    ):
                         match = re_anything.match(line2)
 
                         if match:

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/SconsCompilerSettings.py

@@ -379,9 +379,9 @@ For Python version %s MSVC %s or later is required, not %s which is too old."""
                         % (compiler_path,)
                     )
 
-                # This also will trigger using it to use our own gcc in branch below.
-                compiler_path = None
-                env["CC"] = None
+                    # This also will trigger using it to use our own gcc in branch below.
+                    compiler_path = None
+                    env["CC"] = None
 
         if compiler_path is None and msvc_version is None:
             scons_details_logger.info(

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/static_src/CompiledMethodType.c

@@ -125,7 +125,10 @@ static PyObject *Nuitka_Method_deepcopy(struct Nuitka_MethodObject *method, PyOb
         return NULL;
     }
 
-    return Nuitka_Method_New(method->m_function, object, method->m_class);
+    PyObject *result = Nuitka_Method_New(method->m_function, object, method->m_class);
+    // Nuitka_Method_New took a reference to the object.
+    Py_DECREF(object);
+    return result;
 }
 
 static PyMethodDef Nuitka_Method_methods[] = {

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/static_src/HelpersAllocator.c

@@ -673,11 +673,11 @@ void Nuitka_PyObject_GC_Link(PyObject *op) {
     gc->_gc_next = 0;
     gc->_gc_prev = 0;
 
-    gcstate->young.count++;
-    gcstate->heap_size++;
+    gcstate->generations[0].count++;
 
-    if (gcstate->young.count > gcstate->young.threshold && gcstate->enabled && gcstate->young.threshold &&
-        !_Py_atomic_load_int_relaxed(&gcstate->collecting) && !_PyErr_Occurred(tstate)) {
+    if (gcstate->generations[0].count > gcstate->generations[0].threshold && gcstate->enabled &&
+        gcstate->generations[0].threshold && !_Py_atomic_load_int_relaxed(&gcstate->collecting) &&
+        !_PyErr_Occurred(tstate)) {
         Nuitka_Py_ScheduleGC(tstate);
     }
 #endif

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/static_src/HelpersComparisonEqUtils.c

@@ -39,6 +39,7 @@ void _initSlotCompare(void) {
     PyDict_SetItem(kw_args, const_str_plain___init__, (PyObject *)Py_TYPE(Py_None));
 
     // Create the type.
+    CHECK_OBJECT(const_str_plain___cmp__);
     PyTypeObject *c = (PyTypeObject *)PyObject_CallFunctionObjArgs((PyObject *)&PyType_Type, const_str_plain___cmp__,
                                                                    pos_args, kw_args, NULL);
     Py_DECREF(pos_args);

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/static_src/HelpersConstantsBlob.c

@@ -774,7 +774,9 @@ static unsigned char const *_unpackBlobConstant(PyThreadState *tstate, PyObject
         PyObject *u = PyUnicode_FromStringAndSize((const char *)data, 1);
         data += 1;
 
-#if PYTHON_VERSION >= 0x300
+#if PYTHON_VERSION >= 0x3c7
+        _PyUnicode_InternImmortal(tstate->interp, &u);
+#elif PYTHON_VERSION >= 0x300
         PyUnicode_InternInPlace(&u);
 #else
         insertToDictCache(unicode_cache, &u);
@@ -828,7 +830,9 @@ static unsigned char const *_unpackBlobConstant(PyThreadState *tstate, PyObject
 #endif
         data += size + 1;
 
-#if PYTHON_VERSION >= 0x300
+#if PYTHON_VERSION >= 0x3c7
+        _PyUnicode_InternImmortal(tstate->interp, &u);
+#elif PYTHON_VERSION >= 0x300
         if (c == 'a') {
             PyUnicode_InternInPlace(&u);
         }

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/static_src/HelpersMatching.c

@@ -130,7 +130,7 @@ PyObject *MATCH_CLASS_ARGS(PyThreadState *tstate, PyObject *matched, PyObject *m
         if (unlikely(arg_value == NULL)) {
             DROP_ERROR_OCCURRED(tstate);
 
-            Py_DECREF(match_args);
+            Py_XDECREF(match_args);
             Py_DECREF(result);
 
             Py_INCREF_IMMORTAL(Py_None);

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/build/static_src/MainProgram.c

@@ -1114,7 +1114,7 @@ static void changeStandardHandleTarget(FILE *std_handle, filename_char_t const *
 static void Nuitka_at_exit(void) { NUITKA_PRINT_TIMING("Nuitka_at_exit(): Called by C exit()"); }
 #endif
 
-#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAILT)
+#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAULT)
 #include <signal.h>
 static void nuitka_segfault_handler(int sig) {
     puts("Nuitka: A segmentation fault has occurred. This is highly unusual and can");
@@ -1132,6 +1132,11 @@ extern wchar_t const *getBinaryFilenameWideChars(bool resolve_symlinks);
 extern char const *getBinaryFilenameHostEncoded(bool resolve_symlinks);
 #endif
 
+// No longer in header files, but still usable.
+#if PYTHON_VERSION >= 0x3d0
+PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *s);
+#endif
+
 #ifdef _NUITKA_WINMAIN_ENTRY_POINT
 int __stdcall wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpCmdLine, int nCmdShow) {
     /* MSVC, MINGW64 */
@@ -1146,7 +1151,7 @@ int main(int argc, char **argv) {
 #endif
 
     // Installer a segfault handler that outputs a helpful message.
-#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAILT)
+#if !defined(_NUITKA_DEPLOYMENT_MODE) && !defined(_NUITKA_NO_DEPLOYMENT_SEGFAULT)
     signal(SIGSEGV, nuitka_segfault_handler);
 #endif
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/freezer/DependsExe.py

@@ -9,6 +9,7 @@ We use depends.exe to investigate needed DLLs of Python DLLs.
 
 import os
 
+from nuitka.__past__ import WindowsError
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.Options import assumeYesForDownloads
 from nuitka.Tracing import inclusion_logger
@@ -132,7 +133,13 @@ def _parseDependsExeOutput2(lines):
             continue
 
         dll_filename = os.path.abspath(dll_filename)
-        dll_filename = getWindowsLongPathName(dll_filename)
+
+        # Ignore errors trying to resolve the filename. Sometimes Chinese
+        # directory paths do not resolve to long filenames.
+        try:
+            dll_filename = getWindowsLongPathName(dll_filename)
+        except WindowsError:
+            pass
 
         dll_name = os.path.basename(dll_filename)
 

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/freezer/IncludedDataFiles.py

@@ -35,6 +35,7 @@ from nuitka.utils.FileOperations import (
     getFileList,
     getFilenameExtension,
     getFileSize,
+    getNormalizedPath,
     isFilenameBelowPath,
     isLegalPath,
     isRelativePath,
@@ -98,9 +99,9 @@ class IncludedDataFile(object):
 
         self.kind = kind
         self.source_path = source_path
-        self.dest_path = os.path.normpath(dest_path)
+        self.dest_path = getNormalizedPath(dest_path)
 
-        is_legal, illegal_reason = isLegalPath(dest_path)
+        is_legal, illegal_reason = isLegalPath(self.dest_path)
         if not is_legal:
             general.sysexit(
                 "Error, cannot add data file with '%s' path, as '%s'"
@@ -538,7 +539,7 @@ def _reportDataFiles():
 
 
 def _checkPathConflict(dest_path, standalone_entry_points):
-    assert os.path.normpath(dest_path) == dest_path
+    assert getNormalizedPath(dest_path) == dest_path
 
     while dest_path:
         for standalone_entry_point in standalone_entry_points:

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/freezer/IncludedEntryPoints.py

@@ -17,6 +17,7 @@ from nuitka.Options import getShallNotIncludeDllFilePatterns, isShowInclusion
 from nuitka.Tracing import general, inclusion_logger
 from nuitka.utils.FileOperations import (
     areSamePaths,
+    getNormalizedPath,
     getReportPath,
     hasFilenameExtension,
     haveSameFileContents,
@@ -51,7 +52,7 @@ def _makeIncludedEntryPoint(
     assert type(executable) is bool, executable
 
     # Make sure outside code uses sane paths only.
-    assert source_path == os.path.normpath(source_path), source_path
+    assert source_path == getNormalizedPath(source_path), source_path
 
     # Avoid obvious mistakes, these files won't be binaries or DLL ever, right?
     assert not hasFilenameExtension(path=source_path, extensions=(".qml", ".json"))
@@ -60,7 +61,7 @@ def _makeIncludedEntryPoint(
         logger=logger,
         kind=kind,
         source_path=source_path,
-        dest_path=os.path.normpath(dest_path),
+        dest_path=getNormalizedPath(dest_path),
         module_name=module_name,
         package_name=package_name,
         executable=executable,

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/freezer/Standalone.py

@@ -32,6 +32,7 @@ from nuitka.PythonFlavors import (
     getHomebrewInstallPath,
     isAnacondaPython,
     isHomebrewPython,
+    isMSYS2MingwPython,
 )
 from nuitka.PythonVersions import getSystemPrefixPath
 from nuitka.Tracing import general, inclusion_logger
@@ -236,6 +237,9 @@ def _reduceToPythonPath(used_dlls):
     if isHomebrewPython():
         inside_paths.insert(0, getHomebrewInstallPath())
 
+    if isMSYS2MingwPython():
+        inside_paths.insert(0, os.path.join(getSystemPrefixPath(), "bin"))
+
     def decideInside(dll_filename):
         return any(
             isFilenameBelowPath(path=inside_path, filename=dll_filename)

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/importing/Recursion.py

@@ -345,6 +345,14 @@ def _addIncludedModule(module, package_only):
                         module_package=module.getFullName(),
                         package_only=False,
                     )
+                else:
+                    for suffix in getSharedLibrarySuffixes():
+                        if sub_path.endswith(suffix):
+                            checkPluginSinglePath(
+                                sub_path,
+                                module_package=module.getFullName(),
+                                package_only=False,
+                            )
 
     elif module.isCompiledPythonModule() or module.isUncompiledPythonModule():
         ModuleRegistry.addRootModule(module)

{nuitka_winsvc-2.4.8 → nuitka_winsvc-2.4.11}/nuitka/plugins/standard/TkinterPlugin.py

@@ -11,7 +11,6 @@ from nuitka.Options import isStandaloneMode, shallCreateAppBundle
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 from nuitka.PythonFlavors import isHomebrewPython
 from nuitka.PythonVersions import getSystemPrefixPath, getTkInterVersion
-from nuitka.utils.FileOperations import listDllFilesFromDirectory, relpath
 from nuitka.utils.Utils import isMacOS, isWin32Windows
 
 # spell-checker: ignore tkinterdnd,tkdnd,tcltk
@@ -135,34 +134,6 @@ override it here. Default is automatic detection.""",
 The Tcl library dir. See comments for Tk library dir.""",
         )
 
-    @staticmethod
-    def _getTkinterDnDPlatformDirectory():
-        # From their code:
-        import platform
-
-        if platform.system() == "Darwin":
-            return "osx64"
-        elif platform.system() == "Linux":
-            return "linux64"
-        elif platform.system() == "Windows":
-            return "win64"
-        else:
-            return None
-
-    def _considerDataFilesTkinterDnD(self, module):
-        platform_rep = self._getTkinterDnDPlatformDirectory()
-
-        if platform_rep is None:
-            return
-
-        yield self.makeIncludedPackageDataFiles(
-            package_name="tkinterdnd2",
-            package_directory=module.getCompileTimeDirectory(),
-            pattern=os.path.join("tkdnd", platform_rep, "**"),
-            reason="Tcl needed for 'tkinterdnd2' usage",
-            tags="tcl",
-        )
-
     def _getTclCandidatePaths(self):
         # Check typical locations of the dirs
         yield os.getenv("TCL_LIBRARY")
@@ -234,12 +205,6 @@ The Tcl library dir. See comments for Tk library dir.""",
             IncludedDataFile objects.
         """
 
-        # Extra TCL providing module go here:
-        if module.getFullName() == "tkinterdnd2.TkinterDnD":
-            yield self._considerDataFilesTkinterDnD(module)
-
-            return
-
         if not _isTkInterModule(module) or self.files_copied:
             return
 
@@ -301,27 +266,6 @@ that works, report a bug."""
 
         self.files_copied = True
 
-    def getExtraDlls(self, module):
-        if module.getFullName() == "tkinterdnd2.TkinterDnD":
-            platform_rep = self._getTkinterDnDPlatformDirectory()
-
-            if platform_rep is None:
-                return
-
-            module_directory = module.getCompileTimeDirectory()
-
-            for filename, _dll_filename in listDllFilesFromDirectory(
-                os.path.join(module_directory, "tkdnd", platform_rep)
-            ):
-                dest_path = relpath(filename, module_directory)
-                yield self.makeDllEntryPoint(
-                    source_path=filename,
-                    dest_path=os.path.join("tkinterdnd2", dest_path),
-                    module_name="tkinterdnd2",
-                    package_name="tkinterdnd2",
-                    reason="tkinterdnd2 package DLL",
-                )
-
     def onModuleCompleteSet(self, module_set):
         if str is bytes:
             plugin_binding_name = "Tkinter"