From c4d8c85a7b255839e821f300a53964522451c46b Mon Sep 17 00:00:00 2001
From: David Holdeman <dave@holdemanenterprises.com>
Date: Thu, 28 Jan 2021 18:41:24 -0600
Subject: [PATCH] iBOM improvements (#2239)

* switch to official ppa

* remove xvfb dependency

* gen all boards

* redirect output

* seems xvfb is still needed

* undocumented commands?

* update InteractiveHtmlBom

* try without xvfb again

* remove tracks flag, move nets flag to var

* Undo rescue entry
---
 .github/workflows/gen-docs.yaml        |  9 +++++----
 hardware/InteractiveHtmlBom            |  2 +-
 misc/jenkins/InteractiveHtmlBom/run.sh | 18 ++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/gen-docs.yaml b/.github/workflows/gen-docs.yaml
index be382e2680..bbe184be1f 100644
--- a/.github/workflows/gen-docs.yaml
+++ b/.github/workflows/gen-docs.yaml
@@ -14,15 +14,16 @@ jobs:
         submodules: recursive
         fetch-depth: 0
 
-    - name: Install ncftp, kicad, xvfb, and doxygen
+    - name: Install ncftp, kicad, and doxygen
       run: |
-        sudo add-apt-repository ppa:js-reynaud/kicad-5.1
+        sudo add-apt-repository ppa:kicad/kicad-5.1-releases
         sudo apt-get update
-        sudo apt-get install ncftp kicad doxygen xvfb
+        sudo apt-get install ncftp kicad doxygen
 
     - name: Set FTP variables
       env:
         ACTIONS_ALLOW_UNSECURE_COMMANDS: 'true'
+        INTERACTIVE_HTML_BOM_NO_DISPLAY: 'true'
       run: |
         if [ "${{github.event_name}}" = "push" ] && [ "${{github.ref}}" = "refs/heads/master" ]; then
           echo "::set-env name=RUSEFI_FTP_SERVER::${{secrets.RUSEFI_FTP_SERVER}}";
@@ -31,4 +32,4 @@ jobs:
         fi
 
     - name: Generate documentation
-      run: xvfb-run bash ./misc/jenkins/generate_doxygen/gen_upload_docs.sh
+      run: bash ./misc/jenkins/generate_doxygen/gen_upload_docs.sh
diff --git a/hardware/InteractiveHtmlBom b/hardware/InteractiveHtmlBom
index 213b6b6ebe..7dacae0c1d 160000
--- a/hardware/InteractiveHtmlBom
+++ b/hardware/InteractiveHtmlBom
@@ -1 +1 @@
-Subproject commit 213b6b6ebe3b9c5252b4de0a3f430d3b182c3996
+Subproject commit 7dacae0c1d09b445baf7cdc6b61495dc3bd873bb
diff --git a/misc/jenkins/InteractiveHtmlBom/run.sh b/misc/jenkins/InteractiveHtmlBom/run.sh
index 157e6e9cb7..038ba3a356 100644
--- a/misc/jenkins/InteractiveHtmlBom/run.sh
+++ b/misc/jenkins/InteractiveHtmlBom/run.sh
@@ -1,18 +1,16 @@
 #!/bin/bash
 
 INTERACTIVE_HTML_BOM_NO_DISPLAY="true"
-IBOM_CMD="python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom"
+IBOM_CMD="python3 hardware/InteractiveHtmlBom/InteractiveHtmlBom/generate_interactive_bom.py --no-browser --name-format \"%f_latest\" --dest-dir ../ibom --include-nets"
 echo "IBOM_CMD=$IBOM_CMD"
 
 pwd
 [ -e hardware/frankenso/frankenso.kicad_pcb ] || { echo "hardware/frankenso/frankenso.kicad_pcb not found. Was this invoked from wrong folder?"; exit -1; }
 
-$IBOM_CMD hardware/Common_Rail_MC33816/Common_Rail_MC33816.kicad_pcb
-$IBOM_CMD hardware/brain_board/brain_board_STM32F407.kicad_pcb
-$IBOM_CMD hardware/brain_board_176-pin/176-pin_board.kicad_pcb
-$IBOM_CMD --extra-fields "mfg,mfg#,vend1,vend1#" hardware/CJ125_board/O2_input_CJ125.kicad_pcb --netlist-file hardware/CJ125_board/O2_input_CJ125.net
-$IBOM_CMD --extra-fields "MFG,MFG#,VEND1,VEND1#" hardware/frankenso/frankenso.kicad_pcb --netlist-file hardware/frankenso/frankenso.net
-$IBOM_CMD --extra-fields "mfg,mfg#,vend1,vend1#" hardware/frankenstein/frankenstein.kicad_pcb --netlist-file hardware/frankenstein/frankenstein.net
-$IBOM_CMD hardware/mini48-stm32/mini48-stm32.kicad_pcb
-$IBOM_CMD hardware/HighSideSwitch/VN750PS_E.kicad_pcb
-$IBOM_CMD hardware/can_board/can_brd_1.kicad_pcb
+for f in $(ls hardware/*/*.kicad_pcb); do
+  if ls $(dirname $f)/$(basename $f .kicad_pcb).net 2>/dev/null; then
+    $IBOM_CMD --netlist-file $(ls $(dirname $f)/$(basename $f .kicad_pcb).net) $f
+  else
+    $IBOM_CMD $f
+  fi
+done