Compatibilize WIP with apio 0.8.4 development > 0.9.0

FPGAwars · Oct 4, 2023 · 8dc98d6 · 8dc98d6
1 parent b31290a
commit 8dc98d6
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/scripts/services/tools.js b/app/scripts/services/tools.js
@@ -69,12 +69,18 @@ angular
       //-- Execute the apio build command. It builds the current circuit
       this.buildCode = function (startMessage, endMessage) {
         let board = (common.selectedBoard.name === 'MCH2022_badge') ? 'iCE40-UP5K' : common.selectedBoard.name;
-
+        let apioParams = [];
+        if (toolchain.apio >= '0.9.0') {
+          apioParams = ["build", "--board", board, "--top-module", "main"];
+        } else {
+          apioParams = ["build", "--board", board];
+        }
         return apioRun(
-          ["build", "--board", board], // TODO: Include top module name: , "--top-module", "main"],
+          apioParams,
           startMessage,
           endMessage
         );
+
       };
 
       //-- Execute the apio upload command. It uploads the bitstream to the  
@@ -84,8 +90,15 @@ angular
         if (common.selectedBoard.name === 'MCH2022_badge') {
           return toolchainRun(['upload'], startMessage, endMessage);
         }
+        let apioParams = [];
+        if (toolchain.apio >= '0.9.0') {
+          apioParams = ["upload", "--board", common.selectedBoard.name, "--top-module", "main"];
+        } else {
+          apioParams = ["upload", "--board", common.selectedBoard.name];
+        }
+
         return apioRun(
-          ["upload", "--board", common.selectedBoard.name], //TODO: Include top module name, "--top-module", "main"],
+          apioParams,
           startMessage,
           endMessage
         );

diff --git a/package-lock.json b/package-lock.json