Skip to content

Commit

Permalink
Update build scripts to make use of KiCad Auto ki8 image (KiCad 8)
Browse files Browse the repository at this point in the history
  • Loading branch information
ceoloide authored Apr 1, 2024
1 parent 1571eff commit 5ff4edb
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
Empty file modified kibot/import_ses.py
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion rebuild.sh
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down

0 comments on commit 5ff4edb

Please sign in to comment.