Implement Windows build

Author: Maxwell175

Include/Python.h

@@ -35,6 +35,8 @@
 #include <assert.h>               // assert()
 #include <wchar.h>                // wchar_t
 
+#define FFI_STATIC_BUILD
+
 #include "pyport.h"
 #include "pymacro.h"
 #include "pymath.h"

Include/pathcch.private.h

@@ -0,0 +1,39 @@
+#include <Shlwapi.h>
+#include "windows.h"
+
+#define DLLAPI	__stdcall
+
+#define PATHCCH_NONE                            0x00
+#define PATHCCH_ALLOW_LONG_PATHS                0x01
+#define PATHCCH_FORCE_ENABLE_LONG_NAME_PROCESS  0x02
+#define PATHCCH_FORCE_DISABLE_LONG_NAME_PROCESS 0x04
+#define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS       0x08
+#define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH  0x10
+#define PATHCCH_ENSURE_TRAILING_SLASH           0x20
+
+#define PATHCCH_MAX_CCH 0x8000
+
+#define STRSAFE_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL)
+
+HRESULT DLLAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out);
+HRESULT DLLAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out);
+HRESULT DLLAPI PathCchAddBackslash(WCHAR *path, SIZE_T size);
+HRESULT DLLAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, SIZE_T *remaining);
+HRESULT DLLAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension);
+HRESULT DLLAPI PathCchAppend(WCHAR *path1, SIZE_T size, const WCHAR *path2);
+HRESULT DLLAPI PathCchAppendEx(WCHAR *path1, SIZE_T size, const WCHAR *path2, DWORD flags);
+HRESULT DLLAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in);
+HRESULT DLLAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags);
+HRESULT DLLAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2);
+HRESULT DLLAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags);
+HRESULT DLLAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension);
+BOOL DLLAPI PathCchIsRoot(const WCHAR *path);
+HRESULT DLLAPI PathCchRemoveBackslash(WCHAR *path, SIZE_T path_size);
+HRESULT DLLAPI PathCchRemoveBackslashEx(WCHAR *path, SIZE_T path_size, WCHAR **path_end, SIZE_T *free_size);
+HRESULT DLLAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size);
+HRESULT DLLAPI PathCchRemoveFileSpec(WCHAR *path, SIZE_T size);
+HRESULT DLLAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension);
+HRESULT DLLAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end);
+HRESULT DLLAPI PathCchStripPrefix(WCHAR *path, SIZE_T size);
+HRESULT DLLAPI PathCchStripToRoot(WCHAR *path, SIZE_T size);
+BOOL DLLAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server);

Include/staticinit.h

