[KiCad 10][Added] Support to native variants on KiAuto targets

Author: set-soft

kibot/gs.py

@@ -877,7 +877,7 @@ def get_kiauto_video_name(cmd):
         return command+'_screencast.ogv'
 
     @staticmethod
-    def add_extra_options(cmd):
+    def add_extra_options(cmd, variant=None):
         is_gitlab_ci = 'GITLAB_CI' in os.environ
         video_remove = (not GS.debug_enabled) and is_gitlab_ci
         if GS.debug_enabled:
@@ -891,6 +891,9 @@ def add_extra_options(cmd):
         if GS.global_kiauto_wait_start:
             cmd.insert(1, str(GS.global_kiauto_wait_start))
             cmd.insert(1, '--wait_start')
+        if variant:
+            cmd.insert(1, variant)
+            cmd.insert(1, '--variant')
         return cmd, video_remove
 
     @staticmethod

kibot/out_any_diff.py

@@ -63,6 +63,7 @@ def add_to_cache(self, name, hash):
             cmd.append('--all_pages')
         if GS.debug_enabled:
             cmd.insert(1, '-'+'v'*GS.debug_level)
+        self.add_kicad_cli_variant(cmd)
         cmd.extend([name, name])
         self.name_used_for_cache = name
         run_command(cmd)

kibot/out_base.py

@@ -1128,7 +1128,7 @@ def remove_temporals(self):
         self._highlight_3D_file = None
 
     def add_extra_options(self, cmd, dir=None):
-        cmd, video_remove = GS.add_extra_options(cmd)
+        cmd, video_remove = GS.add_extra_options(cmd, self.kicad_variant_name())
         if video_remove:
             self._files_to_remove.append(os.path.join(dir or cmd[-1], GS.get_kiauto_video_name(cmd)))
         return cmd

kibot/out_diff.py

@@ -7,6 +7,7 @@
 Dependencies:
   - name: KiCad PCB/SCH Diff
     version: 2.5.3
+    version_k10: 2.6.0
     role: mandatory
     github: INTI-CMNB/KiDiff
     command: kicad-diff.py
@@ -21,7 +22,7 @@
     version_k7: 2.2.8
     version_k8: 2.3.2
     version_k9: 2.3.5
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 from hashlib import sha1
 from itertools import combinations
@@ -493,6 +494,7 @@ def do_compare(self, old, old_type, new, new_type, name, name_ori):
             cmd.append('--only_different')
         if not self.only_first_sch_page:
             cmd.append('--all_pages')
+        self.add_kicad_cli_variant(cmd)
         cmd.extend([name_used_for_old, name_used_for_new])
         if GS.debug_enabled:
             cmd.insert(1, '-'+'v'*GS.debug_level)

kibot/out_dxf_sch_print.py

@@ -9,7 +9,7 @@
     role: mandatory
     command: eeschema_do
     version: 2.3.6
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 from .gs import GS
 from .out_any_sch_print import Any_SCH_PrintOptions

kibot/out_gencad.py

@@ -11,7 +11,7 @@
     version_k7: 2.2.8
     version_k8: 2.3.2
     version_k9: 2.3.5
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 import os
 from .gs import GS

kibot/out_hpgl_sch_print.py

@@ -9,7 +9,7 @@
     role: mandatory
     command: eeschema_do
     version: 2.3.6
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 from .gs import GS
 from .out_any_sch_print import Any_SCH_PrintOptions

kibot/out_info.py

@@ -11,7 +11,7 @@
     version_k7: 2.2.8
     version_k8: 2.3.2
     version_k9: 2.3.5
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 import os
 import sys

kibot/out_kiri.py

@@ -7,6 +7,7 @@
 Dependencies:
   - name: KiCad PCB/SCH Diff
     version: 2.5.1
+    version_k10: 2.6.0
     role: mandatory
     github: INTI-CMNB/KiDiff
     command: kicad-diff.py
@@ -21,7 +22,7 @@
     version_k7: 2.2.8
     version_k8: 2.3.2
     version_k9: 2.3.5
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 import datetime
 import glob

kibot/out_netlist.py

@@ -12,7 +12,7 @@
     version_k7: 2.2.8
     version_k8: 2.3.2
     version_k9: 2.3.5
-    version_k10: 2.3.7
+    version_k10: 2.3.9
 """
 import os
 from .gs import GS