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

nuitka/build/CCompilerVersion.scons

@@ -1,21 +1,6 @@
 # -*- python -*-
-#     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
+
 
 """
 The CCompileVersion scons file is for version output of the C compiler used with
@@ -69,6 +54,7 @@ from .SconsUtils import (
     getArgumentBool,
     getArgumentDefaulted,
     getArgumentList,
+    getArgumentRequired,
     getExecutablePath,
     initScons,
     isClangName,
@@ -86,6 +72,8 @@ setArguments(ARGUMENTS)
 # Set up the basic stuff.
 initScons()
 
+nuitka_src = getArgumentRequired("nuitka_src")
+
 # Module mode: Create a Python extension module, create an executable otherwise.
 module_mode = getArgumentBool("module_mode", False)
 
@@ -99,12 +87,8 @@ experimental = getArgumentList("experimental", "")
 # good with the compiler in question.
 lto_mode = getArgumentDefaulted("lto_mode", "auto")
 
-# Windows target mode: Compile for Windows. Used to be an option, but we
-# no longer cross compile this way.
-win_target = os.name == "nt"
-
-# Windows subsystem mode: Disable console for windows builds.
-disable_console = getArgumentBool("disable_console", False)
+# Console mode specified
+console_mode = getArgumentDefaulted("console_mode", "attach")
 
 # Unstripped mode: Do not remove debug symbols.
 unstripped_mode = getArgumentBool("unstripped_mode", False)
@@ -122,7 +106,7 @@ clang_mode = getArgumentBool("clang_mode", False)
 # Clang on Windows with no requirement to use MinGW64 or using MSYS2 MinGW flavor,
 # is changed to ClangCL from Visual Studio.
 clangcl_mode = False
-if win_target and not mingw_mode and clang_mode:
+if os.name == "nt" and not mingw_mode and clang_mode:
     clang_mode = False
     clangcl_mode = True
 
@@ -130,7 +114,7 @@ if win_target and not mingw_mode and clang_mode:
 show_scons_mode = getArgumentBool("show_scons", False)
 scons_details_logger.is_quiet = not show_scons_mode
 
-if int(os.environ.get("NUITKA_QUIET", "0")):
+if int(os.getenv("NUITKA_QUIET", "0")):
     setQuiet()
 
 # Forced MSVC version (windows-only)
@@ -148,6 +132,9 @@ macos_min_version = getArgumentDefaulted("macos_min_version", "")
 # Target arch for macOS.
 macos_target_arch = getArgumentDefaulted("macos_target_arch", "")
 
+# gcc compiler cf_protection option
+cf_protection = getArgumentDefaulted("cf_protection", "auto")
+
 # Amount of jobs to use.
 job_count = GetOption("num_jobs")
 
@@ -163,7 +150,7 @@ if "CXX" in os.environ:
 
     cxx_dirname = os.path.dirname(os.environ["CXX"])
 
-    if win_target and isGccName(os.path.basename(os.environ["CXX"])):
+    if os.name == "nt" and isGccName(os.path.basename(os.environ["CXX"])):
         if show_scons_mode:
             my_print("Scons: Environment CXX seems to be a gcc, enable mingw_mode.")
         mingw_mode = True
@@ -184,6 +171,7 @@ env = createEnvironment(
     target_arch=target_arch,
     experimental=experimental,
     no_deployment=(),
+    debug_modes=(),
 )
 
 scons_details_logger.info("Initial CC: %r" % env.get("CC"))
@@ -199,7 +187,7 @@ if "CC" in os.environ:
 elif clangcl_mode:
     # If possible, add Clang directory from MSVC if available.
     addClangClPathFromMSVC(env=env)
-elif clang_mode:
+elif clang_mode and not mingw_mode:
     # If requested by the user, use the clang compiler, overriding what was
     # said in environment.
 
@@ -220,7 +208,8 @@ env.the_compiler = env["CC"] or env["CXX"]
 env.the_cc_name = os.path.normcase(os.path.basename(env.the_compiler))
 env.debug_mode = debug_mode
 env.unstripped_mode = unstripped_mode
-env.disable_console = disable_console
+env.console_mode = console_mode
+env.nuitka_src = nuitka_src
 env.low_memory = False
 env.macos_min_version = macos_min_version
 env.macos_target_arch = macos_target_arch
@@ -236,10 +225,13 @@ env.gcc_mode = isGccName(env.the_cc_name) or clang_mode
 env.clang_mode = clang_mode
 
 # Only use MSVC if not already clear, we are using MinGW.
-env.msvc_mode = win_target and not env.gcc_mode
-env.mingw_mode = win_target and env.gcc_mode
+env.msvc_mode = os.name == "nt" and not env.gcc_mode
+env.mingw_mode = os.name == "nt" and env.gcc_mode
 env.clangcl_mode = clangcl_mode
 
+# gcc compiler cf_protection option
+env.cf_protection = cf_protection
+
 # Consider switching from gcc to its g++ compiler as a workaround that makes us work without C11.
 switchFromGccToGpp(
     env=env,
@@ -253,14 +245,30 @@ env.the_compiler = getExecutablePath(env.the_compiler, env=env)
 # Report the C compiler used.
 reportCCompiler(env, "Version", my_print)
 
-# Set up C compiler settings.
+# Set up C compiler settings, we would use that mode mode outputs.
 setupCCompiler(
     env=env,
     lto_mode=lto_mode,
     pgo_mode="no",  # TODO: Have this here too, decompression might benefit.
     job_count=job_count,
+    onefile_compile=False,
 )
 
 # TODO: Report modes.
 
 sys.exit(0)
+
+#     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/build/DataComposerInterface.py

@@ -1,23 +1,10 @@
-#     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
+
+
 """ Interface to data composer
 
 """
+
 import os
 import subprocess
 import sys
@@ -110,3 +97,19 @@ def deriveModuleConstantsBlobName(filename):
         basename = basename[7:]
 
         return basename
+
+
+#     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/build/Onefile.scons

@@ -1,21 +1,6 @@
 # -*- python -*-
-#     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
+
 
 """
 The Onefile scons file for the bootstrap binary, check out Backend.scons for
