From 221f560c47e90b9eda72a55322619ceda066c889 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Fri, 16 Aug 2019 10:10:14 -0400
Subject: [PATCH] Updates to have scons install libzafl files in zest runtime
---
SConstruct | 4 ++++
clean-all.sh | 4 ++++
zipr_umbrella | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/SConstruct b/SConstruct
index 17f8486..28cd28e 100755
--- a/SConstruct
+++ b/SConstruct
@@ -15,6 +15,10 @@ ret=[zipr,tools,libzafl]
print "ret=", [str(s) for s in ret]
+for libzafl_file in libzafl:
+ if str(libzafl_file).endswith(".so"):
+ ret=ret+Install(os.environ['ZEST_RUNTIME']+"/lib64", libzafl_file)
+
pedi = Command( target = "./zafl-install",
source = [zipr,tools,libzafl],
action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
diff --git a/clean-all.sh b/clean-all.sh
index 0887d1f..f95c01b 100755
--- a/clean-all.sh
+++ b/clean-all.sh
@@ -1,5 +1,9 @@
#!/bin/bash
+
+scons -c
+exit 0
+
cd $ZAFL_HOME/zipr_umbrella
./clean-all.sh
diff --git a/zipr_umbrella b/zipr_umbrella
index 42dd801..2cfee54 160000
--- a/zipr_umbrella
+++ b/zipr_umbrella
@@ -1 +1 @@
-Subproject commit 42dd801dce766034b7a0f4e037395809de0d54d7
+Subproject commit 2cfee5420fe74e6aa95d4b584e610775debe1732
--
GitLab