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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.4.7
+Version: 2.4.8
 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.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: Nuitka-winsvc
-Version: 2.4.7
+Version: 2.4.8
 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.8}/nuitka/Version.py

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

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.8}/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.8}/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.8}/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.8}/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.8}/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.8}/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.8}/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
 

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.8}/nuitka/plugins/standard/standard.nuitka-package.config.yml

@@ -4047,10 +4047,20 @@
     - dirs:
         - '.'
 
-- module-name: 'pygame' # checksum: 8c9db0be
+- module-name: 'pygame' # checksum: face0a9
   data-files:
     - patterns:
         - 'freesansbold.ttf'
+    - patterns:
+        - 'pygame_icon_mac.bmp'
+      when: 'macos'
+    - patterns:
+        - 'pygame_icon.bmp'
+      when: 'not macos'
+
+  implicit-imports:
+    - depends:
+        - 'pygame.*'
 
   options:
     checks:
@@ -6296,7 +6306,7 @@
         'notebook': "'(lambda: None)'"
       when: 'not use_ipython'
 
-- module-name: 'tensorflow' # checksum: 13d6e6a5
+- module-name: 'tensorflow' # checksum: 7bd997cd
   dlls:
     - from_filenames:
         relative_path: 'core/platform'
@@ -6317,6 +6327,8 @@
         'from tensorflow._api.v1 import test': 'test = None'
         'from ._api.v2 import test': 'test = None'
         'from tensorflow._api.v2 import test': 'test = None'
+      replacements:
+        '_os.environ.get("TF_USE_LEGACY_KERAS", None)': 'repr(os.getenv("TF_USE_LEGACY_KERAS", None))'
       append_plain: |
         import sys
         sys.modules["tensorflow.compat"] = compat
@@ -6336,13 +6348,21 @@
     - depends:
         - 'tensorboard'
         - 'tensorflow_estimator'
+    - depends:
         - 'keras.api._v2.keras'
+      when: 'version("keras") < (3,)'
+    - depends:
+        - 'keras._tf_keras.keras'
+      when: 'version("keras") >= (3,)'
 
   options:
     checks:
       - description: "'tensorflow' is not fully supported before version 2.16"
         support_info: 'warning'
         when: 'version("tensorflow") < (2,16)'
+      - description: "'tensorflow' is not fully supported with legacy keras"
+        support_info: 'warning'
+        when: 'os.getenv("TF_USE_LEGACY_KERAS", None) is not None'
 
 - module-name: 'tensorflow._api.v1.compat.v1' # checksum: 3e84bd8b
   anti-bloat:
@@ -6737,13 +6757,13 @@
       change_function:
         '_copy_fn': "'(lambda fn: fn)'"
 
-- module-name: 'tensorflow.python.util.lazy_loader' # checksum: f4d18284
+- module-name: 'tensorflow.python.util.lazy_loader' # checksum: b554bf0
   anti-bloat:
     - description: 'reduce keras usage'
       replacements_re:
         '(package_name = "(.*?)")': '\1; import \2'
       replacements:
-        'os.environ.get("TF_USE_LEGACY_KERAS", None)': 'repr(os.environ.get("TF_USE_LEGACY_KERAS", None))'
+        'os.environ.get("TF_USE_LEGACY_KERAS", None)': 'repr(os.getenv("TF_USE_LEGACY_KERAS", None))'
         'keras.__version__': 'repr(version_str("keras"))'
 
 - module-name: 'tensorflow.python.util.tf_inspect' # checksum: 8e3a3cbf
@@ -7582,11 +7602,15 @@
         '"IPython" in sys.modules': 'False'
       when: 'not use_ipython'
 
-- module-name: 'trio._core._run' # checksum: 44a998aa
+- module-name: 'trio._core._run' # checksum: 8aed5b01
   anti-bloat:
     - description: 'workaround for trio compatibility'
       replacements_plain:
         'coro.cr_frame.f_locals.setdefault(LOCALS_KEY_KI_PROTECTION_ENABLED, system_task)': ''
+    - description: 'workaround for trio compatibility'
+      replacements_plain:
+        'assert coro.cr_frame is not None, "Coroutine frame should exist"': ''
+      when: 'version("trio") >= (0,26,1)'
 
 - module-name: 'tsdownsample._rust' # checksum: d072aa03
   implicit-imports:

{nuitka_winsvc-2.4.7 → nuitka_winsvc-2.4.8}/nuitka/reports/Reports.py

@@ -205,6 +205,9 @@ def _getReportInputData(aborted):
     os_name = getOS()
     arch_name = getArchitecture()
 
+    # Record system encoding, spell-checker: ignore getfilesystemencoding
+    filesystem_encoding = sys.getfilesystemencoding()
+
     if isWin32OrPosixWindows():
         os_release = str(getWindowsRelease())
     elif isLinux():
@@ -712,6 +715,7 @@ def writeCompilationReport(report_filename, report_input_data, diffable):
         os_name=report_input_data["os_name"],
         os_release=report_input_data["os_release"],
         arch_name=report_input_data["arch_name"],
+        filesystem_encoding=report_input_data["filesystem_encoding"],
     )
 
     search_path = getPackageSearchPath(None)