@@ -54,6 +39,7 @@ from nuitka.Tracing import (
     scons_logger,
     setQuiet,
 )
+from nuitka.utils.FileOperations import getExternalUsePath
 from nuitka.utils.Utils import isMacOS
 
 from .SconsCaching import enableCcache, enableClcache
@@ -130,6 +116,9 @@ deployment_mode = getArgumentBool("deployment", False)
 # Experimental indications. Do things that are not yet safe to do.
 no_deployment = getArgumentList("no_deployment", "")
 
+# Debug mode indications. Do check things with fine granularity.
+debug_modes = getArgumentList("debug_modes", "")
+
 # Experimental indications. Do things that are not yet safe to do.
 experimental = getArgumentList("experimental", "")
 
@@ -140,12 +129,8 @@ trace_mode = getArgumentBool("trace_mode", False)
 # good with the compiler in question.
 lto_mode = getArgumentDefaulted("lto_mode", "auto")
 
-# Windows target mode: Compile for Windows. Used to be an option, but we
-# no longer cross compile this way.
-win_target = os.name == "nt"
-
-# Windows subsystem mode: Disable console for windows builds.
-disable_console = getArgumentBool("disable_console", False)
+# Console mode specified
+console_mode = getArgumentDefaulted("console_mode", "attach")
 
 # Unstripped mode: Do not remove debug symbols.
 unstripped_mode = getArgumentBool("unstripped_mode", False)
@@ -163,7 +148,7 @@ clang_mode = getArgumentBool("clang_mode", False)
 # Clang on Windows with no requirement to use MinGW64 or using MSYS2 MinGW flavor,
 # is changed to ClangCL from Visual Studio.
 clangcl_mode = False
