haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Relax wxPython version mismatch check to major.minor 

The previous version check failed when the version was even slightly
different, including on the revision field. Theoretically the ABI of the
wx minor versions in use should be the same, so this might work. On the
other hand, with wxPython it could break as well. YOLO.

(Cherry-picked from 1e8cc6855d)
This commit is contained in:
Ian McInerney 2023-02-14 00:18:56 +00:00 committed by Ian McInerney
parent 048c8b1670
commit e078fea846
1 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
scripting/python_scripting.cpp
View File

@ -50,6 +50,7 @@
#include <kiplatform/environment.h>
#include <wx/app.h>
#include <wx/regex.h>
#include <wx/utils.h>
#include <config.h>
@ -128,7 +129,39 @@ except:
wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
version = version.Mid( idx + 10 );
if( wxVersion.Cmp( version ) != 0 )
int wxPy_major = 0;
int wxPy_minor = 0;
int wxPy_micro = 0;
int wxPy_rev = 0;
// Compile a regex to extract the wxPython version
wxRegEx re( "([0-9]+)\\.([0-9]+)\\.?([0-9]+)?\\.?([0-9]+)?" );
wxASSERT( re.IsValid() );
if( re.Matches( version ) )
{
wxString v = re.GetMatch( version, 1 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_major );
v = re.GetMatch( version, 2 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_minor );
v = re.GetMatch( version, 3 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_micro );
v = re.GetMatch( version, 4 );
if( !v.IsEmpty() )
v.ToInt( &wxPy_rev );
}
if( ( wxVI.GetMajor() != wxPy_major ) || ( wxVI.GetMinor() != wxPy_minor ) )
{
wxString msg = wxT( "The wxPython library was compiled against wxWidgets %s but KiCad is "
"using %s. Python plugins will not be available." );