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

Netlist exporter spice: expand env vars when used in include library name.

This commit is contained in:
jean-pierre charras 2021-07-09 12:54:45 +02:00
parent 473f10ab1f
commit f55f9a522b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/netlist_exporters/netlist_exporter_pspice.cpp
View File

@ -36,6 +36,7 @@
#include <sch_reference_list.h> #include <sch_reference_list.h>
#include <env_paths.h> #include <env_paths.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <common.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <wx/regex.h> #include <wx/regex.h>
@ -94,25 +95,27 @@ bool NETLIST_EXPORTER_PSPICE::Format( OUTPUTFORMATTER* aFormatter, unsigned aCtl
aFormatter->Print( 0, ".title %s\n", TO_UTF8( m_title ) ); aFormatter->Print( 0, ".title %s\n", TO_UTF8( m_title ) );
// Write .include directives // Write .include directives
for( const wxString& lib : m_libraries ) for( const wxString& curr_lib : m_libraries )
{ {
// First, expand env vars, if any
wxString libname = ExpandEnvVarSubstitutions( curr_lib, &m_schematic->Prj() );
wxString full_path; wxString full_path;
if( ( aCtl & NET_ADJUST_INCLUDE_PATHS ) ) if( ( aCtl & NET_ADJUST_INCLUDE_PATHS ) )
{ {
// Look for the library in known search locations // Look for the library in known search locations
full_path = ResolveFile( lib, &Pgm().GetLocalEnvVariables(), &m_schematic->Prj() ); full_path = ResolveFile( libname, &Pgm().GetLocalEnvVariables(), &m_schematic->Prj() );
if( full_path.IsEmpty() ) if( full_path.IsEmpty() )
{ {
DisplayError( nullptr, wxString::Format( _( "Could not find library file %s." ), DisplayError( nullptr, wxString::Format( _( "Could not find library file %s." ),
lib ) ); libname ) );
full_path = lib; full_path = libname;
} }
} }
else else
{ {
full_path = lib; // just use the unaltered path full_path = libname; // just use the unaltered path
} }
aFormatter->Print( 0, ".include \"%s\"\n", TO_UTF8( full_path ) ); aFormatter->Print( 0, ".include \"%s\"\n", TO_UTF8( full_path ) );