-if clang_mode and win_target and not mingw_mode:
+if clang_mode and os.name == "nt" and not mingw_mode:
     clang_mode = False
     clangcl_mode = True
 
@@ -171,13 +156,15 @@ if clang_mode and win_target and not mingw_mode:
 show_scons_mode = getArgumentBool("show_scons", False)
 scons_details_logger.is_quiet = not show_scons_mode
 
-if int(os.environ.get("NUITKA_QUIET", "0")):
+if int(os.getenv("NUITKA_QUIET", "0")):
     setQuiet()
 
 # Home of Python to be compiled against, used to find tools like clcache and
 # ccache, no linking against Python is needed here.
 python_prefix = getArgumentRequired("python_prefix")
 
+python_prefix_external = getExternalUsePath(python_prefix)
+
 # Forced MSVC version (windows-only)
 msvc_version = getArgumentDefaulted("msvc_version", None)
 
@@ -202,6 +189,9 @@ macos_min_version = getArgumentDefaulted("macos_min_version", "")
 # Target arch for macOS.
 macos_target_arch = getArgumentDefaulted("macos_target_arch", "")
 
+# gcc compiler cf_protection option
+cf_protection = getArgumentDefaulted("cf_protection", "auto")
+
 if getArgumentBool("progress_bar", True) and not show_scons_mode:
     enableSconsProgressBar()
 
@@ -220,7 +210,7 @@ if "CXX" in os.environ:
 
     cxx_dirname = os.path.dirname(os.environ["CXX"])
 
-    if win_target and isGccName(os.path.basename(os.environ["CXX"])):
+    if os.name == "nt" and isGccName(os.path.basename(os.environ["CXX"])):
         if show_scons_mode:
             my_print("Scons: Environment CXX seems to be a gcc, enable mingw_mode.")
         mingw_mode = True
@@ -241,6 +231,7 @@ env = createEnvironment(
     target_arch=target_arch,
     experimental=experimental,
     no_deployment=no_deployment,
+    debug_modes=debug_modes,
 )
 
 scons_details_logger.info("Initial CC: %r" % env.get("CC"))
@@ -256,7 +247,7 @@ if "CC" in os.environ:
 elif clangcl_mode:
     # If possible, add Clang directory from MSVC if available.
     addClangClPathFromMSVC(env=env)
-elif clang_mode:
+elif clang_mode and not mingw_mode:
     # If requested by the user, use the clang compiler, overriding what was
     # said in environment.
 
@@ -278,8 +269,9 @@ env.the_cc_name = os.path.normcase(os.path.basename(env.the_compiler))
 env.standalone_mode = True  # We are only used in this case.
 env.debug_mode = debug_mode
 env.unstripped_mode = unstripped_mode
-env.disable_console = disable_console
+env.console_mode = console_mode
 env.source_dir = source_dir
+env.nuitka_src = nuitka_src
 env.low_memory = False  # Never a concern in this case.
 env.macos_min_version = macos_min_version
 env.macos_target_arch = macos_target_arch
@@ -295,10 +287,13 @@ env.gcc_mode = isGccName(env.the_cc_name) or clang_mode
 env.clang_mode = clang_mode
 
 # Only use MSVC if not already clear, we are using MinGW.
-env.msvc_mode = win_target and not env.gcc_mode
-env.mingw_mode = win_target and env.gcc_mode
+env.msvc_mode = os.name == "nt" and not env.gcc_mode
+env.mingw_mode = os.name == "nt" and env.gcc_mode
 env.clangcl_mode = clangcl_mode
 
