Nuitka-winsvc 1.8__cp311-cp311-win_amd64.whl → 2.5.1__cp311-cp311-win_amd64.whl

nuitka/plugins/standard/TkinterPlugin.py

@@ -1,30 +1,17 @@
-#     Copyright 2023, Jorj McKie, mailto:<jorj.x.mckie@outlook.de>
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Jorj McKie, mailto:<jorj.x.mckie@outlook.de> find license text at end of file
+
+
 """ Details see below in class definition.
 """
+
 import os
 import sys
 
-from nuitka import Options
+from nuitka.Options import isStandaloneMode, shallCreateAppBundle
 from nuitka.plugins.PluginBase import NuitkaPluginBase
-from nuitka.PythonVersions import getSystemPrefixPath
-from nuitka.utils.FileOperations import listDllFilesFromDirectory, relpath
-from nuitka.utils.Utils import isWin32Windows
+from nuitka.PythonFlavors import isHomebrewPython
+from nuitka.PythonVersions import getSystemPrefixPath, getTkInterVersion
+from nuitka.utils.Utils import isMacOS, isWin32Windows
 
 # spell-checker: ignore tkinterdnd,tkdnd,tcltk
 
@@ -34,6 +21,17 @@ def _isTkInterModule(module):
     return full_name in ("Tkinter", "tkinter", "PySimpleGUI", "PySimpleGUI27")
 
 
+def _getHomebrewPrefix(logger):
+    result = os.path.normpath(
+        os.path.join(getSystemPrefixPath(), "..", "..", "..", "..", "..", "..", "..")
+    )
+
+    if not os.path.isdir(result):
+        logger.sysexit("Error, failed to determine Homebrew prefix, report this bug.")
+
+    return result
+
+
 class NuitkaPluginTkinter(NuitkaPluginBase):
     """This class represents the main logic of the TkInter plugin.
 
@@ -68,7 +66,18 @@ class NuitkaPluginTkinter(NuitkaPluginBase):
         self.tcl_library_dir = tcl_library_dir
         self.tk_library_dir = tk_library_dir
 
-        self.files_copied = False  # ensure one-time action
+        # ensure one-time action, we deal with two names for the execution, yet we
+        # only want to do it once.
+        self.files_copied = False
+
+        self.tk_inter_version = getTkInterVersion()
+
+        if self.tk_inter_version is None:
+            self.sysexit("Error, it seems tk-inter is not installed.")
+
+        # Only ever saw these 2 in use.
+        assert self.tk_inter_version in ("8.5", "8.6"), self.tk_inter_version
+
         return None
 
     @classmethod
@@ -78,7 +87,7 @@ class NuitkaPluginTkinter(NuitkaPluginBase):
         Returns:
             True if this is a standalone, else False.
         """
-        return Options.isStandaloneMode()
+        return isStandaloneMode()
 
     @staticmethod
     def createPreModuleLoadCode(module):
@@ -125,74 +134,62 @@ 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",
-        )
-
-    @staticmethod
-    def _getTclCandidatePaths():
+    def _getTclCandidatePaths(self):
         # Check typical locations of the dirs
-        yield os.environ.get("TCL_LIBRARY")
+        yield os.getenv("TCL_LIBRARY")
 
+        # Inside the Python install, esp. on Windows.
         for sys_prefix_path in (sys.prefix, getSystemPrefixPath()):
-            yield os.path.join(sys_prefix_path, "tcl", "tcl8.5")
-            yield os.path.join(sys_prefix_path, "tcl", "tcl8.6")
-            yield os.path.join(sys_prefix_path, "lib", "tcl8.5")
-            yield os.path.join(sys_prefix_path, "lib", "tcl8.6")
+            yield os.path.join(sys_prefix_path, "tcl", "tcl%s" % self.tk_inter_version)
+            yield os.path.join(sys_prefix_path, "lib", "tcl%s" % self.tk_inter_version)
+
             # Newer Anaconda.
-            yield os.path.join(sys_prefix_path, "Library", "lib", "tcl8.6")
+            yield os.path.join(
+                sys_prefix_path, "Library", "lib", "tcl%s" % self.tk_inter_version
+            )
 
+        # System installs on non-Windows
         if not isWin32Windows():
-            yield "/usr/share/tcltk/tcl8.6"
-            yield "/usr/share/tcltk/tcl8.5"
-            yield "/usr/share/tcl8.6"
-            yield "/usr/share/tcl8.5"
-            yield "/usr/lib64/tcl/tcl8.5"
-            yield "/usr/lib64/tcl/tcl8.6"
+            yield "/usr/share/tcltk/tcl%s" % self.tk_inter_version
+            yield "/usr/share/tcl%s" % self.tk_inter_version
+            yield "/usr/lib64/tcl/tcl%s" % self.tk_inter_version
+            yield "/usr/lib/tcl%s" % self.tk_inter_version
+
+        if isHomebrewPython():
+            yield os.path.normpath(
+                os.path.join(
+                    _getHomebrewPrefix(self),
+                    "lib",
+                    "tcl%s" % self.tk_inter_version,
+                )
+            )
 
-    @staticmethod
-    def _getTkCandidatePaths():
-        yield os.environ.get("TK_LIBRARY")
+    def _getTkCandidatePaths(self):
+        yield os.getenv("TK_LIBRARY")
 
         for sys_prefix_path in (sys.prefix, getSystemPrefixPath()):
