Nuitka-winsvc 2.4.7__tar.gz → 2.4.10__tar.gz

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/Nuitka_winsvc.egg-info/PKG-INFO

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

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/PKG-INFO

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

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/nuitka/Version.py

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

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/nuitka/build/SconsCompilerSettings.py

@@ -111,13 +111,13 @@ def _enableC11Settings(env):
 
     if c11_mode:
         if env.gcc_mode:
-            env.Append(CCFLAGS=["-std=c11"])
+            env.Append(CFLAGS=["-std=c11"])
         elif env.msvc_mode:
-            env.Append(CCFLAGS=["/std:c11"])
+            env.Append(CFLAGS=["/std:c11"])
 
     if env.msvc_mode and c11_mode:
         # Windows SDK shows this even in non-debug mode in C11 mode.
-        env.Append(CCFLAGS=["/wd5105"])
+        env.Append(CCFLAGS=["/wd5105", "/wd4391"])
 
     if not c11_mode:
         env.Append(CPPDEFINES=["_NUITKA_NON_C11_MODE"])

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/nuitka/build/include/nuitka/allocator.h

@@ -139,7 +139,7 @@ static inline void Nuitka_Py_NewReference(PyObject *op) {
 #else
     op->ob_tid = _Py_ThreadId();
     op->_padding = 0;
-    op->ob_mutex = (struct _PyMutex){0};
+    op->ob_mutex = (PyMutex){0};
     op->ob_gc_bits = 0;
     op->ob_ref_local = 1;
     op->ob_ref_shared = 0;

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/CompiledFunctionType.c

@@ -1161,7 +1161,7 @@ Nuitka_Function_CreateFunctionViaCodeIndex(PyObject *module, PyObject *function_
 
     PyCodeObject *code_object =
         MAKE_CODE_OBJECT(filename, line_int, flags_int, function_name, function_qualname, arg_names,
-                         NULL, // freevars
+                         NULL, // free_vars
                          arg_count_int, kw_only_count_int, pos_only_count_int);
     if (unlikely(code_object == NULL)) {
         return NULL;

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/OnefileBootstrap.c

@@ -1156,8 +1156,6 @@ int main(int argc, char **argv) {
     static filename_char_t first_filename[1024] = {0};
 
 #if _NUITKA_ONEFILE_SPLASH_SCREEN
-    NUITKA_PRINT_TIMING("ONEFILE: Splash screen.");
-
     initSplashScreen();
 #endif
 

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/nuitka/build/static_src/OnefileSplashScreen.cpp

@@ -2,16 +2,22 @@
 
 // Creates a stream object initialized with the data from an executable resource.
 
-#ifdef __MINGW32__
-#error "No support for splash screens with MinGW64 yet, only works with MSVC. Somebody please make it portable."
-#endif
-
 #include <shlwapi.h>
 #include <wincodec.h>
 #include <windows.h>
 
 #include <assert.h>
 
+// Some handy macro definitions, e.g. unlikely and NUITKA_MAY_BE_UNUSED
+#include "nuitka/hedley.h"
+#define likely(x) HEDLEY_LIKELY(x)
+#define unlikely(x) HEDLEY_UNLIKELY(x)
+#ifdef __GNUC__
+#define NUITKA_MAY_BE_UNUSED __attribute__((__unused__))
+#else
+#define NUITKA_MAY_BE_UNUSED
+#endif
+
 #ifndef _NUITKA_NON_C11_MODE
 extern "C" {
 #endif
@@ -138,6 +144,7 @@ HWND createSplashWindow(HBITMAP splash_bitmap) {
 
     HWND splash_window = CreateWindowExA(WS_EX_LAYERED, wc.lpszClassName, NULL,
                                          WS_POPUP | WS_VISIBLE | WS_EX_TOOLWINDOW, 0, 0, 0, 0, 0, NULL, 0, NULL);
+    assert(splash_window != NULL);
 
     // get the size of the bitmap
 
@@ -145,6 +152,8 @@ HWND createSplashWindow(HBITMAP splash_bitmap) {
     GetObject(splash_bitmap, sizeof(bitmap), &bitmap);
     SIZE sizeSplash = {bitmap.bmWidth, bitmap.bmHeight};
 
+    // Monitor selection and dimensions.
+    // spell-checker: ignore HMONITOR,MONITORINFO,MONITOR_DEFAULTTOPRIMARY
     POINT zero = {0};
     HMONITOR handle_monitor = MonitorFromPoint(zero, MONITOR_DEFAULTTOPRIMARY);
     MONITORINFO monitorinfo = {0};
@@ -156,12 +165,17 @@ HWND createSplashWindow(HBITMAP splash_bitmap) {
     ptOrigin.x = monitorinfo.rcWork.left + (monitorinfo.rcWork.right - monitorinfo.rcWork.left - sizeSplash.cx) / 2;
     ptOrigin.y = monitorinfo.rcWork.top + (monitorinfo.rcWork.bottom - monitorinfo.rcWork.top - sizeSplash.cy) / 2;
 
+#if _NUITKA_TRACE
+    printf("Onefile: Splash screen origin %d %d for sizes %d %d\n", ptOrigin.x, ptOrigin.y, sizeSplash.cx,
+           sizeSplash.cy);
+#endif
     // Create a DC with splash bitmap
     HDC handle_screen = GetDC(NULL);
     HDC handle_memory = CreateCompatibleDC(handle_screen);
     HBITMAP handle_old_bitmap = (HBITMAP)SelectObject(handle_memory, splash_bitmap);
 
     // Set image alpha channel for blending.
+    // spell-checker: ignore BLENDFUNCTION
     BLENDFUNCTION blend = {0};
     blend.BlendOp = AC_SRC_OVER;
     blend.SourceConstantAlpha = 255;
@@ -183,28 +197,35 @@ static wchar_t splash_indicator_path[4096] = {0};
 bool splash_active = false;
 
 extern "C" void initSplashScreen(void) {
+    NUITKA_PRINT_TIMING("ONEFILE: Initialize splash screen.");
+
     CoInitialize(NULL);
     IStream *image_stream = createImageStream();
-    if (image_stream == NULL) {
+    if (unlikely(image_stream == NULL)) {
+        NUITKA_PRINT_TIMING("ONEFILE: Failed to create image stream.");
         return;
     }
     IWICBitmapSource *image_source = getBitmapFromImageStream(image_stream);
     image_stream->Release();
-    if (image_source == NULL) {
+    if (unlikely(image_source == NULL)) {
+        NUITKA_PRINT_TIMING("ONEFILE: Failed to get image source from stream.");
         return;
     }
     HBITMAP splash_bitmap = CreateHBITMAP(image_source);
     image_source->Release();
-    if (splash_bitmap == NULL) {
+    if (unlikely(splash_bitmap == NULL)) {
+        NUITKA_PRINT_TIMING("ONEFILE: Failed to get bitmap.");
         return;
     }
 
     splash_window = createSplashWindow(splash_bitmap);
 
+    // TODO: This probably should be user provided.
     wchar_t const *pattern = L"{TEMP}\\onefile_{PID}_splash_feedback.tmp";
     BOOL bool_res =
         expandTemplatePathW(splash_indicator_path, pattern, sizeof(splash_indicator_path) / sizeof(wchar_t));
-    if (bool_res == false) {
+    if (unlikely(bool_res == false)) {
+        NUITKA_PRINT_TIMING("Failed expand indicator path.");
         return;
     }
 
@@ -218,6 +239,8 @@ extern "C" void initSplashScreen(void) {
 }
 
 static void closeSplashScreen(void) {
+    NUITKA_PRINT_TIMING("ONEFILE: Check splash screen indicator file.");
+
     if (splash_window) {
         DestroyWindow(splash_window);
         splash_window = 0;
@@ -226,6 +249,8 @@ static void closeSplashScreen(void) {
 
 extern "C" bool checkSplashScreen(void) {
     if (splash_active) {
+        NUITKA_PRINT_TIMING("ONEFILE: Check splash screen indicator file.");
+
         if (!PathFileExistsW(splash_indicator_path)) {
             closeSplashScreen();
             splash_active = false;

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/nuitka/freezer/DllDependenciesMacOS.py

@@ -16,6 +16,7 @@ from nuitka.PythonVersions import python_version
 from nuitka.Tracing import inclusion_logger
 from nuitka.utils.FileOperations import (
     areSamePaths,
+    changeFilenameExtension,
     getReportPath,
     isFilenameBelowPath,
 )
@@ -144,6 +145,9 @@ def _getNonVersionedDllFilenames2(filename):
         if getArchitecture() == "arm64":
             yield match.group(1) + "_arm64.dylib"
 
+    if filename.endswith(".so"):
+        yield changeFilenameExtension(filename, ".dylib")
+
 
 def _getNonVersionedDllFilenames(dll_filename, package_name):
     for filename in _getNonVersionedDllFilenames2(dll_filename):
@@ -257,30 +261,39 @@ def _resolveBinaryPathDLLsMacOS(
                     break
 
         # Sometimes self-dependencies are on a numbered version, but deployed is
-        # one version without it. The macOS just ignores that, and so we do.
+        # one version without it. Also be tolerant about changing suffixes
+        # internally. The macOS just ignores that, and so we do.
         if not os.path.exists(resolved_path):
             if os.path.basename(resolved_path) == os.path.basename(binary_filename):
                 resolved_path = binary_filename
             else:
-                match = re.match(r"^(.*?)(\.\d+)+\.dylib$", resolved_path)
+                for suffix1, suffix2 in (
+                    (".dylib", ".dylib"),
+                    (".so", ".so"),
+                    (".dylib", ".so"),
+                    (".so", ".dylib"),
+                ):
+                    pattern = r"^(.*?)(\.\d+)*%s$" % re.escape(suffix1)
 
-                if match:
-                    candidate = match.group(1) + ".dylib"
+                    match = re.match(pattern, resolved_path)
 
-                    if os.path.exists(candidate):
-                        resolved_path = candidate
-                    else:
-                        candidate = os.path.join(
-                            original_dir, os.path.basename(candidate)
-                        )
+                    if match:
+                        candidate = match.group(1) + suffix2
 
                         if os.path.exists(candidate):
                             resolved_path = candidate
-                        elif os.path.basename(candidate) == os.path.basename(
-                            binary_filename
-                        ):
-                            # Versioned dependency on itself in non-existent path.
-                            resolved_path = binary_filename
+                        else:
+                            candidate = os.path.join(
+                                original_dir, os.path.basename(candidate)
+                            )
+
+                            if os.path.exists(candidate):
+                                resolved_path = candidate
+                            elif os.path.basename(candidate) == os.path.basename(
+                                binary_filename
+                            ):
+                                # Versioned dependency on itself in non-existent path.
+                                resolved_path = binary_filename
 
         if not os.path.exists(resolved_path):
             acceptable, plugin_name = Plugins.isAcceptableMissingDLL(

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/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'"

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.10}/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.7 → nuitka_winsvc-2.4.10}/nuitka/importing/ImportResolving.py

@@ -165,6 +165,10 @@ def resolveModuleName(module_name):
         return module_name.relocateModuleNamespace(
             "importlib_resources", "importlib.resources"
         )
+    elif module_name.hasNamespace("tensorflow.keras"):
+        return module_name.relocateModuleNamespace(
+            "tensorflow.keras", "keras._tf_keras.keras"
+        )
     else:
         return module_name