+# gcc compiler cf_protection option
+env.cf_protection = cf_protection
+
 # Consider switching from gcc to its g++ compiler as a workaround that makes us work without C11.
 switchFromGccToGpp(
     env=env,
@@ -311,7 +306,7 @@ if show_scons_mode:
     my_print("Scons: Compiler used", end=" ")
     my_print(getExecutablePath(env.the_compiler, env=env), end=" ")
 
-    if win_target and env.msvc_mode:
+    if os.name == "nt" and env.msvc_mode:
         my_print("(MSVC %s)" % getMsvcVersionString(env))
 
     my_print()
@@ -329,6 +324,7 @@ setupCCompiler(
     lto_mode=lto_mode,
     pgo_mode="no",  # TODO: Have this here too, decompression might benefit.
     job_count=job_count,
+    onefile_compile=True,
 )
 
 # Avoid them as appearing to be different files. TODO: Find out which
@@ -370,14 +366,6 @@ if debug_mode:
             CCFLAGS=[
                 "-Wall",
                 "-Werror",
-                # Unfortunately Py_INCREF(Py_False) triggers aliasing warnings,
-                # which are unfounded, so disable them.
-                "-Wno-error=strict-aliasing",
-                "-Wno-strict-aliasing",
-                # At least for self-compiled Python3.2, and MinGW this happens
-                # and has little use anyway.
-                "-Wno-error=format",
-                "-Wno-format",
             ]
         )
 
@@ -424,8 +412,8 @@ env.Append(
     CPPPATH=[
         source_dir,
         nuitka_include,
-        os.path.join(nuitka_src, "static_src"),
-        os.path.join(nuitka_src, "inline_copy", "zstd"),
+        os.path.join(env.nuitka_src, "static_src"),
+        os.path.join(env.nuitka_src, "inline_copy", "zstd"),
     ],
 )
 
@@ -434,8 +422,6 @@ if env.msvc_mode:
     env.Append(CCFLAGS=["/MT"])  # Multithreaded, static version of C run time.
 
 if isMacOS():
-    env.Append(CPPDEFINES=["_NUITKA_PAYLOAD_FROM_MACOS_SECTION"])
-
     addConstantBlobFile(
         env=env,
         blob_filename=os.path.join(source_dir, "__payload.bin"),
@@ -460,9 +446,8 @@ def discoverSourceFiles():
     # Main onefile bootstrap program
     result.append(
         provideStaticSourceFile(
+            env=env,
             sub_path="OnefileBootstrap.c",
-            nuitka_src=nuitka_src,
-            source_dir=source_dir,
             c11_mode=env.c11_mode,
         )
     )
@@ -470,9 +455,8 @@ def discoverSourceFiles():
     if onefile_splash_screen:
         result.append(
             provideStaticSourceFile(
+                env=env,
                 sub_path="OnefileSplashScreen.cpp",
-                nuitka_src=nuitka_src,
-                source_dir=source_dir,
                 c11_mode=False,
             )
         )
@@ -507,7 +491,6 @@ env.Append(LIBS=link_libraries)
 # Work around windows bugs and use watchdogs to track progress of compilation.
 enableSpawnMonitoring(
     env=env,
-    win_target=win_target,
     module_mode=module_mode,
     source_files=source_files,
 )
@@ -517,12 +500,13 @@ enableSpawnMonitoring(
 changeKeyboardInterruptToErrorExit()
 
 # Check if ccache is installed, and complain if it is not.
-if env.gcc_mode and not disable_ccache:
+if env.gcc_mode:
     enableCcache(
         env=env,
         source_dir=source_dir,
-        python_prefix=python_prefix,
+        python_prefix=python_prefix_external,
         assume_yes_for_downloads=assume_yes_for_downloads,
+        disable_ccache=disable_ccache,
     )
 
 if env.msvc_mode and not disable_ccache:
@@ -557,12 +541,24 @@ if env.gcc_mode:
         env=env,
     )
 
-writeSconsReport(
-    env=env,
-    source_dir=source_dir,
-)
+writeSconsReport(env=env, target=target)
 
 setSconsProgressBarTotal(name="Onefile", total=len(source_files))
 
 scons_details_logger.info("Launching Scons target: %s" % target)
 env.Default(target)
+
+#     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.