AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-20 22:51:41 +00:00
Files Issues Releases Activity

Make Windows hacks dependent on using KiCad-shipped interpreter

Browse Source
This commit is contained in:
Jon Evans 2025-01-11 12:24:27 -05:00
parent 25e7b29ad1
commit 17c746c00a
1 changed files with 26 additions and 6 deletions

32
common/api/api_plugin_manager.cpp
View File

@ -29,6 +29,7 @@
#include <api/api_plugin_manager.h>
#include <api/api_server.h>
#include <api/api_utils.h>
#include <gestfich.h>
#include <paths.h>
#include <pgm_base.h>
#include <python_manager.h>
@ -268,8 +269,13 @@ void API_PLUGIN_MANAGER::InvokeAction( const wxString& aIdentifier )
wxGetEnv( wxS( "SYSTEMROOT" ), &systemRoot );
env.env[wxS( "SYSTEMROOT" )] = systemRoot;
env.env.erase( "PYTHONHOME" );
env.env.erase( "PYTHONPATH" );
if( Pgm().GetCommonSettings()->m_Api.python_interpreter == FindKicadFile( "pythonw.exe" )
|| wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
wxLogTrace( traceApi, "Configured Python is the KiCad one; erasing path overrides..." );
env.env.erase( "PYTHONHOME" );
env.env.erase( "PYTHONPATH" );
}
#endif
if( pythonHome )
@ -443,12 +449,19 @@ void API_PLUGIN_MANAGER::processNextJob( wxCommandEvent& aEvent )
PYTHON_MANAGER manager( Pgm().GetCommonSettings()->m_Api.python_interpreter );
wxExecuteEnv env;
#ifdef _WIN32
wxString systemRoot;
wxGetEnv( wxS( "SYSTEMROOT" ), &systemRoot );
env.env[wxS( "SYSTEMROOT" )] = systemRoot;
env.env.erase( "PYTHONHOME" );
env.env.erase( "PYTHONPATH" );
if( Pgm().GetCommonSettings()->m_Api.python_interpreter == FindKicadFile( "pythonw.exe" )
|| wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
wxLogTrace( traceApi, "Configured Python is the KiCad one; erasing path overrides..." );
env.env.erase( "PYTHONHOME" );
env.env.erase( "PYTHONPATH" );
}
#endif
manager.Execute(
wxString::Format( wxS( "-m venv --system-site-packages \"%s\"" ),
@ -496,8 +509,15 @@ void API_PLUGIN_MANAGER::processNextJob( wxCommandEvent& aEvent )
wxGetEnv( wxS( "SYSTEMROOT" ), &systemRoot );
env.env[wxS( "SYSTEMROOT" )] = systemRoot;
env.env.erase( "PYTHONHOME" );
env.env.erase( "PYTHONPATH" );
if( Pgm().GetCommonSettings()->m_Api.python_interpreter
== FindKicadFile( "pythonw.exe" )
|| wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
wxLogTrace( traceApi,
"Configured Python is the KiCad one; erasing path overrides..." );
env.env.erase( "PYTHONHOME" );
env.env.erase( "PYTHONPATH" );
}
#endif
wxString cmd = wxS( "-m pip install --upgrade pip" );