From 390478f4739c7b76e2b3a08e77e49293fa03b1b6 Mon Sep 17 00:00:00 2001 From: Jason Hiser <jdhiser@gmail.com> Date: Thu, 15 Aug 2019 12:06:09 -0400 Subject: [PATCH] reworking scons file for pedi insanity --- SConscript | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/SConscript b/SConscript index 8f4105044..681508108 100644 --- a/SConscript +++ b/SConscript @@ -54,16 +54,11 @@ myenv=myenv.Clone(CPPPATH=Split(cpppath), LIBS=Split(libs), LIBPATH=Split(libpat lib=myenv.SharedLibrary("push64_relocs", Split(files)) install=myenv.Install("$ZIPR_INSTALL/plugins/", lib) -Default(install) - -pedi = Command( target = "./testoutput", - source = "./SConscript", - action = "cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" ) - -Depends (pedi, install) -Default( pedi ) - - - -ret=pedi+lib +ret=[install,lib] +pedi = Command( target = "./push64-testoutput", + source = install, + action = "echo push64; cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" ) +if Dir('.').abspath == Dir('#.').abspath: + ret=ret+pedi +Default(ret) Return('ret') -- GitLab