From d72baf4394136fba7cd86b089ac34ec49e9bcb93 Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Thu, 15 Aug 2019 13:53:22 -0400
Subject: [PATCH] reworking scons file for pedi insanity
---
SConscript | 11 ++++++++---
SConstruct | 5 ++++-
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/SConscript b/SConscript
index d264fd34e..2b22f08f8 100644
--- a/SConscript
+++ b/SConscript
@@ -62,10 +62,11 @@ pedi = Command( target = "./zipr-umb-testoutput-install",
source = xforms,
action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+ret=[]+xforms
if Dir('.').abspath == Dir('#.').abspath:
- Default( pedi )
-else:
- Default(xforms)
+ ret=ret+pedi
+
+
if env.GetOption('clean') and os.path.isfile("manifest.txt.config"):
with open("manifest.txt.config") as myfile:
@@ -77,3 +78,7 @@ if env.GetOption('clean') and os.path.isfile("manifest.txt.config"):
os.system( "pwd; $PEDI_HOME/pedi -c -m manifest.txt " )
shutil.rmtree(os.environ['PS_INSTALL'])
+
+
+Default(ret)
+Return('ret')
diff --git a/SConstruct b/SConstruct
index 217ce0e12..1c04dad64 100644
--- a/SConstruct
+++ b/SConstruct
@@ -35,5 +35,8 @@ else:
env.Append(SHLINKFLAGS=" -O ")
Export('env')
-SConscript("SConscript")
+ret=SConscript("SConscript")
+
+Default(ret)
+Return('ret')
--
GitLab