From 5ff4edb5d06e07d3507f6d1bdbb7d7646d1f4b62 Mon Sep 17 00:00:00 2001
From: Marco Massarelli <60667061+ceoloide@users.noreply.github.com>
Date: Mon, 1 Apr 2024 16:21:22 +0000
Subject: [PATCH] Update build scripts to make use of KiCad Auto ki8 image
 (KiCad 8)

---
 build.sh            | 9 +++++++--
 kibot/import_ses.py | 0
 rebuild.sh          | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 kibot/import_ses.py
 mode change 100644 => 100755 rebuild.sh

diff --git a/build.sh b/build.sh
index baaf00a..dd64c67 100755
--- a/build.sh
+++ b/build.sh
@@ -9,7 +9,7 @@ boards="corney_island_wireless corney_island"
 plates="backplate frontplate controller_overlay"
 
 # Define the KiCad Auto Docker image to use
-kicad_auto_image="setsoft/kicad_auto:ki7"
+kicad_auto_image="setsoft/kicad_auto:ki8"
 # kicad_auto_image="ceoloide/kicad_auto:nightly"
 # freerouting_cli_image="ceoloide/kicad_auto:nightly"
 freerouting_cli_image="soundmonster/freerouting_cli:v0.1.0"
@@ -45,6 +45,10 @@ if [ ! -e freerouting/freerouting-1.9.0.jar ]; then
     curl https://github.com/freerouting/freerouting/releases/download/v1.9.0/freerouting-1.9.0.jar -L -o freerouting/freerouting-1.9.0.jar
 fi
 
+if [ ! -e freerouting/freerouting-SNAPSHOT.jar ]; then
+    curl https://github.com/freerouting/freerouting/releases/download/SNAPSHOT/freerouting-SNAPSHOT-20240328_160200.jar -L -o freerouting/freerouting-SNAPSHOT.jar
+fi
+
 for plate in ${plates}
 do
     echo "\n\n>>>>>> Processing $plate <<<<<<\n\n"
@@ -68,8 +72,9 @@ do
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.6.5.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.7.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.8.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
-        # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.9.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/${board}.rules -mp 20 -dct 1
+        # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-1.9.0.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
         # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-test.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
+        # java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar freerouting/freerouting-SNAPSHOT.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20 -dct 1
         ${container_cmd} run ${container_args} ${freerouting_cli_image} java -Dlog4j.configurationFile=file:./freerouting/log4j2.xml -jar /opt/freerouting_cli.jar -de ergogen/output/pcbs/${board}.dsn -do ergogen/output/pcbs/${board}.ses -dr freerouting/freerouting.rules -mp 20
         # ${container_cmd} run ${container_args} nixos/nix nix-shell --argstr board ${board}
     fi
diff --git a/kibot/import_ses.py b/kibot/import_ses.py
old mode 100644
new mode 100755
diff --git a/rebuild.sh b/rebuild.sh
old mode 100644
new mode 100755
index 62b48bd..a0a3e76
--- a/rebuild.sh
+++ b/rebuild.sh
@@ -7,7 +7,7 @@ container_args="-w /board -v $(pwd):/board --rm"
 # Define the boards to autoroute and export, and the plates
 boards="corney_island_wireless"
 # kicad_auto_image="ghcr.io/inti-cmnb/kicad7_auto:latest"
-kicad_auto_image="setsoft/kicad_auto:ki7"
+kicad_auto_image="setsoft/kicad_auto:ki8"
 # freerouting_cli_image="ceoloide/kicad_auto:nightly"
 freerouting_cli_image="soundmonster/freerouting_cli:v0.1.0"