templates
/
KiBot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Dependencies] Added more local share plug-in dirs 

- Also added the current iBoM plug-in path
This commit is contained in:
Salvador E. Tropea 2022-08-12 12:59:44 -03:00
parent 9e97b82b50
commit 91185ca56a
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kibot/__main__.py
View File

@ -231,9 +231,11 @@ def detect_kicad():
GS.kicad_plugins_dirs.append(os.path.join(home, '.kicad', 'scripting')) GS.kicad_plugins_dirs.append(os.path.join(home, '.kicad', 'scripting'))
GS.kicad_plugins_dirs.append(os.path.join(home, '.kicad', 'scripting', 'plugins')) GS.kicad_plugins_dirs.append(os.path.join(home, '.kicad', 'scripting', 'plugins'))
if GS.kicad_version_major >= 6: if GS.kicad_version_major >= 6:
# KiCad 6.0 PCM
ver_dir = str(GS.kicad_version_major)+'.'+str(GS.kicad_version_minor) ver_dir = str(GS.kicad_version_major)+'.'+str(GS.kicad_version_minor)
GS.kicad_plugins_dirs.append(os.path.join(home, '.local', 'share', 'kicad', ver_dir, '3rdparty', 'plugins')) local_share = os.path.join(home, '.local', 'share', 'kicad', ver_dir)
GS.kicad_plugins_dirs.append(os.path.join(local_share, 'scripting'))
GS.kicad_plugins_dirs.append(os.path.join(local_share, 'scripting', 'plugins'))
GS.kicad_plugins_dirs.append(os.path.join(local_share, '3rdparty', 'plugins')) # KiCad 6.0 PCM
if GS.debug_level > 1: if GS.debug_level > 1:
logger.debug('KiCad config path {}'.format(GS.kicad_conf_path)) logger.debug('KiCad config path {}'.format(GS.kicad_conf_path))

1
kibot/out_ibom.py
View File

@ -13,6 +13,7 @@ Dependencies:
plugin_dirs: plugin_dirs:
- InteractiveHtmlBom - InteractiveHtmlBom
- InteractiveHtmlBom/InteractiveHtmlBom - InteractiveHtmlBom/InteractiveHtmlBom
- org_openscopeproject_InteractiveHtmlBom
- org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom - org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom
version: 2.4.1.4 version: 2.4.1.4
downloader: pytool downloader: pytool

6
src/kibot-check
View File

@ -184,6 +184,7 @@ deps = '{\
"plugin_dirs": [\ "plugin_dirs": [\
"InteractiveHtmlBom",\ "InteractiveHtmlBom",\
"InteractiveHtmlBom/InteractiveHtmlBom",\ "InteractiveHtmlBom/InteractiveHtmlBom",\
"org_openscopeproject_InteractiveHtmlBom",\
"org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom"\ "org_openscopeproject_InteractiveHtmlBom/InteractiveHtmlBom"\
],\ ],\
"pypi_name": "Interactive HTML BoM",\ "pypi_name": "Interactive HTML BoM",\
@ -1046,7 +1047,10 @@ if kicad_ok:
if kicad_version[0] >= 6 and home: if kicad_version[0] >= 6 and home:
# KiCad 6.0 PCM # KiCad 6.0 PCM
ver_dir = str(kicad_version[0])+'.'+str(kicad_version[1]) ver_dir = str(kicad_version[0])+'.'+str(kicad_version[1])
kicad_plugins_dirs.append(os.path.join(home, '.local', 'share', 'kicad', ver_dir, '3rdparty', 'plugins')) local_share = os.path.join(home, '.local', 'share', 'kicad', ver_dir)
kicad_plugins_dirs.append(os.path.join(local_share, 'scripting'))
kicad_plugins_dirs.append(os.path.join(local_share, 'scripting', 'plugins'))
kicad_plugins_dirs.append(os.path.join(local_share, '3rdparty', 'plugins')) # KiCad 6.0 PCM
except: except:
version = 'Older than 5.1.6' version = 'Older than 5.1.6'
else: else:

5
src/kibot-check.in
View File

@ -328,7 +328,10 @@ if kicad_ok:
if kicad_version[0] >= 6 and home: if kicad_version[0] >= 6 and home:
# KiCad 6.0 PCM # KiCad 6.0 PCM
ver_dir = str(kicad_version[0])+'.'+str(kicad_version[1]) ver_dir = str(kicad_version[0])+'.'+str(kicad_version[1])
kicad_plugins_dirs.append(os.path.join(home, '.local', 'share', 'kicad', ver_dir, '3rdparty', 'plugins')) local_share = os.path.join(home, '.local', 'share', 'kicad', ver_dir)
kicad_plugins_dirs.append(os.path.join(local_share, 'scripting'))
kicad_plugins_dirs.append(os.path.join(local_share, 'scripting', 'plugins'))
kicad_plugins_dirs.append(os.path.join(local_share, '3rdparty', 'plugins')) # KiCad 6.0 PCM
except: except:
version = 'Older than 5.1.6' version = 'Older than 5.1.6'
else: else: