From 37a8c29448ce14cca0218866f25f053c57acbc52 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Thu, 23 May 2019 22:39:08 -0400
Subject: [PATCH] added move-globals and updated build scripts

---
 .gitmodules   | 3 +++
 build-all.sh  | 7 +++++--
 clean-all.sh  | 4 ++++
 manifest.txt  | 2 ++
 move_globals  | 1 +
 set_env_vars  | 3 +++
 zipr_umbrella | 2 +-
 7 files changed, 19 insertions(+), 3 deletions(-)
 create mode 160000 move_globals

diff --git a/.gitmodules b/.gitmodules
index f251f5c..0a4ca31 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,3 +5,6 @@
 [submodule "zfuzz/libzafl"]
 	path = libzafl
 	url = git@git.zephyr-software.com:opensrc/libzafl.git
+[submodule "move_globals"]
+	path = move_globals
+	url = git@git.zephyr-software.com:allnp/move_globals.git
diff --git a/build-all.sh b/build-all.sh
index 56620be..95a4511 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -28,13 +28,16 @@ cd $ZAFL_HOME
 cd tools
 scons $SCONSDEBUG -j 3 || exit
 
-cd $ZAFL_HOME
-$PEDI_HOME/pedi -m manifest.txt || exit
+cd $ZAFL_HOME/move_globals
+scons $SCONSDEBUG -j 3 || exit
 
 cd $ZAFL_HOME/libzafl
 scons || exit
 cp lib/* $ZEST_RUNTIME/lib64/ || exit
 
+cd $ZAFL_HOME
+$PEDI_HOME/pedi -m manifest.txt || exit
+
 cd $ZAFL_HOME
 echo "ZAFL Overall build complete."
 
diff --git a/clean-all.sh b/clean-all.sh
index cec3cde..f872bc5 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -9,6 +9,10 @@ scons -c
 cd $ZAFL_HOME/tools
 scons -c
 
+cd $ZAFL_HOME/move_globals
+scons -c
+
+
 
 
 # clean up installation if this module is the root of the install.
diff --git a/manifest.txt b/manifest.txt
index e48e969..f61137a 100644
--- a/manifest.txt
+++ b/manifest.txt
@@ -5,5 +5,7 @@ submanifest zipr_umbrella/manifest.txt
 file set_env_vars zafl
 file set_env_vars zafl
 file get-packages.sh zafl
+file move_globals/set_env_vars zafl
+directory move_globals/plugins_install zafl
 directory bin zafl
 directory zafl_plugins zafl
diff --git a/move_globals b/move_globals
new file mode 160000
index 0000000..34db6e6
--- /dev/null
+++ b/move_globals
@@ -0,0 +1 @@
+Subproject commit 34db6e6f2dc8397bc2af64fa8325366907c1dd90
diff --git a/set_env_vars b/set_env_vars
index f7a42fb..2d12ce9 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -15,6 +15,9 @@ export DAFFY_HOME
 
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ZAFL_HOME/zest_runtime/lib
 
+cd $ZAFL_HOME/move_globals
+source set_env_vars
+
 cd $ZAFL_HOME
 
 export PATH=$PATH:$ZAFL_HOME/bin
diff --git a/zipr_umbrella b/zipr_umbrella
index bc85c2c..6ad3ad5 160000
--- a/zipr_umbrella
+++ b/zipr_umbrella
@@ -1 +1 @@
-Subproject commit bc85c2c766fd7a490e5e6001e1e56166c0c2a95f
+Subproject commit 6ad3ad5693a626b35fc20c5090adc523d69384d7
-- 
GitLab