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

Transparently support old versioned env vars for symbol and footprint libs

This commit is contained in:
Jon Evans 2024-02-14 16:58:39 -05:00
parent 7b0bb59b37
commit 944a3d7962
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
common/common.cpp
View File

@ -147,6 +147,25 @@ wxString KIwxExpandEnvVars( const wxString& str, const PROJECT* aProject, std::s
wxString strResult; wxString strResult;
strResult.Alloc( strlen ); // best guess (improves performance) strResult.Alloc( strlen ); // best guess (improves performance)
auto getVersionedEnvVar = []( const wxString& aMatch, wxString& aResult ) -> bool
{
for ( const wxString& var : ENV_VAR::GetPredefinedEnvVars() )
{
if( var.Matches( aMatch ) )
{
const auto value = ENV_VAR::GetEnvVar<wxString>( var );
if( !value )
continue;
aResult += *value;
return true;
}
}
return false;
};
for( size_t n = 0; n < strlen; n++ ) for( size_t n = 0; n < strlen; n++ )
{ {
wxUniChar str_n = str[n]; wxUniChar str_n = str[n];
@ -222,26 +241,24 @@ wxString KIwxExpandEnvVars( const wxString& str, const PROJECT* aProject, std::s
strResult += tmp; strResult += tmp;
expanded = true; expanded = true;
} }
// Replace unmatched older variables with current 3d model locations // Replace unmatched older variables with current locations
// If the user has the older model location defined, that will be matched // If the user has the older location defined, that will be matched
// first above. But if they do not, this will ensure that their board still // first above. But if they do not, this will ensure that their board still
// displays correctly // displays correctly
else if( strVarName.Contains( "KISYS3DMOD") || strVarName.Matches( "KICAD*_3DMODEL_DIR" ) ) else if( strVarName.Contains( "KISYS3DMOD") || strVarName.Matches( "KICAD*_3DMODEL_DIR" ) )
{ {
for( auto& var : ENV_VAR::GetPredefinedEnvVars() ) if( getVersionedEnvVar( "KICAD*_3DMODEL_DIR", strResult ) )
{ expanded = true;
if( var.Matches( "KICAD*_3DMODEL_DIR" ) ) }
{ else if( strVarName.Matches( "KICAD*_SYMBOL_DIR" ) )
const auto value = ENV_VAR::GetEnvVar<wxString>( var ); {
if( getVersionedEnvVar( "KICAD*_SYMBOL_DIR", strResult ) )
if( !value ) expanded = true;
continue; }
else if( strVarName.Matches( "KICAD*_FOOTPRINT_DIR" ) )
strResult += *value; {
expanded = true; if( getVersionedEnvVar( "KICAD*_FOOTPRINT_DIR", strResult ) )
break; expanded = true;
}
}
} }
else else
{ {