Revise check-cpp scripts

This commit is contained in:
Rob Bocchino 2025-12-04 18:15:11 -08:00
parent 0e50a7da7d
commit 6847034e67
3 changed files with 20 additions and 16 deletions

View File

@ -1,24 +1,25 @@
#!/bin/sh -e
cd ../..
dir=`dirname $0`
dir=`cd $dir; pwd`
cd $dir/../..
. ./defs.sh
cd check-cpp-dir/Basic
cd $dir
echo ' removing old files'
./clean
echo ' generating C++'
(
cd ../../basic;
fpp_to_cpp=../../../../../bin/fpp-to-cpp
$fpp_to_cpp -p $PWD -i $FPRIME_DEPS,../phases.fpp -d ../check-cpp-dir/Basic components.fpp topology.fpp
cd $dir/../../basic;
$FPP_TO_CPP -p $PWD -i $FPRIME_DEPS,../phases.fpp -d $dir components.fpp topology.fpp
)
fprime_gcc=../../../../../../scripts/fprime-gcc
flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
flags="-I$FPRIME_DIR -I$FPRIME_DIR/fprime/config -Wno-unused-parameter -c"
echo ' compiling C++'
for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
do
echo " variable_flags=$variable_flags"
$fprime_gcc $variable_flags $flags BasicTopologyAc.cpp
$FPRIME_GCC $variable_flags $flags BasicTopologyAc.cpp
done

View File

@ -1,24 +1,25 @@
#!/bin/sh -e
cd ../..
dir=`dirname $0`
dir=`cd $dir; pwd`
cd $dir/../..
. ./defs.sh
cd check-cpp-dir/Commands
cd $dir
echo ' removing old files'
./clean
echo ' generating C++'
(
cd ../../commands;
fpp_to_cpp=../../../../../bin/fpp-to-cpp
$fpp_to_cpp -p $PWD -i $FPRIME_DEPS,../phases.fpp -d ../check-cpp-dir/Commands components.fpp topology.fpp
cd $dir/../../commands;
$FPP_TO_CPP -p $PWD -i $FPRIME_DEPS,../phases.fpp -d $dir components.fpp topology.fpp
)
fprime_gcc=../../../../../../scripts/fprime-gcc
flags="-I.. -I../../../fprime -I../../../fprime/config -Wno-unused-parameter -c"
flags="-I$FPRIME_DIR -I$FPRIME_DIR/fprime/config -Wno-unused-parameter -c"
echo ' compiling C++'
for variable_flags in '' '-DFW_DIRECT_PORT_CALLS'
do
echo " variable_flags=$variable_flags"
$fprime_gcc $variable_flags $flags CommandsTopologyAc.cpp
$FPRIME_GCC $variable_flags $flags CommandsTopologyAc.cpp
done

View File

@ -4,3 +4,5 @@ export COMPILER_ROOT=`cd ../../../..; pwd`
export FPRIME_DIR=`cd ../fprime; pwd`
export FPRIME_DEPS="$FPRIME_DIR/config/FpConfig.fpp,$FPRIME_DIR/Platform/PlatformTypes.fpp,$FPRIME_DIR/Fw/Prm/Prm.fpp,$FPRIME_DIR/Fw/Cmd/Cmd.fpp"
export FPRIME_GCC=$COMPILER_ROOT/scripts/fprime-gcc
export FPP_TO_CPP=$COMPILER_ROOT/bin/fpp-to-cpp