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

Refactor definition of stock data path 

It is not always useful to distinguish between the cases when KiCad is
run from the build or the installation directory. E.g., the libraries
are generally not available in the same path as the code. Make the
evaluation of KICAD_RUN_FROM_BUILD_DIR conditional to accomodate these
scenarios.
This commit is contained in:
Marcus A. Romer 2021-03-20 16:41:34 +01:00 committed by Jon Evans
parent fe196771d8
commit e9eb5a5e21
2 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
common/paths.cpp
View File

@ -137,11 +137,11 @@ wxString PATHS::GetDefaultUserProjectsPath()
}
wxString PATHS::GetStockDataPath()
wxString PATHS::GetStockDataPath( bool aRespectRunFromBuildDir )
{
wxString path;
if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
if( aRespectRunFromBuildDir && wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
// Allow debugging from build dir by placing relevant files/folders in the build root
path = Pgm().GetExecutablePath() + wxT( ".." );
@ -165,15 +165,7 @@ wxString PATHS::GetStockScriptingPath()
{
wxString path;
if( wxGetEnv( wxT( "KICAD_RUN_FROM_BUILD_DIR" ), nullptr ) )
{
// Allow debugging from build dir by placing a "scripting" folder in the build root
path = Pgm().GetExecutablePath() + wxT( "../scripting" );
}
else
{
path = GetStockDataPath() + wxT( "/scripting" );
}
return path;
}
@ -183,18 +175,12 @@ wxString PATHS::GetStockPluginsPath()
{
wxFileName fn;
#if defined( __WXMAC__ )
fn.Assign( PATHS::GetOSXKicadDataDir() );
fn.AppendDir( wxT( "plugins" ) );
#elif defined( __WXMSW__ )
fn.Assign( Pgm().GetExecutablePath() + wxT( "/plugins/" ) );
#if defined( __WXMSW__ )
fn.AssignDir( Pgm().GetExecutablePath() );
#else
// KICAD_DATA is the absolute path
// corresponding to the install path used for constructing KICAD_USER_PLUGIN
wxString tfname = wxString::FromUTF8Unchecked( KICAD_DATA );
fn.Assign( tfname, "" );
fn.AppendDir( wxT( "plugins" ) );
fn.AssignDir( PATHS::GetStockDataPath( false ) );
#endif
fn.AppendDir( wxT( "plugins" ) );
return fn.GetPathWithSep();
}

2
include/paths.h
View File

@ -70,7 +70,7 @@ public:
/**
* Gets the stock (install) data path, which is the base path for things like scripting, etc
*/
static wxString GetStockDataPath();
static wxString GetStockDataPath( bool aRespectRunFromBuildDir = true );
/**
* Gets the stock (install) scripting path