Skip to content

Commit

Permalink
clean up scripts, removed prep fprime because of docker build now
Browse files Browse the repository at this point in the history
  • Loading branch information
zlynch2 committed Sep 12, 2024
1 parent 180c5e9 commit 77bb328
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions scripts/cfs_build_fsw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
source $SCRIPT_DIR/env.sh
source FLIGHT_SOFTWARE=cfs


# Check that local NOS3 directory exists
if [ ! -d $USER_NOS3_DIR ]; then
Expand All @@ -29,4 +29,4 @@ fi
mkdir -p $BASE_DIR/fsw/build

# Build
$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_fsw" -w $BASE_DIR $DBOX make -j$NUM_CPUS build-fsw
$DFLAGS_CPUS -v $BASE_DIR:$BASE_DIR --name "nos_build_fsw" -w $BASE_DIR $DBOX make -j$NUM_CPUS -e FLIGHT_SOFTWARE=cfs build-fsw
1 change: 0 additions & 1 deletion scripts/env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ GSW_BIN=$BASE_DIR/gsw/cosmos/build/openc3-cosmos-nos3
GSW_DIR=$BASE_DIR/gsw/cosmos
SIM_DIR=$BASE_DIR/sims/build
SIM_BIN=$SIM_DIR/bin
FLIGHT_SOFTWARE=fprime

if [ -d $SIM_DIR/bin ]; then
SIMS=$(ls $SIM_BIN/nos3*simulator)
Expand Down
14 changes: 8 additions & 6 deletions scripts/prep_fprime.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#!/bin/bash
cd fsw/fprime/fprime-nos3
mkdir -p fprime-venv
python3 -m venv fprime-venv/
. fprime-venv/bin/activate
pip install -r fprime/requirements.txt
fprime-util generate
# cd fsw/fprime/fprime-nos3
# # mkdir -p fprime-venv
# # python3 -m venv fprime-venv/
# # . fprime-venv/bin/activate
# # pip install -r fprime/requirements.txt
# fprime-util generate

echo "Dockerized fprime util generate"

0 comments on commit 77bb328

Please sign in to comment.