From 0ab45bb13a75cc434895d85a499c1566e0f68284 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Fri, 25 Sep 2015 21:59:53 +0000
Subject: [PATCH] Reworked to have irdb_transforms dir that can link in
libstars.
---
build-all.sh | 30 ++++++++++++++++--------------
clean-all.sh | 32 ++++++++++++--------------------
set_env_vars | 24 ++----------------------
svn.externals.uva_dev | 1 +
4 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/build-all.sh b/build-all.sh
index 341944fa1..7284bd20c 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -12,7 +12,7 @@ fi
# stratafier
cd $PEASOUP_UMBRELLA_DIR/stratafier
-make
+make || exit
# strata
if [ ! "$STRATA_HOME" ]; then
@@ -30,15 +30,16 @@ if [ `uname -m` = 'x86_64' ]; then
cp -R $STRATA $STRATA32
fi
cd $STRATA_HOME32
- STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux
+ STRATA_HOME=$STRATA_HOME32 STRATA=$STRATA_HOME32 ./build -host=i386-linux || exit
# build x86-64 strata
cd $STRATA_HOME
- ./configure;make
+ ./configure || exit
+ make || exit
else
cd $STRATA_HOME
- ./build
+ ./build || exit
fi
# smp-static-analyzer
@@ -47,9 +48,7 @@ if [ ! "$SMPSA_HOME" ]; then
exit 1;
fi
cd $SMPSA_HOME
-#./configure
-#make
-scons
+scons || exit
# security-transforms
if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then
@@ -57,21 +56,24 @@ if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then
exit 1;
fi
cd $SECURITY_TRANSFORMS_HOME
-scons
+scons || exit
cd $PEASOUP_HOME
-make
+make || exit
cd $ZIPR_CALLBACKS
./configure --enable-p1 --prefix=$ZIPR_INSTALL
-make
-make install
+make || exit
+make install || exit
cd $ZIPR_HOME
-scons
+scons || exit
cd $ZIPR_SCFI_PLUGIN
-scons
+scons || exit
cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
-scons
+scons || exit
+
+cd $IRDB_TRANSFORMS
+scons || exit
diff --git a/clean-all.sh b/clean-all.sh
index 8e9e90d87..cb2e33f0a 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -14,34 +14,26 @@ fi
cd $PEASOUP_UMBRELLA_DIR/stratafier
make clean
-# strata
-if [ ! "$STRATA_HOME" ]; then
- echo "STRATA_HOME not set.";
- exit 1;
-fi
cd $STRATA_HOME
./configure
make clean
cd $PEASOUP_UMBRELLA_DIR/
rm -Rf strata32
-# smp-static-analyzer
-if [ ! "$SMPSA_HOME" ]; then
- echo "SMPSA_HOME not set.";
- exit 1;
-fi
cd $SMPSA_HOME
-./configure
-scons -c
+scons -c || exit
-# security-transforms
-if [ ! "$SECURITY_TRANSFORMS_HOME" ]; then
- echo "SECURITY_TRANSFORMS_HOME not set.";
- exit 1;
-fi
cd $SECURITY_TRANSFORMS_HOME
-scons -c
+scons -c || exit
-cd $ZIPR_HOME
-scons -c
+cd $IRDB_TRANSFORMS
+scons -c || exit
+
+cd $ZIPR_SCFI_PLUGIN
+scons -c || exit
+cd $PEASOUP_UMBRELLA_DIR/zipr_push64_reloc_plugin
+scons -c || exit
+
+cd $ZIPR_HOME
+scons -c || exit
diff --git a/set_env_vars b/set_env_vars
index b9c3bb186..86d94e522 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -4,8 +4,6 @@ export PEASOUP_UMBRELLA_DIR=`pwd`
export STRATAFIER_OBJCOPY=$PEASOUP_UMBRELLA_DIR/binutils-2.19/binutils/objcopy
export TOOLCHAIN=$PEASOUP_UMBRELLA_DIR/diablo_toolchain
export PEASOUP_HOME=$PEASOUP_UMBRELLA_DIR/peasoup_examples
-export PIN_HOME=$PEASOUP_HOME/tools/pin
-export NICECAP_HOME=$PEASOUP_UMBRELLA_DIR/nicecap_example
export SMPSA_HOME=$PEASOUP_UMBRELLA_DIR/SMPStaticAnalyzer
export STRATAFIER=$PEASOUP_UMBRELLA_DIR/stratafier
export IDAROOT=$PEASOUP_UMBRELLA_DIR/idaproCur
@@ -19,27 +17,9 @@ export ZIPR_INSTALL=$PEASOUP_UMBRELLA_DIR/zipr_install
export ZIPR_CALLBACKS=$PEASOUP_UMBRELLA_DIR/zipr_callbacks
export ZIPR_SDK=$PEASOUP_UMBRELLA_DIR/zipr_sdk
export ZIPR_SCFI_PLUGIN=$PEASOUP_UMBRELLA_DIR/zipr_scfi_plugin
-
export SECURITY_TRANSFORMS_HOME=$PEASOUP_UMBRELLA_DIR/security_transforms
-if [[ ! "$LD_LIBRARY_PATH" =~ (^|:)"$PEASOUP_UMBRELLA_DIR/lib:$PEASOUP_UMBRELLA_DIR/grace/concolic/bin:$STRATA/lib"(:|$) ]]
-then
- export LD_LIBRARY_PATH=$PEASOUP_UMBRELLA_DIR/lib:$PEASOUP_UMBRELLA_DIR/grace/concolic/bin:$STRATA/lib:$LD_LIBRARY_PATH
-fi
-
-#Get IDAPRO to work with no errors
-#export TVHEADLESS=1
-# just not needed, and annoying as hell when trying to debug ida.
+export IRDB_TRANSFORMS=$PEASOUP_UMBRELLA_DIR/irdb_transforms
source ./irdb_vars
-
-export GRACE_HOME=$PEASOUP_UMBRELLA_DIR/grace
-export YICES_HOME=$GRACE_HOME/third-party/yices-sdk/1.0.34/linux32/bin
-export PATH=$PATH:$GRACE_HOME/concolic/bin:$YICES_HOME
-export SCONSFLAGS="exceptions=1 x86=1 tool=1 hprof=0 cpuprof=0 lm_required=false gen_lmi=0 offsite=1 irdb_path=$SECURITY_TRANSFORMS_HOME/libIRDB -j 2"
-
-#moving this to setenv vars, as it's not global and breaks our peasoup installation
-# adjust to your SVN username
-#export SVN_USERNAME=$USER
-
-. $PEASOUP_UMBRELLA_DIR/set_command_envs
+source $PEASOUP_UMBRELLA_DIR/set_command_envs
diff --git a/svn.externals.uva_dev b/svn.externals.uva_dev
index 86695e9b4..e09c3c081 100644
--- a/svn.externals.uva_dev
+++ b/svn.externals.uva_dev
@@ -4,6 +4,7 @@ idaproCur_sdk http://svn.zephyr-software.com/repos/idaproCur_sdk/trunk/
strata http://svn.zephyr-software.com/repos/strata/trunk/
peasoup_examples http://svn.zephyr-software.com/repos/peasoup_examples/trunk/
security_transforms http://svn.zephyr-software.com/repos/security_transforms/trunk/
+irdb_transforms http://svn.zephyr-software.com/repos/irdb_transforms/trunk/
SMPStaticAnalyzer http://svn.zephyr-software.com/repos/SMPStaticAnalyzer/trunk/
stratafier http://svn.zephyr-software.com/repos/stratafier/trunk/
zipr http://svn.zephyr-software.com/repos/zipr/trunk/
--
GitLab