attempt fix

RespiraWorks · Nov 3, 2024 · 15f2621 · 15f2621
1 parent e2670a6
commit 15f2621
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/software/common/common.sh b/software/common/common.sh
@@ -87,6 +87,8 @@ generate_network_protocols() {
   --cpp_out=$GUI_LIB_PATH \
   --python_out=$PYTHON_LIB_PATH \
   network_protocol.proto
+
+  pio pkg install -d .
 }
 
 run_checks() {

diff --git a/software/gui/gui.sh b/software/gui/gui.sh
@@ -192,10 +192,6 @@ elif [ "$1" == "clean" ]; then
 # BUILD #
 #########
 elif [ "$1" == "build" ]; then
-  ensure_not_root
-
-  # generate comms protocols
-  ../common/common.sh generate
 
   config_type="Release"
   if [ "$2" == "--debug" ] || [ "$3" == "--debug" ] || [ "$4" == "--debug" ]; then
@@ -219,8 +215,13 @@ elif [ "$1" == "build" ]; then
     checks_opt="no"
   fi
 
+  ensure_not_root
+
   create_clean_dir build
 
+  # generate comms protocols
+  ../common/common.sh generate
+
   pushd build
   if [ "$checks_opt" == "yes" ]; then
     cmake -DCMAKE_BUILD_TYPE=${config_type} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON ..
@@ -249,10 +250,6 @@ elif [ "$1" == "check" ]; then
 # TEST #
 ########
 elif [ "$1" == "test" ]; then
-  ensure_not_root
-
-  # generate comms protocols
-  ../common/common.sh generate
 
   j_opt=""
   if [ "$2" == "-j" ] || [ "$3" == "-j" ] || [ "$4" == "-j" ] || [ "$5" == "-j" ]; then
@@ -266,8 +263,13 @@ elif [ "$1" == "test" ]; then
     j_opt="-j${NUM_CPUS}"
   fi
 
+  ensure_not_root
+
   create_clean_dir build
 
+  # generate comms protocols
+  ../common/common.sh generate
+
   pushd build
   cmake -DCMAKE_BUILD_TYPE=Debug -DCOV=1 ..