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

bom_plugins.cpp: fix incorrect command line for python scripts on Windows. 

* On Windows, a python command line must be python <script_path>/script.py
and not python <script_path>\script.py
* Fix also a incorrect warning message when a script is not found.
This commit is contained in:
jean-pierre charras 2018-11-19 17:26:32 +01:00
parent 5bb5aea936
commit 8522baf4a7
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
eeschema/bom_plugins.cpp
View File

@ -28,11 +28,16 @@ BOM_PLUGIN::BOM_PLUGIN( const wxString& aFile )
: m_file( aFile )
{
if( !wxFile::Exists( aFile ) )
throw std::runtime_error( _( "Cannot open plugin " ) + aFile.ToStdString() );
throw std::runtime_error( ( _( "Cannot open plugin " ) + aFile ).ToStdString() );
m_name = m_file.GetName();
wxString extension = m_file.GetExt().Lower();
// Important note:
// On Windows the right command command to run a python script is:
// python <script_path>/script.py
// and *not* python <script_path>\script.py
// Otherwise the script does not find some auxiliary pythons scripts needed by this script
if( extension == "xsl" )
{
m_info = readHeader( "-->" );
@ -41,13 +46,19 @@ BOM_PLUGIN::BOM_PLUGIN( const wxString& aFile )
else if( extension == "py" )
{
m_info = readHeader( "\"\"\"" );
#ifdef __WINDOWS__
m_cmd = wxString::Format( "python \"%s/%s\" \"%%I\" \"%%O\"",
m_file.GetPath(), m_file.GetFullName() );
#else
m_cmd = wxString::Format( "python \"%s\" \"%%I\" \"%%O\"", m_file.GetFullPath() );
#endif
}
#ifdef __WINDOWS__
else if( extension == "pyw" )
{
m_info = readHeader( "\"\"\"" );
m_cmd = wxString::Format( "pythonw \"%s\" \"%%I\" \"%%O\"", m_file.GetFullPath() );
m_cmd = wxString::Format( "pythonw \"%s/%s\" \"%%I\" \"%%O\"",
m_file.GetPath(),m_file.GetFullName() );
}
#endif /* __WINDOWS__ */
else // fallback

4
eeschema/dialogs/dialog_bom.cpp
View File

@ -194,7 +194,7 @@ private:
{
int idx = m_lbPlugins->GetSelection();
if( idx < 0 || idx >= m_plugins.size() )
if( idx < 0 || idx >= (int)m_plugins.size() )
return nullptr;
return m_plugins[idx].get();
@ -502,7 +502,7 @@ void DIALOG_BOM::OnAddPlugin( wxCommandEvent& event )
try
{
auto plugin = addPlugin( fn.GetFullPath(), name );
auto plugin = addPlugin( fn.GetFullPath(), name );
if( plugin )
{