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

nuitka/OptionParsing.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
+
+
 """ Command line options of Nuitka.
 
 These provide only the optparse options to use, and the mechanic to actually
@@ -30,8 +16,10 @@ pretty good.
 import os
 import re
 import sys
+from string import Formatter
 
 from nuitka.PythonFlavors import getPythonFlavorName
+from nuitka.PythonVersions import isPythonWithGil
 from nuitka.utils.CommandLineOptions import SUPPRESS_HELP, makeOptionsParser
 from nuitka.utils.FileOperations import getFileContentByLine
 from nuitka.utils.Utils import (
@@ -49,15 +37,18 @@ from nuitka.Version import getCommercialVersion, getNuitkaVersion
 
 # Indicator if we were called as "nuitka-run" in which case we assume some
 # other defaults and work a bit different with parameters.
-is_nuitka_run = os.path.basename(sys.argv[0]).lower().endswith("-run")
+_nuitka_binary_name = os.path.basename(sys.argv[0])
+if _nuitka_binary_name == "__main__.py":
+    _nuitka_binary_name = "%s -m nuitka" % os.path.basename(sys.executable)
+is_nuitka_run = _nuitka_binary_name.lower().endswith("-run")
 
 if not is_nuitka_run:
-    usage = "usage: %prog [--module] [--run] [options] main_module.py"
+    usage_template = "usage: %s [--module] [--run] [options] main_module.py"
 else:
-    usage = "usage: %prog [options] main_module.py"
+    usage_template = "usage: %s [options] main_module.py"
 
 
-parser = makeOptionsParser(usage=usage)
+parser = makeOptionsParser(usage=usage_template % _nuitka_binary_name)
 
 parser.add_option(
     "--version",
@@ -75,7 +66,21 @@ parser.add_option(
     dest="module_mode",
     default=False,
     help="""\