-            yield os.path.join(sys_prefix_path, "tcl", "tk8.5")
-            yield os.path.join(sys_prefix_path, "tcl", "tk8.6")
-            yield os.path.join(sys_prefix_path, "lib", "tk8.5")
-            yield os.path.join(sys_prefix_path, "lib", "tk8.6")
+            yield os.path.join(sys_prefix_path, "tcl", "tk%s" % self.tk_inter_version)
+            yield os.path.join(sys_prefix_path, "lib", "tk%s" % self.tk_inter_version)
+
             # Newer Anaconda.
-            yield os.path.join(sys_prefix_path, "Library", "lib", "tk8.6")
+            yield os.path.join(
+                sys_prefix_path, "Library", "lib", "tk%s" % self.tk_inter_version
+            )
 
         if not isWin32Windows():
-            yield "/usr/share/tcltk/tk8.6"
-            yield "/usr/share/tcltk/tk8.5"
-            yield "/usr/share/tk8.6"
-            yield "/usr/share/tk8.5"
-            yield "/usr/lib64/tcl/tk8.5"
-            yield "/usr/lib64/tcl/tk8.6"
+            yield "/usr/share/tcltk/tk%s" % self.tk_inter_version
+            yield "/usr/share/tk%s" % self.tk_inter_version
+            yield "/usr/lib64/tcl/tk%s" % self.tk_inter_version
+            yield "/usr/lib/tk%s" % self.tk_inter_version
+
+        if isHomebrewPython():
+            yield os.path.normpath(
+                os.path.join(
+                    _getHomebrewPrefix(self),
+                    "lib",
+                    "tk%s" % self.tk_inter_version,
+                )
+            )
 
     def considerDataFiles(self, module):
         """Provide TCL libraries to the dist folder.
@@ -208,19 +205,15 @@ 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
 
         tcl_library_dir = self.tcl_library_dir
         if tcl_library_dir is None:
             for tcl_library_dir in self._getTclCandidatePaths():
-                if tcl_library_dir is not None and os.path.exists(tcl_library_dir):
+                if tcl_library_dir is not None and os.path.exists(
+                    os.path.join(tcl_library_dir, "init.tcl")
+                ):
                     break
 
         if tcl_library_dir is None or not os.path.exists(tcl_library_dir):
@@ -233,7 +226,9 @@ that works, report a bug so it can be added to Nuitka."""
         tk_library_dir = self.tk_library_dir
         if tk_library_dir is None:
             for tk_library_dir in self._getTkCandidatePaths():
-                if tk_library_dir is not None and os.path.exists(tk_library_dir):
+                if tk_library_dir is not None and os.path.exists(
+                    os.path.join(tk_library_dir, "dialog.tcl")
+                ):
                     break
 
         if tk_library_dir is None or not os.path.exists(tk_library_dir):
@@ -253,6 +248,9 @@ that works, report a bug."""
         )
         yield self.makeIncludedDataDirectory(
             source_path=tcl_library_dir,
+            ignore_dirs=(
+                ("opt0.4", "http1.0") if isMacOS() and shallCreateAppBundle() else ()
+            ),
             dest_path="tcl",
             reason="Tcl needed for tkinter usage",
             tags="tcl",
@@ -268,26 +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),
-                    package_name="tkinterdnd2",
-                    reason="tkinterdnd2 package DLL",
-                )
-
     def onModuleCompleteSet(self, module_set):
         if str is bytes:
             plugin_binding_name = "Tkinter"
@@ -315,7 +293,7 @@ class NuitkaPluginDetectorTkinter(NuitkaPluginBase):
         Returns:
             True if this is a standalone compilation on Windows, else False.
         """
-        return Options.isStandaloneMode()
+        return isStandaloneMode()
 
     def checkModuleSourceCode(self, module_name, source_code):
         """This method checks the source code
@@ -342,3 +320,19 @@ class NuitkaPluginDetectorTkinter(NuitkaPluginBase):
                 if "tkinter" in line or "Tkinter" in line:
                     self.warnUnusedPlugin("Tkinter needs TCL included.")
                     break
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.

nuitka/plugins/standard/TorchPlugin.py

@@ -1,22 +1,9 @@
-#     Copyright 2023, Jorj McKie, mailto:<jorj.x.mckie@outlook.de>
-#
-#     Part of "Nuitka", an optimizing Python compiler that is compatible and
-#     integrates with CPython, but also works on its own.
-#
-#     Licensed under the Apache License, Version 2.0 (the "License");
-#     you may not use this file except in compliance with the License.
-#     You may obtain a copy of the License at
-#
-#        http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
+#     Copyright 2024, Jorj McKie, mailto:<jorj.x.mckie@outlook.de> find license text at end of file
+
+
 """ Deprecated torch plugin.
 """
+
 from nuitka.plugins.PluginBase import NuitkaPluginBase
 
 
@@ -29,3 +16,19 @@ class NuitkaPluginTorch(NuitkaPluginBase):
     @classmethod
     def isDeprecated(cls):
         return True
+
+
+#     Part of "Nuitka", an optimizing Python compiler that is compatible and
+#     integrates with CPython, but also works on its own.
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.