@@ -28,7 +28,6 @@ extern "C" {
     extern  PyObject* PyInit__overlapped(void);
     extern  PyObject* PyInit__elementtree(void);
     extern  PyObject* PyInit__uuid(void);
-    extern  PyObject* PyInit__msi(void);
     extern  PyObject* PyInit__sqlite3(void);
     extern  PyObject* PyInit__tkinter(void);
     extern  PyObject* PyInit__zoneinfo(void);
@@ -57,7 +56,6 @@ static inline void Py_InitStaticModules() {
     PyImport_AppendInittab("_overlapped", PyInit__overlapped);
     PyImport_AppendInittab("_elementtree", PyInit__elementtree);
     PyImport_AppendInittab("_uuid", PyInit__uuid);
-    PyImport_AppendInittab("_msi", PyInit__msi);
     PyImport_AppendInittab("_sqlite3", PyInit__sqlite3);
     PyImport_AppendInittab("_tkinter", PyInit__tkinter);
     PyImport_AppendInittab("_zoneinfo", PyInit__zoneinfo);

Lib/distutils/_msvccompiler.py

@@ -262,18 +262,16 @@ def initialize(self, plat_name=None):
 
         self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
         self.ldflags_exe_debug = [*ldflags_debug, '/MANIFEST:EMBED,ID=1']
-        self.ldflags_shared = [*ldflags, '/DLL', '/MANIFEST:EMBED,ID=2', '/MANIFESTUAC:NO']
-        self.ldflags_shared_debug = [*ldflags_debug, '/DLL', '/MANIFEST:EMBED,ID=2', '/MANIFESTUAC:NO']
         self.ldflags_static = [*ldflags]
         self.ldflags_static_debug = [*ldflags_debug]
 
         self._ldflags = {
             (CCompiler.EXECUTABLE, None): self.ldflags_exe,
             (CCompiler.EXECUTABLE, False): self.ldflags_exe,
             (CCompiler.EXECUTABLE, True): self.ldflags_exe_debug,
-            (CCompiler.SHARED_OBJECT, None): self.ldflags_shared,
-            (CCompiler.SHARED_OBJECT, False): self.ldflags_shared,
-            (CCompiler.SHARED_OBJECT, True): self.ldflags_shared_debug,
+            (CCompiler.SHARED_OBJECT, None): self.ldflags_static,
+            (CCompiler.SHARED_OBJECT, False): self.ldflags_static,
+            (CCompiler.SHARED_OBJECT, True): self.ldflags_static_debug,
             (CCompiler.SHARED_LIBRARY, None): self.ldflags_static,
             (CCompiler.SHARED_LIBRARY, False): self.ldflags_static,
             (CCompiler.SHARED_LIBRARY, True): self.ldflags_static_debug,

Lib/ensurepip/__init__.py

@@ -8,9 +8,9 @@
 from importlib import resources
 
 
-__all__ = ["version", "bootstrap"]
+__all__ = ["version", "bootstrap", "_SETUPTOOLS_VERSION", "_get_packages"]
 _PACKAGE_NAMES = ('setuptools', 'pip', 'wheel')
-_SETUPTOOLS_VERSION = "70.0.0.post20240616"
+_SETUPTOOLS_VERSION = "75.2.0.post20241019"
 _PIP_VERSION = "23.3.2"
 _WHEEL_VERSION = "0.42.0"
 _PROJECTS = [

Lib/ensurepip/_bundled/setuptools-70.0.0.post20240616-py3-none-any.whl

@@ -39,6 +39,7 @@ def _getPythonVersion():
 
 python_version = _getPythonVersion()
 
+
 # Portability, lending an import code to module function from Nuitka.
 def importFileAsModule(modulename, filename):
     """Import Python module given as a file name.
@@ -146,10 +147,10 @@ def install_build_tool(name):
             install_build_tool(tool)
 
     if os.path.isfile(
-        os.path.join(__np__.getToolsInstallDir(), name, "version.txt")
+            os.path.join(__np__.getToolsInstallDir(), name, "version.txt")
     ):
         with open(
-            os.path.join(__np__.getToolsInstallDir(), name, "version.txt"), "r"
+                os.path.join(__np__.getToolsInstallDir(), name, "version.txt"), "r"
         ) as f:
             version = f.read()
             if version == package_index["version"]:
@@ -187,7 +188,7 @@ def install_build_tool(name):
             os.environ.update(initenviron)
 
     with open(
-        os.path.join(__np__.getToolsInstallDir(), name, "version.txt"), "w"
+            os.path.join(__np__.getToolsInstallDir(), name, "version.txt"), "w"
     ) as f:
         f.write(package_index["version"])
 
@@ -204,10 +205,10 @@ def install_dependency(name):
             install_dependency(dep)
 
     if os.path.isfile(
-        os.path.join(__np__.getDependencyInstallDir(), name, "version.txt")
+            os.path.join(__np__.getDependencyInstallDir(), name, "version.txt")
     ):
         with open(
-            os.path.join(__np__.getDependencyInstallDir(), name, "version.txt"), "r"
+                os.path.join(__np__.getDependencyInstallDir(), name, "version.txt"), "r"
         ) as f:
             version = f.read()
             if version == package_index["version"]:
@@ -245,22 +246,38 @@ def install_dependency(name):
             os.environ.update(initenviron)
 
     with open(
-        os.path.join(__np__.getDependencyInstallDir(), name, "version.txt"), "w"
+            os.path.join(__np__.getDependencyInstallDir(), name, "version.txt"), "w"
     ) as f:
         f.write(package_index["version"])
 
 
+import pip._internal.pyproject
+
+load_pyproject_toml_orig = pip._internal.pyproject.load_pyproject_toml
+def our_load_pyproject_toml(use_pep517, pyproject_toml, setup_py, req_name):
+    has_pyproject = os.path.isfile(pyproject_toml)
+    has_setup = os.path.isfile(setup_py)
+
+    if not has_pyproject and not has_setup:
+        return pip._internal.pyproject.BuildSystemDetails(
+            ["setuptools>=40.8.0", "wheel"], "setuptools.build_meta:__legacy__", [], [])
+
+    return load_pyproject_toml_orig(use_pep517, pyproject_toml, setup_py, req_name)
+
+
 from pip._internal.req.req_install import InstallRequirement
 from typing import Iterable, List, Optional, Tuple
 import pip._internal.wheel_builder
+
 _orig_build_one_inside_env = pip._internal.wheel_builder._build_one_inside_env
 
+
 def _build_one_inside_env(
-    req: InstallRequirement,
-    output_dir: str,
-    build_options: List[str],
-    global_options: List[str],
-    editable: bool,
+        req: InstallRequirement,
+        output_dir: str,
+        build_options: List[str],
+        global_options: List[str],
+        editable: bool,
 ) -> Optional[str]:
     fallback = False
     if req.name == "setuptools":
@@ -370,6 +387,20 @@ def build_stub(
 
 class PackageFinder(_PackageFinder):
     def find_all_candidates(self, project_name):
+        import pip._internal.pyproject
+        pip._internal.pyproject.load_pyproject_toml = our_load_pyproject_toml
+        pip._internal.req.req_install.load_pyproject_toml = our_load_pyproject_toml
+
+        if project_name == "setuptools":
+            import ensurepip
+            import pathlib
+
+            our_uri = pathlib.Path(os.path.join(os.path.dirname(ensurepip.__file__), '_bundled',
+                                                ensurepip._get_packages()["setuptools"].wheel_name)).as_uri()
+            return [InstallationCandidate(
+                project_name, ensurepip._SETUPTOOLS_VERSION, Link(our_uri)
+            )]
+
         base_candidates = _PackageFinder.find_all_candidates(self, project_name)
 
         try:
@@ -393,30 +424,35 @@ def find_all_candidates(self, project_name):
 
 my_path = os.path.abspath(__file__)
 
+
 def get_runnable_pip() -> str:
     return my_path
 
+
 import pip._internal.build_env
-pip._internal.build_env.get_runnable_pip = get_runnable_pip
 
+pip._internal.build_env.get_runnable_pip = get_runnable_pip
 
 import pip._internal.req.req_install
+
 orig_install = pip._internal.req.req_install.InstallRequirement.install
 
+
 def install(
         self,
-        global_options = None,
-        root = None,
-        home = None,
-        prefix = None,
-        warn_script_location = True,
-        use_user_site = False,
-        pycompile = True,
-    ):
+        global_options=None,
+        root=None,
+        home=None,
+        prefix=None,
+        warn_script_location=True,
+        use_user_site=False,
+        pycompile=True,
+):
     orig_install(self, global_options, root, home, prefix, warn_script_location, use_user_site, pycompile)
 
     rebuildpython.run_rebuild()
 
+
 pip._internal.req.req_install.InstallRequirement.install = install
 
 

Lib/ensurepip/_bundled/setuptools-75.2.0.post20241019-py3-none-any.whl

@@ -221,6 +221,7 @@ def run_rebuild():
             "Cabinet",
             "winmm",
             "Netapi32",
+            "Bcrypt"
         ]
         if "32" in platform.architecture()[0]:
             link_libs += ["msvcrt"]

Lib/pip.py

@@ -654,7 +654,7 @@ def get_config_vars(*args):
         _CONFIG_VARS['platbase'] = _EXEC_PREFIX
         _CONFIG_VARS['projectbase'] = _PROJECT_BASE
         _CONFIG_VARS['platlibdir'] = sys.platlibdir
-        _CONFIG_VARS['SOABI'] = 'cpnuitka3.9'
+        _CONFIG_VARS['SOABI'] = 'cpnuitka3.11'
         try:
             _CONFIG_VARS['abiflags'] = sys.abiflags
         except AttributeError:

Lib/rebuildpython.py

@@ -44,6 +44,8 @@ Copyright (C) 1994 Steen Lumholt.
    Tcl are empty.  */
 #define TCL_THREADS
 
+#define STATIC_BUILD
+
 #ifdef TK_FRAMEWORK
 #include <Tcl/tcl.h>
 #include <Tk/tk.h>
@@ -52,6 +54,8 @@ Copyright (C) 1994 Steen Lumholt.
 #include <tk.h>
 #endif
 
+#undef STATIC_BUILD
+
 #include "tkinter.h"
 
 #if TK_HEX_VERSION < 0x0805020c

Lib/sysconfig.py

@@ -11,7 +11,8 @@
 
 #ifdef MS_WINDOWS
 #  include <windows.h>            // GetFullPathNameW(), MAX_PATH
-#  include <pathcch.h>
+// #  include <pathcch.h>
+#  include "pathcch.private.h"
 #endif
 
 #ifdef __APPLE__
@@ -758,47 +759,6 @@ progname_to_dict(PyObject *dict, const char *key)
 }
 
 
-/* Add the runtime library's path to the dict */
-static int
-library_to_dict(PyObject *dict, const char *key)
-{
-#ifdef MS_WINDOWS
-    extern HMODULE PyWin_DLLhModule;
-    if (PyWin_DLLhModule) {
-        return winmodule_to_dict(dict, key, PyWin_DLLhModule);
-    }
-#elif defined(WITH_NEXT_FRAMEWORK)
-    static char modPath[MAXPATHLEN + 1];
-    static int modPathInitialized = -1;
-    if (modPathInitialized < 0) {
-        modPathInitialized = 0;
-
-        /* On Mac OS X we have a special case if we're running from a framework.
-           This is because the python home should be set relative to the library,
-           which is in the framework, not relative to the executable, which may
-           be outside of the framework. Except when we're in the build
-           directory... */
-        NSSymbol symbol = NSLookupAndBindSymbol("_Py_Initialize");
-        if (symbol != NULL) {
-            NSModule pythonModule = NSModuleForSymbol(symbol);
-            if (pythonModule != NULL) {
-                /* Use dylib functions to find out where the framework was loaded from */
-                const char *path = NSLibraryNameForModule(pythonModule);
-                if (path) {
-                    strncpy(modPath, path, MAXPATHLEN);
-                    modPathInitialized = 1;
-                }
-            }
-        }
-    }
-    if (modPathInitialized > 0) {
-        return decode_to_dict(dict, key, modPath);
-    }
-#endif
-    return PyDict_SetItemString(dict, key, Py_None) == 0;
-}
-
-
 PyObject *
 _Py_Get_Getpath_CodeObject(void)
 {
@@ -909,7 +869,7 @@ _PyConfig_InitPathConfig(PyConfig *config, int compute_path_config)
         !env_to_dict(dict, "ENV_PYTHONEXECUTABLE", 0) ||
         !env_to_dict(dict, "ENV___PYVENV_LAUNCHER__", 1) ||
         !progname_to_dict(dict, "real_executable") ||
-        !library_to_dict(dict, "library") ||
+        !wchar_to_dict(dict, "library", NULL) ||
         !wchar_to_dict(dict, "executable_dir", NULL) ||
         !wchar_to_dict(dict, "py_setpath", _PyPathConfig_GetGlobalModuleSearchPath()) ||
         !funcs_to_dict(dict, config->pathconfig_warnings) ||

Modules/_tkinter.c

@@ -15,7 +15,8 @@
 // whereas pycore_condvar.h defines the WIN32_LEAN_AND_MEAN macro.
 #ifdef MS_WINDOWS
 #  include <windows.h>
-#  include <pathcch.h>
+//#  include <pathcch.h>
+#  include "pathcch.private.h"
 #  include <lmcons.h>             // UNLEN
 #  include "osdefs.h"             // SEP
 #  define HAVE_SYMLINK

Modules/getpath.c

@@ -5,9 +5,6 @@
 
 #include "Python.h"
 
-/* Define extern variables omitted from minimal builds */
-void *PyWin_DLLhModule = NULL;
-
 
 extern PyObject* PyInit_faulthandler(void);
 extern PyObject* PyInit__tracemalloc(void);