Skip to content
Snippets Groups Projects
Commit 9cf04d46 authored by Jason Hiser's avatar Jason Hiser :tractor:
Browse files

changed to exit with a particular code if build fails instead of arbitrary code

Former-commit-id: 0c123ff8
parent 2089ae4c
No related branches found
No related tags found
No related merge requests found
...@@ -39,7 +39,7 @@ use_strata=0 ...@@ -39,7 +39,7 @@ use_strata=0
if [[ $use_strata = 1 ]]; then if [[ $use_strata = 1 ]]; then
# stratafier # stratafier
cd $PEASOUP_UMBRELLA_DIR/stratafier cd $PEASOUP_UMBRELLA_DIR/stratafier
make || exit make || exit 1
# strata # strata
if [ ! "$STRATA_HOME" ]; then if [ ! "$STRATA_HOME" ]; then
...@@ -60,20 +60,20 @@ if [[ $use_strata = 1 ]]; then ...@@ -60,20 +60,20 @@ if [[ $use_strata = 1 ]]; then
fi fi
cd $STRATA_HOME32 cd $STRATA_HOME32
STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit 1
# build x86-64 strata # build x86-64 strata
cd $STRATA_HOME cd $STRATA_HOME
if [ -f Makefile -a Makefile -nt configure -a Makefile -nt Makefile.in ]; then if [ -f Makefile -a Makefile -nt configure -a Makefile -nt Makefile.in ]; then
echo Skipping Strata reconfigure step echo Skipping Strata reconfigure step
else else
./configure $cfar_mode || exit ./configure $cfar_mode || exit 1
fi fi
make || exit make || exit 1
else else
cd $STRATA_HOME cd $STRATA_HOME
./build $cfar_mode || exit ./build $cfar_mode || exit 1
fi fi
fi fi
...@@ -90,56 +90,56 @@ if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then ...@@ -90,56 +90,56 @@ if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then
fi fi
cd $SECURITY_TRANSFORMS_HOME cd $SECURITY_TRANSFORMS_HOME
scons $SCONSDEBUG -j 3 || exit scons $SCONSDEBUG -j 3 || exit 1
cd $SMPSA_HOME cd $SMPSA_HOME
scons $SCONSDEBUG -j 3 || exit scons $SCONSDEBUG -j 3 || exit 1
cd $PEASOUP_HOME cd $PEASOUP_HOME
make || exit make || exit 1
if [ -d $ZIPR_CALLBACKS ]; then if [ -d $ZIPR_CALLBACKS ]; then
cd $ZIPR_CALLBACKS cd $ZIPR_CALLBACKS
./configure --enable-p1 --prefix=$ZIPR_INSTALL ./configure --enable-p1 --prefix=$ZIPR_INSTALL
make || exit make || exit 1
make install || exit make install || exit 1
fi fi
if [ -d $ZIPR_HOME ]; then if [ -d $ZIPR_HOME ]; then
cd $ZIPR_HOME cd $ZIPR_HOME
scons $SCONSDEBUG -j 3|| exit scons $SCONSDEBUG -j 3|| exit 1
fi fi
if [ -d $ZIPR_SCFI_PLUGIN ]; then if [ -d $ZIPR_SCFI_PLUGIN ]; then
cd $ZIPR_SCFI_PLUGIN cd $ZIPR_SCFI_PLUGIN
scons $SCONSDEBUG || exit scons $SCONSDEBUG || exit 1
fi fi
cd $PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/ cd $PEASOUP_UMBRELLA_DIR/zipr_large_only_plugin/
scons $SCONSDEBUG || exit scons $SCONSDEBUG || exit 1
if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin ]] ; then if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin ]] ; then
cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/ cd $PEASOUP_UMBRELLA_DIR/zipr_relax_plugin/
scons $SCONSDEBUG || exit scons $SCONSDEBUG || exit 1
fi fi
if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin ]] ; then if [[ -e $PEASOUP_UMBRELLA_DIR/zipr ]] && [[ -e $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin ]] ; then
cd $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin/ cd $PEASOUP_UMBRELLA_DIR/zipr_trace_plugin/
scons $SCONSDEBUG || exit scons $SCONSDEBUG || exit 1
fi fi
cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
scons $SCONSDEBUG || exit scons $SCONSDEBUG || exit 1
cd $PEASOUP_UMBRELLA_DIR/zipr_unpin_plugin cd $PEASOUP_UMBRELLA_DIR/zipr_unpin_plugin
scons $SCONSDEBUG || exit scons $SCONSDEBUG || exit 1
cd $IRDB_TRANSFORMS cd $IRDB_TRANSFORMS
scons $SCONSDEBUG -j 3 || exit scons $SCONSDEBUG -j 3 || exit 1
if [[ -d $DAFFY_HOME ]] && [[ $(uname -p) == 'x86_64' ]]; then if [[ -d $DAFFY_HOME ]] && [[ $(uname -p) == 'x86_64' ]]; then
cd $DAFFY_HOME cd $DAFFY_HOME
./setup_cfar.sh ./setup_cfar.sh || exit 1
fi fi
cd $PEASOUP_UMBRELLA_DIR cd $PEASOUP_UMBRELLA_DIR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment