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

OSX Python scripting plugin path fixes.

This commit is contained in:
Bernhard Stegmaier 2015-10-02 16:07:29 -04:00 committed by Wayne Stambaugh
parent 8e5e2164e8
commit 3f807bdc78
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pcbnew/pcbnew.cpp
View File

@ -252,20 +252,31 @@ static bool scriptingSetup()
path_frag = Pgm().GetExecutablePath() + wxT( "../share/kicad/scripting/plugins" ); path_frag = Pgm().GetExecutablePath() + wxT( "../share/kicad/scripting/plugins" );
#elif defined( __WXMAC__ ) #elif defined( __WXMAC__ )
// User plugin folder is ~/Library/Application Support/kicad/scripting/plugins // TODO:
path_frag = GetOSXKicadUserDataDir() + wxT( "/scripting/plugins" ); // For scripting currently only the bundle scripting path and the path
// defined by $(KICAD_PATH)/scripting/plugins is defined.
// These paths are defined here and in kicadplugins.i
// In future, probably more paths are of interest:
// * User folder (~/Library/Application Support/kicad/scripting/plugins)
// => GetOSXKicadUserDataDir() + wxT( "/scripting/plugins" );
// * Machine folder (/Library/Application Support/kicad/scripting/plugins)
// => GetOSXKicadMachineDataDir() + wxT( "/scripting/plugins" );
// This path is given to LoadPlugins() from kicadplugins.i, which
// only supports one path. Only use bundle scripting path for now.
path_frag = GetOSXKicadDataDir() + wxT( "/scripting/plugins" );
// Add default paths to PYTHONPATH // Add default paths to PYTHONPATH
wxString pypath; wxString pypath;
// User scripting folder (~/Library/Application Support/kicad/scripting/plugins)
pypath = GetOSXKicadUserDataDir() + wxT( "/scripting/plugins" );
// Machine scripting folder (/Library/Application Support/kicad/scripting/plugins)
pypath += wxT( ":" ) + GetOSXKicadMachineDataDir() + wxT( "/scripting/plugins" );
// Bundle scripting folder (<kicad.app>/Contents/SharedSupport/scripting/plugins) // Bundle scripting folder (<kicad.app>/Contents/SharedSupport/scripting/plugins)
pypath += wxT( ":" ) + GetOSXKicadDataDir() + wxT( "/scripting/plugins" ); pypath += GetOSXKicadDataDir() + wxT( "/scripting/plugins" );
// $(KICAD_PATH)/scripting/plugins is always added in kicadplugins.i
if( wxGetenv("KICAD_PATH") != NULL )
{
pypath += wxT( ":" ) + wxString( wxGetenv("KICAD_PATH") );
}
// Bundle wxPython folder (<kicad.app>/Contents/Frameworks/python/site-packages) // Bundle wxPython folder (<kicad.app>/Contents/Frameworks/python/site-packages)
pypath += wxT( ":" ) + Pgm().GetExecutablePath() + pypath += wxT( ":" ) + Pgm().GetExecutablePath() +

4
scripting/kicadplugins.i
View File

@ -95,10 +95,6 @@ def LoadPlugins(plugpath):
plugin_directories.append(os.environ['HOME']+'/.kicad_plugins/') plugin_directories.append(os.environ['HOME']+'/.kicad_plugins/')
plugin_directories.append(os.environ['HOME']+'/.kicad/scripting/plugins/') plugin_directories.append(os.environ['HOME']+'/.kicad/scripting/plugins/')
if sys.platform.startswith('darwin'):
for singlepath in sys.path:
plugin_directories.append(os.path.join( singlepath, 'scripting', 'plugins'))
for plugins_dir in plugin_directories: for plugins_dir in plugin_directories:
if not os.path.isdir(plugins_dir): if not os.path.isdir(plugins_dir):
continue continue