-Create an extension module executable instead of a program. Defaults to off.""",
+Create an importable binary extension module executable instead of a program. Defaults to off.""",
+)
+
+parser.add_option(
+    "--mode",
+    action="store",
+    dest="compilation_mode",
+    metavar="COMPILATION_MODE",
+    choices=("onefile", "standalone", "accelerated", "module"),
+    default=None,
+    help="""\
+Mode in which to compile. Accelerated runs in your Python
+installation and depends on it. Standalone creates a folder
+with an executable contained to run it. Onefile creates a
+single executable to deploy. Default is 'accelerated'.""",
 )
 
 parser.add_option(
@@ -104,6 +109,7 @@ parser.add_option(
     action="store_true",
     dest="is_onefile",
     default=False,
+    github_action_default=True,
     help="""\
 On top of standalone mode, enable onefile mode. This means not a folder,
 but a compressed executable is created and used. Defaults to off.""",
@@ -117,16 +123,6 @@ parser.add_option(
     help=SUPPRESS_HELP,
 )
 
-parser.add_option(
-    "--python-debug",
-    action="store_true",
-    dest="python_debug",
-    default=None,
-    help="""\
-Use debug version or not. Default uses what you are using to run Nuitka, most
-likely a non-debug version.""",
-)
-
 parser.add_option(
     "--python-flag",
     action="append",
@@ -144,17 +140,30 @@ load outside code) and "-m" (package mode, compile as "package.__main__").
 Default empty.""",
 )
 
+parser.add_option(
+    "--python-debug",
+    action="store_true",
+    dest="python_debug",
+    default=None,
+    help="""\
+Use debug version or not. Default uses what you are using to run Nuitka, most
+likely a non-debug version. Only for debugging and testing purposes.""",
+)
+
 parser.add_option(
     "--python-for-scons",
     action="store",
     dest="python_scons",
     metavar="PATH",
     default=None,
+    github_action=False,
     help="""\
-If using Python3.3 or Python3.4, provide the path of a Python binary to use
-for Scons. Otherwise Nuitka can use what you run Nuitka with or a Python
-installation from Windows registry. On Windows Python 3.5 or higher is
-needed. On non-Windows, Python 2.6 or 2.7 will do as well.""",
+When compiling with Python 3.4 provide the path of a
+Python binary to use for Scons. Otherwise Nuitka can
+use what you run Nuitka with, or find Python installation,
+e.g. from Windows registry. On Windows, a Python 3.5 or
+higher is needed. On non-Windows, a Python 2.6 or 2.7
+will do as well.""",
 )
 
 parser.add_option(
@@ -180,11 +189,13 @@ parser.add_option(
     action="store_true",
     dest="github_workflow_options",
     default=False,
-    help=SUPPRESS_HELP,
+    github_action=False,
+    help=SUPPRESS_HELP,  # For use in GitHub Action only.
 )
 
 include_group = parser.add_option_group(
-    "Control the inclusion of modules and packages in result"
+    "Control the inclusion of modules and packages in result",
+    link="include-section",
 )
 
 include_group.add_option(
@@ -292,8 +303,8 @@ follow_group.add_option(
     default=[],
     help="""\
 Do not follow to that module name even if used, or if a package name, to the
-whole package in any case, overrides all other options. Can be given multiple
-times. Default empty.""",
+whole package in any case, overrides all other options. This can also contain
+patterns, e.g. "*.tests". Can be given multiple times. Default empty.""",
 )
 
 follow_group.add_option(
@@ -329,9 +340,9 @@ onefile_group.add_option(
     default=None,
     help="""\
 Use this as a folder to unpack to in onefile mode. Defaults to
-'%TEMP%/onefile_%PID%_%TIME%', i.e. user temporary directory
+'{TEMP}/onefile_{PID}_{TIME}', i.e. user temporary directory
 and being non-static it's removed. Use e.g. a string like
-'%CACHE_DIR%/%COMPANY%/%PRODUCT%/%VERSION%' which is a good
+'{CACHE_DIR}/{COMPANY}/{PRODUCT}/{VERSION}' which is a good
 static cache path, this will then not be removed.""",
 )
 
@@ -358,6 +369,16 @@ When creating the onefile, disable compression of the payload. This is
 mostly for debug purposes, or to save time. Default is off.""",
 )
 
+onefile_group.add_option(
+    "--onefile-as-archive",
+    action="store_true",
+    dest="onefile_as_archive",
+    default=False,
+    help="""\
+When creating the onefile, use an archive format, that can be unpacked
+with "nuitka-onefile-unpack" rather than a stream that only the onefile
+program itself unpacks. Default is off.""",
+)
 
 del onefile_group
 
@@ -395,7 +416,7 @@ allowed forms. With '--include-data-files=/path/to/file/*.txt=folder_name/some.t
 will copy a single file and complain if it's multiple. With
 '--include-data-files=/path/to/files/*.txt=folder_name/' it will put
 all matching files into that folder. For recursive copy there is a
-form with 3 values that '--include-data-files=/path/to/scan=folder_name=**/*.txt'
+form with 3 values that '--include-data-files=/path/to/scan=folder_name/=**/*.txt'
 that will preserve directory structure. Default empty.""",
 )
 
@@ -409,9 +430,8 @@ data_group.add_option(
 Include data files from complete directory in the distribution. This is
 recursive. Check '--include-data-files' with patterns if you want non-recursive
 inclusion. An example would be '--include-data-dir=/path/some_dir=data/some_dir'
-for plain copy, of the whole directory. All files are copied, if you want to
-exclude files you need to remove them beforehand, or use '--noinclude-data-files'
-option to remove them. Default empty.""",
+for plain copy, of the whole directory. All non-code files are copied, if you
+want to use '--noinclude-data-files' option to remove them. Default empty.""",
 )
 
 data_group.add_option(
@@ -423,8 +443,22 @@ data_group.add_option(
     help="""\
 Do not include data files matching the filename pattern given. This is against
 the target filename, not source paths. So to ignore a file pattern from package
-data for "package_name" should be matched as "package_name/*.txt". Or for the
-whole directory simply use "package_name". Default empty.""",
+data for 'package_name' should be matched as 'package_name/*.txt'. Or for the
+whole directory simply use 'package_name'. Default empty.""",
+)
+
+data_group.add_option(
+    "--include-onefile-external-data",
+    action="append",
+    dest="data_files_external",
+    metavar="PATTERN",
+    default=[],
+    help="""\
+Include the specified data file patterns outside of the onefile binary,
+rather than on the inside. Makes only sense in case of '--onefile'
+compilation. First files have to be specified as included with other
+`--include-*data*` options, and then this refers to target paths
+inside the distribution. Default empty.""",
 )
 
 data_group.add_option(
@@ -437,6 +471,18 @@ data_group.add_option(
 Output the data files found for a given package name. Default not done.""",
 )
 
+data_group.add_option(
+    "--include-raw-dir",
+    action="append",
+    dest="raw_dirs",
+    metavar="DIRECTORY",
+    default=[],
+    help="""\
+Include raw directories completely in the distribution. This is
+recursive. Check '--include-data-dir' to use the sane option.
+Default empty.""",
+)
+
 
 del data_group
 
@@ -468,8 +514,8 @@ dll_group.add_option(
     default=[],
     help="""\
 Do not include DLL files matching the filename pattern given. This is against
-the target filename, not source paths. So ignore a DLL "someDLL" contained in
-the package "package_name" it should be matched as "package_name/someDLL.*".
+the target filename, not source paths. So ignore a DLL 'someDLL' contained in
+the package 'package_name' it should be matched as 'package_name/someDLL.*'.
 Default empty.""",
 )
 
@@ -512,6 +558,7 @@ warnings_group.add_option(
     action="store_true",
     dest="assume_yes_for_downloads",
     default=False,
+    github_action_default=True,
     help="""\
 Allow Nuitka to download external code if necessary, e.g. dependency
 walker, ccache, and even gcc on Windows. To disable, redirect input
@@ -559,18 +606,6 @@ Execute inside a debugger, e.g. "gdb" or "lldb" to automatically get a stack tra
 Defaults to off.""",
 )
 
-execute_group.add_option(
-    "--execute-with-pythonpath",
-    action="store_true",
-    dest="keep_pythonpath",
-    default=False,
-    help="""\
-When immediately executing the created binary or module using '--run',
-don't reset 'PYTHONPATH' environment. When all modules are successfully
-included, you ought to not need PYTHONPATH anymore, and definitely not
-for standalone mode.""",
-)
-
 del execute_group
 
 
@@ -584,9 +619,9 @@ compilation_group.add_option(
     metavar="YAML_FILENAME",
     help="""\
 User provided Yaml file with package configuration. You can include DLLs,
-remove bloat, add hidden dependencies. Check User Manual for a complete
-description of the format to use. Can be given multiple times. Defaults
-to empty.""",
+remove bloat, add hidden dependencies. Check the Nuitka Package Configuration
+Manual for a complete description of the format to use. Can be given
+multiple times. Defaults to empty.""",
 )
 
 compilation_group.add_option(
@@ -654,8 +689,7 @@ choice, also not for standalone mode and using it will be an error. This may
 include path information that needs to exist though. Defaults to '%s' on this
 platform.
 """
-    % "<program_name>"
-    + (".exe" if isWin32OrPosixWindows() else ".bin"),
+    % ("<program_name>" + (".exe" if isWin32OrPosixWindows() else ".bin")),
 )
 
 output_group.add_option(
@@ -687,13 +721,65 @@ output_group.add_option(
     dest="pyi_file",
     default=True,
     help="""\
-Do not create a ".pyi" file for extension modules created by Nuitka. This is
+Do not create a '.pyi' file for extension modules created by Nuitka. This is
 used to detect implicit imports.
 Defaults to off.""",
 )
 
+output_group.add_option(
+    "--no-pyi-stubs",
+    action="store_false",
+    dest="pyi_stubs",
+    default=True,
+    help="""\
+Do not use stubgen when creating a '.pyi' file for extension modules
+created by Nuitka. They expose your API, but stubgen may cause issues.
+Defaults to off.""",
+)
+
+
 del output_group
 
+deployment_group = parser.add_option_group("Deployment control")
+
+deployment_group.add_option(
+    "--deployment",
+    action="store_true",
+    dest="is_deployment",
+    default=False,
+    help="""\
+Disable code aimed at making finding compatibility issues easier. This
+will e.g. prevent execution with "-c" argument, which is often used by
+code that attempts run a module, and causes a program to start itself
+over and over potentially. Disable once you deploy to end users, for
+finding typical issues, this is very helpful during development. Default
+off.""",
+)
+
+deployment_group.add_option(
+    "--no-deployment-flag",
+    action="append",
+    dest="no_deployment_flags",
+    metavar="FLAG",
+    default=[],
+    help="""\
+Keep deployment mode, but disable selectively parts of it. Errors from
+deployment mode will output these identifiers. Default empty.""",
+)
+
+environment_group = parser.add_option_group("Environment control")
+
+environment_group.add_option(
+    "--force-runtime-environment-variable",
+    action="append",
+    dest="forced_runtime_env_variables",
+    metavar="VARIABLE_SPEC",
+    default=[],
+    help="""\
+Force an environment variables to a given value. Default empty.""",
+)
+
+del environment_group
 
 debug_group = parser.add_option_group("Debug features")
 
@@ -707,6 +793,25 @@ Executing all self checks possible to find errors in Nuitka, do not use for
 production. Defaults to off.""",
 )
 
+debug_group.add_option(
+    "--no-debug-immortal-assumptions",
+    action="store_false",
+    dest="debug_immortal",
+    default=None,
+    help="""\
+Disable check normally done with "--debug". With Python3.12+ do not check known
+immortal object assumptions. Some C libraries corrupt them. Defaults to check
+being made if "--debug" is on.""",
+)
+
+debug_group.add_option(
+    "--debug-immortal-assumptions",
+    action="store_true",
+    dest="debug_immortal",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
 debug_group.add_option(
     "--unstripped",
     "--unstriped",
@@ -723,20 +828,11 @@ debug_group.add_option(
     action="store_true",
     dest="profile",
     default=False,
+    github_action=False,
     help="""\
 Enable vmprof based profiling of time spent. Not working currently. Defaults to off.""",
 )
 
-debug_group.add_option(
-    "--internal-graph",
-    action="store_true",
-    dest="internal_graph",
-    default=False,
-    help="""\
-Create graph of optimization process internals, do not use for whole programs, but only
-for small test cases. Defaults to off.""",
-)
-
 debug_group.add_option(
     "--trace-execution",
     action="store_true",
@@ -747,19 +843,6 @@ Traced execution output, output the line of code before executing it.
 Defaults to off.""",
 )
 
-debug_group.add_option(
-    "--recompile-c-only",
-    action="store_true",
-    dest="recompile_c_only",
-    default=False,
-    help="""\
-This is not incremental compilation, but for Nuitka development only. Takes
-existing files and simply compile them as C again. Allows compiling edited
-C files for quick debugging changes to the generated source, e.g. to see if
-code is passed by, values output, etc, Defaults to off. Depends on compiling
-Python source to determine which files it should look at.""",
-)
-
 debug_group.add_option(
     "--xml",
     action="store",
@@ -769,29 +852,6 @@ debug_group.add_option(
     help="Write the internal program structure, result of optimization in XML form to given filename.",
 )
 
-debug_group.add_option(
-    "--deployment",
-    action="store_true",
-    dest="is_deployment",
-    default=False,
-    help="""\
-Disable code aimed at making finding compatibility issues easier. This
-will e.g. prevent execution with "-c" argument, which is often used by
-code that attempts run a module, and causes a program to start itself
-over and over potentially. Default off.""",
-)
-
-debug_group.add_option(
-    "--no-deployment-flag",
-    action="append",
-    dest="no_deployment_flags",
-    metavar="FLAG",
-    default=[],
-    help="""\
-Keep deployment mode, but disable selectively parts of it. Errors from
-deployment mode will output these identifiers. Default empty.""",
-)
-
 debug_group.add_option(
     "--experimental",
     action="append",
@@ -839,6 +899,7 @@ debug_group.add_option(
     action="store_true",
     dest="generate_c_only",
     default=False,
+    github_action=False,
     help="""\
 Generate only C source code, and do not compile it to binary or module. This
 is for debugging and code coverage analysis that doesn't waste CPU. Defaults to
@@ -848,6 +909,61 @@ off. Do not think you can use this directly.""",
 
 del debug_group
 
+
+development_group = parser.add_option_group("Nuitka Development features")
+
+
+development_group.add_option(
+    "--devel-missing-code-helpers",
+    action="store_true",
+    dest="report_missing_code_helpers",
+    default=False,
+    help="""\
+Report warnings for code helpers for types that were attempted, but don't
+exist. This helps to identify opportunities for improving optimization of
+generated code from type knowledge not used. Default False.""",
+)
+
+development_group.add_option(
+    "--devel-missing-trust",
+    action="store_true",
+    dest="report_missing_trust",
+    default=False,
+    help="""\
+Report warnings for imports that could be trusted, but currently are not. This
+is to identify opportunities for improving handling of hard modules, where this
+sometimes could allow more static optimization. Default False.""",
+)
+
+development_group.add_option(
+    "--devel-recompile-c-only",
+    action="store_true",
+    dest="recompile_c_only",
+    default=False,
+    github_action=False,
+    help="""\
+This is not incremental compilation, but for Nuitka development only. Takes
+existing files and simply compiles them as C again after doing the Python
+steps. Allows compiling edited C files for manual debugging changes to the
+generated source. Allows us to add printing, check and print values, but it
+is now what users would want. Depends on compiling Python source to
+determine which files it should look at.""",
+)
+
+development_group.add_option(
+    "--devel-internal-graph",
+    action="store_true",
+    dest="internal_graph",
+    default=False,
+    github_action=False,
+    help="""\
+Create graph of optimization process internals, do not use for whole programs, but only
+for small test cases. Defaults to off.""",
+)
+
+
+del development_group
+
 # This is for testing framework, "coverage.py" hates to loose the process. And
 # we can use it to make sure it's not done unknowingly.
 parser.add_option(
@@ -855,6 +971,7 @@ parser.add_option(
     action="store_false",
     dest="allow_reexecute",
     default=True,
+    github_action=False,
     help=SUPPRESS_HELP,
 )
 
@@ -913,8 +1030,9 @@ c_compiler_group.add_option(
     metavar="N",
     default=None,
     help="""\
-Specify the allowed number of parallel C compiler jobs. Defaults to the
-system CPU count.""",
+Specify the allowed number of parallel C compiler jobs. Negative values
+are system CPU minus the given value. Defaults to the full system CPU
+count unless low memory mode is activated, then it defaults to 1.""",
 )
 
 c_compiler_group.add_option(
@@ -942,12 +1060,26 @@ Use static link library of Python. Allowed values are "yes", "no",
 and "auto" (when it's known to work). Defaults to "auto".""",
 )
 
+c_compiler_group.add_option(
+    "--cf-protection",
+    action="store",
+    dest="cf_protection",
+    metavar="PROTECTION_MODE",
+    default="auto",
+    choices=("auto", "full", "branch", "return", "none", "check"),
+    help="""\
+This option is gcc specific. For the gcc compiler, select the
+"cf-protection" mode. Default "auto" is to use the gcc default
+value, but you can override it, e.g. to disable it with "none"
+value. Refer to gcc documentation for "-fcf-protection" for the
+details.""",
+)
 
 del c_compiler_group
 
 caching_group = parser.add_option_group("Cache Control")
 
-_cache_names = ("all", "ccache", "bytecode")
+_cache_names = ("all", "ccache", "bytecode", "compression")
 
 if isWin32Windows():
     _cache_names += ("dll-dependencies",)
@@ -984,9 +1116,7 @@ caching_group.add_option(
     action="store_true",
     dest="disable_bytecode_cache",
     default=False,
-    help="""\
-Do not reuse dependency analysis results for modules, esp. from standard library,
-that are included as bytecode. Same as --disable-cache=bytecode.""",
+    help=SUPPRESS_HELP,
 )
 
 caching_group.add_option(
@@ -994,23 +1124,18 @@ caching_group.add_option(
     action="store_true",
     dest="disable_ccache",
     default=False,
-    help="""\
-Do not attempt to use ccache (gcc, clang, etc.) or clcache (MSVC, clangcl).
-Same as --disable-cache=ccache.""",
+    help=SUPPRESS_HELP,
 )
 
-if isWin32Windows():
-    caching_group.add_option(
-        "--disable-dll-dependency-cache",
-        action="store_true",
-        dest="disable_dll_dependency_cache",
-        default=False,
-        help="""\
-Disable the dependency walker cache. Will result in much longer times to create
-the distribution folder, but might be used in case the cache is suspect to cause
-errors. Same as --disable-cache=dll-dependencies.""",
-    )
+caching_group.add_option(
+    "--disable-dll-dependency-cache",
+    action="store_true",
+    dest="disable_dll_dependency_cache",
+    default=False,
+    help=SUPPRESS_HELP,
+)
 
+if isWin32Windows():
     caching_group.add_option(
         "--force-dll-dependency-cache-update",
         action="store_true",
@@ -1029,7 +1154,7 @@ del caching_group
 pgo_group = parser.add_option_group("PGO compilation choices")
 
 pgo_group.add_option(
-    "--pgo",
+    "--pgo-c",
     action="store_true",
     dest="is_c_pgo",
     default=False,
@@ -1045,7 +1170,7 @@ pgo_group.add_option(
     action="store_true",
     dest="is_python_pgo",
     default=False,
-    help=SUPPRESS_HELP,
+    help=SUPPRESS_HELP,  # Not yet ready
 )
 
 pgo_group.add_option(
@@ -1053,7 +1178,7 @@ pgo_group.add_option(
     action="store",
     dest="python_pgo_input",
     default=None,
-    help=SUPPRESS_HELP,
+    help=SUPPRESS_HELP,  # Not yet ready
 )
 
 pgo_group.add_option(
@@ -1062,7 +1187,7 @@ pgo_group.add_option(
     dest="python_pgo_policy_unused_module",
     choices=("include", "exclude", "bytecode"),
     default="include",
-    help=SUPPRESS_HELP,
+    help=SUPPRESS_HELP,  # Not yet ready
 )
 
 pgo_group.add_option(
@@ -1136,7 +1261,7 @@ tracing_group.add_option(
     metavar="REPORT_DESC",
     default=[],
     help="""\
-Report via template. Provide template and output filename "template.rst.j2:output.rst". For
+Report via template. Provide template and output filename 'template.rst.j2:output.rst'. For
 built-in templates, check the User Manual for what these are. Can be given multiple times.
 Default is empty.""",
 )
@@ -1168,6 +1293,7 @@ tracing_group.add_option(
     action="store_false",
     dest="progress_bar",
     default=True,
+    github_action=False,
     help="""Disable progress bars. Defaults to off.""",
 )
 
@@ -1176,6 +1302,7 @@ tracing_group.add_option(
     action="store_true",
     dest="show_progress",
     default=False,
+    github_action=False,
     help="""Obsolete: Provide progress information and statistics.
 Disables normal progress bar. Defaults to off.""",
 )
@@ -1194,6 +1321,7 @@ tracing_group.add_option(
     action="store_true",
     dest="show_inclusion",
     default=False,
+    github_action=False,
     help="""\
 Provide information for included modules and DLLs
 Obsolete: You should use '--report' file instead. Defaults to off.""",
@@ -1205,6 +1333,7 @@ tracing_group.add_option(
     dest="show_inclusion_output",
     metavar="PATH",
     default=None,
+    github_action=False,
     help="""\
 Where to output '--show-modules', should be a filename. Default is standard output.""",
 )
@@ -1214,6 +1343,7 @@ tracing_group.add_option(
     action="store_true",
     dest="verbose",
     default=False,
+    github_action=False,
     help="""\
 Output details of actions taken, esp. in optimizations. Can become a lot.
 Defaults to off.""",
@@ -1225,6 +1355,7 @@ tracing_group.add_option(
     dest="verbose_output",
     metavar="PATH",
     default=None,
+    github_action=False,
     help="""\
 Where to output from '--verbose', should be a filename. Default is standard output.""",
 )
@@ -1234,29 +1365,6 @@ del tracing_group
 
 os_group = parser.add_option_group("General OS controls")
 
-os_group.add_option(
-    "--disable-console",
-    "--macos-disable-console",
-    "--windows-disable-console",
-    action="store_true",
-    dest="disable_console",
-    default=None,
-    help="""\
-When compiling for Windows or macOS, disable the console window and create a GUI
-application. Defaults to off.""",
-)
-
-os_group.add_option(
-    "--enable-console",
-    action="store_false",
-    dest="disable_console",
-    default=None,
-    help="""\
-When compiling for Windows or macOS, enable the console window and create a console
-application. This disables hints from certain modules, e.g. "PySide" that suggest
-to disable it. Defaults to true.""",
-)
-
 os_group.add_option(
     "--force-stdout-spec",
     "--windows-force-stdout-spec",
@@ -1267,7 +1375,7 @@ os_group.add_option(
     help="""\
 Force standard output of the program to go to this location. Useful for programs with
 disabled console and programs using the Windows Services Plugin of Nuitka commercial.
-Defaults to not active, use e.g. '%PROGRAM_BASE%.out.txt', i.e. file near your program,
+Defaults to not active, use e.g. '{PROGRAM_BASE}.out.txt', i.e. file near your program,
 check User Manual for full list of available values.""",
 )
 
@@ -1281,7 +1389,7 @@ os_group.add_option(
     help="""\
 Force standard error of the program to go to this location. Useful for programs with
 disabled console and programs using the Windows Services Plugin of Nuitka commercial.
-Defaults to not active, use e.g. '%PROGRAM_BASE%.err.txt', i.e. file near your program,
+Defaults to not active, use e.g. '{PROGRAM_BASE}.err.txt', i.e. file near your program,
 check User Manual for full list of available values.""",
 )
 
@@ -1291,17 +1399,26 @@ del os_group
 windows_group = parser.add_option_group("Windows specific controls")
 
 windows_group.add_option(
-    "--windows-dependency-tool",
+    "--windows-console-mode",
     action="store",
-    dest="dependency_tool",
+    dest="console_mode",
+    choices=("force", "disable", "attach", "hide"),
+    metavar="CONSOLE_MODE",
     default=None,
-    help=SUPPRESS_HELP,
+    help="""\
+Select console mode to use. Default mode is 'force' and creates a
+console window unless the program was started from one. With 'disable'
+it doesn't create or use a console at all. With 'attach' an existing
+console will be used for outputs. With 'hide' a newly spawned console
+will be hidden and an already existing console will behave like
+'force'. Default is 'force'.
+""",
 )
 
 windows_group.add_option(
     "--windows-icon-from-ico",
     action="append",
-    dest="icon_path",
+    dest="windows_icon_path",
     metavar="ICON_PATH",
     default=[],
     help="""\
@@ -1349,6 +1466,32 @@ Request Windows User Control, to enforce running from a few folders only, remote
 desktop access. (Windows only). Defaults to off.""",
 )
 
+windows_group.add_option(
+    "--disable-console",
+    "--macos-disable-console",
+    "--windows-disable-console",
+    action="store_true",
+    dest="disable_console",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
+windows_group.add_option(
+    "--enable-console",
+    action="store_false",
+    dest="disable_console",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
+windows_group.add_option(
+    "--windows-dependency-tool",
+    action="store",
+    dest="dependency_tool",
+    default=None,
+    help=SUPPRESS_HELP,
+)
+
 windows_group.add_option(
     "--windows-service",
     action="store_true",
@@ -1417,6 +1560,18 @@ del windows_group
 
 macos_group = parser.add_option_group("macOS specific controls")
 
+macos_group.add_option(
+    "--macos-create-app-bundle",
+    action="store_true",
+    dest="macos_create_bundle",
+    default=False,
+    help="""\
+When compiling for macOS, create a bundle rather than a plain binary
+application. This is the only way to unlock the disabling of console,
+get high DPI graphics, etc. and implies standalone mode. Defaults to
+off.""",
+)
+
 macos_group.add_option(
     "--macos-target-arch",
     action="store",
@@ -1430,21 +1585,10 @@ is what the running Python allows for. Default is "native" which is
 the architecture the Python is run with.""",
 )
 
-macos_group.add_option(
-    "--macos-create-app-bundle",
-    action="store_true",
-    dest="macos_create_bundle",
-    default=False,
-    help="""\
-When compiling for macOS, create a bundle rather than a plain binary
-application. Currently experimental and incomplete. Currently this
-is the only way to unlock disabling of console.Defaults to off.""",
-)
-
 macos_group.add_option(
     "--macos-app-icon",
     action="append",
-    dest="icon_path",
+    dest="macos_icon_path",
     metavar="ICON_PATH",
     default=[],
     help="Add icon for the application bundle to use. Can be given only one time. Defaults to Python icon if available.",
@@ -1498,7 +1642,8 @@ macos_group.add_option(
     help="""\
 When signing on macOS, by default an ad-hoc identify will be used, but with this
 option your get to specify another identity to use. The signing of code is now
-mandatory on macOS and cannot be disabled. Default "ad-hoc" if not given.""",
+mandatory on macOS and cannot be disabled. Use "auto" to detect your only identity
+installed. Default "ad-hoc" if not given.""",
 )
 
 macos_group.add_option(
@@ -1549,7 +1694,7 @@ linux_group.add_option(
     "--linux-icon",
     "--linux-onefile-icon",
     action="append",
-    dest="icon_path",
+    dest="linux_icon_path",
     metavar="ICON_PATH",
     default=[],
     help="Add executable icon for onefile binary to use. Can be given only one time. Defaults to Python icon if available.",
@@ -1623,7 +1768,7 @@ version_group.add_option(
     metavar="COPYRIGHT_TEXT",
     default=None,
     help="""\
-Copyright used in version information. Windows only at this time. Defaults to not present.""",
+Copyright used in version information. Windows/macOS only at this time. Defaults to not present.""",
 )
 
 version_group.add_option(
@@ -1633,7 +1778,7 @@ version_group.add_option(
     metavar="TRADEMARK_TEXT",
     default=None,
     help="""\
-Trademark used in version information. Windows only at this time. Defaults to not present.""",
+Trademark used in version information. Windows/macOS only at this time. Defaults to not present.""",
 )
 
 
@@ -1660,6 +1805,7 @@ plugin_group.add_option(
     dest="plugins_disabled",
     metavar="PLUGIN_NAME",
     default=[],
+    github_action=False,
     help="""\
 Disabled plugins. Must be plug-in names. Use '--plugin-list' to query the
 full list and exit. Most standard plugins are not a good idea to disable.
@@ -1667,16 +1813,12 @@ Default empty.""",
 )
 
 plugin_group.add_option(
-    "--plugin-no-detection",
-    action="store_false",
-    dest="detect_missing_plugins",
-    default=True,
-    help="""\
-Plugins can detect if they might be used, and the you can disable the warning
-via "--disable-plugin=plugin-that-warned", or you can use this option to disable
-the mechanism entirely, which also speeds up compilation slightly of course as
-this detection code is run in vain once you are certain of which plugins to
-use. Defaults to off.""",
+    "--user-plugin",
+    action="append",
+    dest="user_plugins",
+    metavar="PATH",
+    default=[],
+    help="The file name of user plugin. Can be given multiple times. Default empty.",
 )
 
 plugin_group.add_option(
@@ -1685,31 +1827,69 @@ plugin_group.add_option(
     dest="plugin_list",
     default=False,
     require_compiling=False,
+    github_action=False,
     help="""\
 Show list of all available plugins and exit. Defaults to off.""",
 )
 
 plugin_group.add_option(
-    "--user-plugin",
+    "--plugin-no-detection",
+    action="store_false",
+    dest="detect_missing_plugins",
+    default=True,
+    help="""\
+Plugins can detect if they might be used, and the you can disable the warning
+via "--disable-plugin=plugin-that-warned", or you can use this option to disable
+the mechanism entirely, which also speeds up compilation slightly of course as
+this detection code is run in vain once you are certain of which plugins to
+use. Defaults to off.""",
+)
+
+plugin_group.add_option(
+    "--module-parameter",
     action="append",
-    dest="user_plugins",
-    metavar="PATH",
+    dest="module_parameters",
     default=[],
-    help="The file name of user plugin. Can be given multiple times. Default empty.",
+    help="""\
+Provide a module parameter. You are asked by some packages
+to provide extra decisions. Format is currently
+--module-parameter=module.name-option-name=value
+Default empty.""",
 )
 
 plugin_group.add_option(
     "--show-source-changes",
-    action="store_true",
+    action="append",
     dest="show_source_changes",
-    default=False,
+    default=[],
+    github_action=False,
     help="""\
 Show source changes to original Python file content before compilation. Mostly
-intended for developing plugins. Default False.""",
+intended for developing plugins and Nuitka package configuration. Use e.g.
+'--show-source-changes=numpy.**' to see all changes below a given namespace
+or use '*' to see everything which can get a lot.
+Default empty.""",
 )
 
 del plugin_group
 
+target_group = parser.add_option_group("Cross compilation")
+
+
+target_group.add_option(
+    "--target",
+    action="store",
+    dest="target_desc",
+    metavar="TARGET_DESC",
+    default=None,
+    help="""\
+Cross compilation target. Highly experimental and in development, not
+supposed to work yet. We are working on '--target=wasi' and nothing
+else yet.""",
+)
+
+del target_group
+
 
 def _considerPluginOptions(logger):
     # Cyclic dependency on plugins during parsing of command line.
@@ -1748,6 +1928,33 @@ def _considerPluginOptions(logger):
             addUserPluginCommandLineOptions(parser=parser, filename=plugin_name)
 
 
+run_time_variable_names = (
+    "TEMP",
+    "PID",
+    "TIME",
+    "PROGRAM",
+    "PROGRAM_BASE",
+    "CACHE_DIR",
+    "COMPANY",
+    "PRODUCT",
+    "VERSION",
+    "HOME",
+    "NONE",
+    "NULL",
+)
+
+
+class _RetainingFormatter(Formatter):
+    def get_value(self, key, args, kwargs):
+        if isinstance(key, str):
+            try:
+                return kwargs[key]
+            except KeyError:
+                return "{%s}" % key
+        else:
+            return Formatter.get_value(self, key, args, kwargs)
+
+
 def _expandProjectArg(arg, filename_arg, for_eval):
     def wrap(value):
         if for_eval:
@@ -1762,6 +1969,7 @@ def _expandProjectArg(arg, filename_arg, for_eval):
         "Version": getNuitkaVersion(),
         "Commercial": wrap(getCommercialVersion()),
         "MAIN_DIRECTORY": wrap(os.path.dirname(filename_arg) or "."),
+        "GIL": isPythonWithGil(),
     }
 
     if isLinux():
@@ -1776,7 +1984,14 @@ def _expandProjectArg(arg, filename_arg, for_eval):
     if isWin32OrPosixWindows():
         values["WindowsRelease"] = getWindowsRelease()
 
-    arg = arg.format(**values)
+    values.update(
+        (
+            (run_time_variable_name, "{%s}" % run_time_variable_name)
+            for run_time_variable_name in run_time_variable_names
+        )
+    )
+
+    arg = _RetainingFormatter().format(arg, **values)
 
     return arg
 
@@ -1898,7 +2113,15 @@ def _considerGithubWorkflowOptions(phase):
 
     import json
 
-    early_names = "main", "script-name", "enable-plugins", "disable-plugins"
+    early_names = (
+        "main",
+        "script-name",
+        "enable-plugin",
+        "enable-plugins",
+        "disable-plugin",
+        "disable-plugins",
+        "user-plugin",
+    )
 
     def filterByName(key):
         # Not for Nuitka at all.
@@ -1934,11 +2157,17 @@ def _considerGithubWorkflowOptions(phase):
 
         option_name = "--%s" % key
 
-        if parser.isBooleanOption("--%s" % key):
+        if parser.isBooleanOption(option_name):
             if value == "false":
                 continue
 
             options_added.append(option_name)
+        elif parser.isListOption(option_name):
+            for value in value.split("\n"):
+                if not value.strip():
+                    continue
+
+                options_added.append("%s=%s" % (option_name, value))
         else:
             # Boolean disabled options from inactive plugins that default to off.
             if value == "false":
@@ -1947,7 +2176,7 @@ def _considerGithubWorkflowOptions(phase):
             options_added.append("%s=%s" % (option_name, value))
 
     sys.argv = (
-        sys.argv[: github_option_index + (0 if phase == "early" else 1)]
+        sys.argv[: github_option_index + (1 if phase == "early" else 0)]
         + options_added
         + sys.argv[github_option_index + 1 :]
     )
@@ -1955,8 +2184,7 @@ def _considerGithubWorkflowOptions(phase):
 
 def parseOptions(logger):
     # Pretty complex code, having a small options parser and many details as
-    # well as integrating with plugins and run modes, and dispatching of tool
-    # mode executions, pylint: disable=too-many-branches,too-many-statements
+    # well as integrating with plugins and run modes. pylint: disable=too-many-branches
 
     # First, isolate the first non-option arguments.
     extra_args = []
@@ -1983,12 +2211,15 @@ def parseOptions(logger):
     filename_args = []
     module_mode = False
 
+    # Options may be coming from GitHub workflow configuration as well.
+    _considerGithubWorkflowOptions(phase="early")
+
     for count, arg in enumerate(sys.argv):
         if count == 0:
             continue
 
-        if arg.startswith("--main="):
-            filename_args.append(arg)
+        if arg.startswith(("--main=", "--script-name=")):
+            filename_args.append(arg.split("=", 1)[1])
 
         if arg == "--module":
             module_mode = True
@@ -2004,9 +2235,6 @@ def parseOptions(logger):
             + sys.argv[1:]
         )
 
-    # Options may be coming from GitHub workflow configuration as well.
-    _considerGithubWorkflowOptions(phase="early")
-
     # Next, lets activate plugins early, so they can inject more options to the parser.
     _considerPluginOptions(logger)
 
@@ -2027,6 +2255,19 @@ def parseOptions(logger):
 Error, need filename argument with python module or main program."""
         )
 
+    if not options.immediate_execution and len(positional_args) > 1:
+        parser.print_help()
+
+        logger.sysexit(
+            """
+Error, specify only one positional argument unless "--run" is specified to
+pass them to the compiled program execution."""
+        )
+
+    return is_nuitka_run, options, positional_args, extra_args
+
+
+def runSpecialCommandsFromOptions(options):
     if options.plugin_list:
         from nuitka.plugins.Plugins import listPlugins
 
@@ -2066,13 +2307,18 @@ Error, need filename argument with python module or main program."""
         )
         sys.exit(0)
 
-    if not options.immediate_execution and len(positional_args) > 1:
-        parser.print_help()
-
-        logger.sysexit(
-            """
-Error, specify only one positional argument unless "--run" is specified to
-pass them to the compiled program execution."""
-        )
 
-    return is_nuitka_run, options, positional_args, extra_args
+#     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.