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

[KiCad 7] Added KICAD7_* variables expansion

This commit is contained in:
Salvador E. Tropea 2023-02-09 09:29:06 -03:00
parent 7d597b3629
commit e92da81882
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kibot/__main__.py
View File

@ -191,8 +191,10 @@ def detect_kicad():
GS.kicad_version_minor = int(m.group(2)) GS.kicad_version_minor = int(m.group(2))
GS.kicad_version_patch = int(m.group(3)) GS.kicad_version_patch = int(m.group(3))
GS.kicad_version_n = GS.kicad_version_major*1000000+GS.kicad_version_minor*1000+GS.kicad_version_patch GS.kicad_version_n = GS.kicad_version_major*1000000+GS.kicad_version_minor*1000+GS.kicad_version_patch
GS.ki6 = GS.kicad_version_major >= 6
GS.ki5 = GS.kicad_version_major < 6 GS.ki5 = GS.kicad_version_major < 6
GS.ki6 = GS.kicad_version_major >= 6
GS.ki6_only = GS.kicad_version_major == 6
GS.ki7 = GS.kicad_version_major >= 7
logger.debug('Detected KiCad v{}.{}.{} ({} {})'.format(GS.kicad_version_major, GS.kicad_version_minor, logger.debug('Detected KiCad v{}.{}.{} ({} {})'.format(GS.kicad_version_major, GS.kicad_version_minor,
GS.kicad_version_patch, GS.kicad_version, GS.kicad_version_n)) GS.kicad_version_patch, GS.kicad_version, GS.kicad_version_n))
# Used to look for plug-ins. # Used to look for plug-ins.

4
kibot/kicad/config.py
View File

@ -337,7 +337,7 @@ class KiConf(object):
names = [] names = []
if GS.ki6 and ki6_diff: if GS.ki6 and ki6_diff:
# KiCad 6 specific name goes first when using KiCad 6 # KiCad 6 specific name goes first when using KiCad 6
names.append('KICAD6_'+base_name) names.append('KICAD{}_{}'.format(GS.kicad_version_major, base_name))
# KiCad 5 names, allowed even when using KiCad 6 # KiCad 5 names, allowed even when using KiCad 6
if not only_old: if not only_old:
# A KICAD_* is valid # A KICAD_* is valid
@ -378,7 +378,7 @@ class KiConf(object):
if not no_dir: if not no_dir:
base_name += '_DIR' base_name += '_DIR'
if GS.ki6 and ki6_diff: if GS.ki6 and ki6_diff:
name = 'KICAD6_'+base_name name = 'KICAD{}_{}'.format(GS.kicad_version_major, base_name)
else: else:
name = 'KICAD_'+base_name name = 'KICAD_'+base_name
KiConf.kicad_env[name] = val KiConf.kicad_env[name] = val