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

nuitka/freezer/ImportDetection.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     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, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Detect imports made for code by Python.
 
 In the freezer, this is a step done to detect the technically needed modules to
@@ -151,6 +137,9 @@ print("\\n".join(sorted(
                     "_collections_abc.py",
                     "_collections_abc.pyc",
                 ):
+                    if python_version >= 0x3D0:
+                        detections.append((module_name, 2, "sourcefile", filename))
+
                     module_name = ModuleName("_collections_abc")
 
                 if filename.endswith(".py"):
@@ -224,6 +213,7 @@ def _detectEarlyImports():
         "base64_codec",
         "hex_codec",
         "rot_13",
+        "punycode",
     ):
         if non_locale_encoding in encoding_names:
             encoding_names.remove(non_locale_encoding)
@@ -348,3 +338,19 @@ def detectStdlibAutoInclusionModules():
         _stdlib_modules_names = tuple(sorted(_stdlib_modules_names))
 
     return _stdlib_modules_names
+
+
+#     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/freezer/IncludedDataFiles.py

@@ -1,20 +1,6 @@
-#     Copyright 2023, Kay Hayen, mailto:kay.hayen@gmail.com
-#
-#     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, Kay Hayen, mailto:kay.hayen@gmail.com find license text at end of file
+
+
 """ Included data files for standalone mode.
 
 This keeps track of data files for standalone mode. Do not should them for
@@ -28,24 +14,31 @@ import os
 from nuitka.containers.OrderedDicts import OrderedDict
 from nuitka.containers.OrderedSets import OrderedSet
 from nuitka.Options import (
+    getOutputPath,
     getShallIncludeDataDirs,
     getShallIncludeDataFiles,
+    getShallIncludeExternallyDataFilePatterns,
     getShallIncludePackageData,
+    getShallIncludeRawDirs,
     getShallNotIncludeDataFilePatterns,
+    isAcceleratedMode,
     isOnefileMode,
     isStandaloneMode,
     shallMakeModule,
 )
 from nuitka.OutputDirectories import getStandaloneDirectoryPath
-from nuitka.Tracing import options_logger
+from nuitka.Tracing import general, options_logger
 from nuitka.utils.FileOperations import (
+    areSamePaths,
     containsPathElements,
     copyFileWithPermissions,
     getFileContents,
     getFileList,
     getFilenameExtension,
     getFileSize,
+    getNormalizedPath,
     isFilenameBelowPath,
+    isLegalPath,
     isRelativePath,
     makePath,
     openTextFile,
@@ -107,14 +100,22 @@ 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(self.dest_path)
+        if not is_legal:
+            general.sysexit(
+                "Error, cannot add data file with '%s' path, as '%s'"
+                % (dest_path, illegal_reason)
+            )
+
         self.reason = reason
         self.data = data
         self.tags = tags_set
         self.tracer = tracer
 
     def __repr__(self):
-        return "<%s %s source %s dest %s reason '%s' tags '%s'>" % (
+        return "<%s %s source '%s' dest '%s' reason '%s' tags '%s'>" % (
             self.__class__.__name__,
             self.kind,
             self.source_path,
@@ -157,18 +158,6 @@ def makeIncludedDataFile(source_path, dest_path, reason, tracer, tags):
     if "framework_resource" in tags and not isMacOS():
         tracer.sysexit("Using resource files on non-MacOS")
 
-    inside = True
-    if not isRelativePath(dest_path):
-        if "framework_resource" in tags and not isOnefileMode():
-            inside = isRelativePath(os.path.join("Resources", dest_path))
-        else:
-            inside = False
-
-    if not inside:
-        tracer.sysexit(
-            "Error, cannot use dest path '%s' outside of distribution." % dest_path
-        )
-
     # Refuse directories, these must be kept distinct.
     if os.path.isdir(source_path):
         tracer.sysexit(
@@ -176,6 +165,28 @@ def makeIncludedDataFile(source_path, dest_path, reason, tracer, tags):
             % source_path
         )
 
+    # In accelerated mode, data files can be everywhere, but they cannot
+    # change place.
+    if isAcceleratedMode():
+        if "copy" in tags:
+            if "package_data" not in tags and not areSamePaths(source_path, dest_path):
+                tracer.sysexit(
+                    "Error, cannot change paths for data files in accelerated mode from '%s' to '%s'."
+                    % (source_path, dest_path)
+                )
+    else:
+        inside = True
+        if not isRelativePath(dest_path):
+            if "framework_resource" in tags and not isOnefileMode():
+                inside = isRelativePath(os.path.join("Resources", dest_path))
+            else:
+                inside = False
+
+        if not inside:
+            tracer.sysexit(
+                "Error, cannot use dest path '%s' outside of distribution." % dest_path
+            )
+
     return IncludedDataFile(
         kind="data_file",
         source_path=source_path,
@@ -196,8 +207,11 @@ default_ignored_suffixes = (
     ".pyi",
     ".so",
     ".pyd",
+    ".pyx",
     ".dll",
     ".dylib",
+    ".exe",
+    ".bin",
 )
 
 default_ignored_suffixes += getSharedLibrarySuffixes()
@@ -205,6 +219,7 @@ default_ignored_suffixes += getSharedLibrarySuffixes()
 default_ignored_dirs = (
     "__pycache__",
     "site-packages",
+    "dist-packages",
     "vendor-packages",
 )
 
@@ -224,13 +239,22 @@ def makeIncludedDataDirectory(
     ignore_suffixes=(),
     only_suffixes=(),
     normalize=True,
+    raw=False,
 ):
     assert isRelativePath(dest_path), dest_path
     assert os.path.isdir(source_path), source_path
 
-    ignore_dirs = tuple(ignore_dirs) + default_ignored_dirs
-    ignore_filenames = tuple(ignore_filenames) + default_ignored_filenames
-    ignore_suffixes = tuple(ignore_suffixes) + default_ignored_suffixes
+    ignore_dirs = tuple(ignore_dirs)
+    if not raw:
+        ignore_dirs += default_ignored_dirs
+
+    ignore_filenames = tuple(ignore_filenames)
+    if not raw:
+        ignore_filenames += default_ignored_filenames
+
+    ignore_suffixes = tuple(ignore_suffixes)
+    if not raw:
+        ignore_suffixes += default_ignored_suffixes
 
     for filename in getFileList(
         source_path,
@@ -252,7 +276,7 @@ def makeIncludedDataDirectory(
             tags=tags,
         )
 
-        included_datafile.tags.add("data-dir-contents")
+        included_datafile.tags.add("raw-dir-contents" if raw else "data-dir-contents")
 
         yield included_datafile
 
@@ -282,11 +306,11 @@ _included_data_files = []
 def addIncludedDataFile(included_datafile):
     included_datafile.tags.update(getDataFileTags(included_datafile.dest_path))
 
-    for noinclude_datafile_pattern in getShallNotIncludeDataFilePatterns():
+    for external_datafile_pattern in getShallNotIncludeDataFilePatterns():
         if fnmatch.fnmatch(
-            included_datafile.dest_path, noinclude_datafile_pattern
+            included_datafile.dest_path, external_datafile_pattern
         ) or isFilenameBelowPath(
-            path=noinclude_datafile_pattern, filename=included_datafile.dest_path
+            path=external_datafile_pattern, filename=included_datafile.dest_path
         ):
             included_datafile.tags.add("inhibit")
             included_datafile.tags.remove("copy")
@@ -303,6 +327,15 @@ def addIncludedDataFile(included_datafile):
     #     if candidate.dest_path == included_datafile.dest_path:
     #         assert False, included_datafile
 
+    if included_datafile.needsCopy():
+        for external_datafile_pattern in getShallIncludeExternallyDataFilePatterns():
+            if fnmatch.fnmatch(
+                included_datafile.dest_path, external_datafile_pattern
+            ) or isFilenameBelowPath(
+                path=external_datafile_pattern, filename=included_datafile.dest_path
+            ):
+                included_datafile.tags.add("external")
+
     _included_data_files.append(included_datafile)
 
 
@@ -311,6 +344,8 @@ def getIncludedDataFiles():
 
 
 def _addIncludedDataFilesFromFileOptions():
+    # Many different option variants, pylint: disable=too-many-branches
+
     for pattern, source_path, dest_path, arg in getShallIncludeDataFiles():
         filenames = resolveShellPatternToFilenames(pattern)
 
@@ -326,6 +361,8 @@ def _addIncludedDataFilesFromFileOptions():
             else:
                 rel_path = os.path.join(dest_path, relpath(filename, source_path))
 
+            rel_path = os.path.normpath(rel_path)
+
             if containsPathElements(rel_path, default_ignored_dirs):
                 continue
 
@@ -348,7 +385,7 @@ def _addIncludedDataFilesFromFileOptions():
 
         for included_datafile in makeIncludedDataDirectory(
             source_path=source_path,
-            dest_path=dest_path,
+            dest_path=os.path.normpath(dest_path),
             reason="specified data dir '%s' on command line" % source_path,
             tracer=options_logger,
             tags="user",
@@ -360,6 +397,24 @@ def _addIncludedDataFilesFromFileOptions():
         if count == 0:
             options_logger.warning("No data files in directory '%s.'" % source_path)
 
+    for source_path, dest_path in getShallIncludeRawDirs():
+        count = 0
+
+        for included_datafile in makeIncludedDataDirectory(
+            source_path=source_path,
+            dest_path=os.path.normpath(dest_path),
+            reason="specified raw dir '%s' on command line" % source_path,
+            tracer=options_logger,
+            tags="user",
+            raw=True,
+        ):
+            yield included_datafile
+
+            count += 1
+
+        if count == 0:
+            options_logger.warning("No files in raw directory '%s.'" % source_path)
+
 
 def addIncludedDataFilesFromFileOptions():
     """Early data files, from user options that work with file system."""
@@ -505,7 +560,25 @@ def _reportDataFiles():
     _data_file_traces.clear()
 
 
-def _handleDataFile(included_datafile):
+def _checkPathConflict(dest_path, standalone_entry_points):
+    assert getNormalizedPath(dest_path) == dest_path
+
+    while dest_path:
+        for standalone_entry_point in standalone_entry_points:
+            if dest_path == standalone_entry_point.dest_path:
+                options_logger.sysexit(
+                    """\
+Error, data file to be placed in distribution as '%s' conflicts with %s '%s'."""
+                    % (
+                        dest_path,
+                        standalone_entry_point.kind,
+                        standalone_entry_point.dest_path,
+                    )
+                )
+        dest_path = os.path.dirname(dest_path)
+
+
+def _handleDataFile(included_datafile, standalone_entry_points):
     """Handle a data file."""
     tracer = included_datafile.tracer
 
@@ -517,24 +590,28 @@ def _handleDataFile(included_datafile):
             "Error, package data files are only included in standalone or onefile mode."
         )
 
-    dist_dir = getStandaloneDirectoryPath()
-
     key = tracer, included_datafile.reason
     if key not in _data_file_traces:
         _data_file_traces[key] = []
 
     _data_file_traces[key].append((included_datafile.kind, included_datafile.dest_path))
 
-    if included_datafile.kind == "data_blob":
+    dist_dir = getStandaloneDirectoryPath()
+
+    if "external" in included_datafile.tags:
+        dest_path = getOutputPath(included_datafile.dest_path)
+    else:
+        _checkPathConflict(included_datafile.dest_path, standalone_entry_points)
         dest_path = os.path.join(dist_dir, included_datafile.dest_path)
+
+    if included_datafile.kind == "data_blob":
         makePath(os.path.dirname(dest_path))
 
         with openTextFile(filename=dest_path, mode="wb") as output_file:
             output_file.write(included_datafile.data)
     elif included_datafile.kind == "data_file":
-        dest_path = os.path.join(dist_dir, included_datafile.dest_path)
-
         makePath(os.path.dirname(dest_path))
+
         copyFileWithPermissions(
             source_path=included_datafile.source_path,
             dest_path=dest_path,
@@ -544,7 +621,7 @@ def _handleDataFile(included_datafile):
         assert False, included_datafile
 
 
-def copyDataFiles():
+def copyDataFiles(standalone_entry_points):
     """Copy the data files needed for standalone distribution.
 
     Notes:
@@ -572,7 +649,24 @@ plugins '--embed-*' options. Not done for '%s'."""
                 )
 
             _handleDataFile(
-                included_datafile,
+                included_datafile=included_datafile,
+                standalone_entry_points=standalone_entry_points,
             )
 
     _reportDataFiles()
+
+
+#     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.