From 10400dc73023f4af7dac75819d062e9871ca46ce Mon Sep 17 00:00:00 2001
From: Jason Hiser <jdhiser@gmail.com>
Date: Thu, 15 Aug 2019 12:05:16 -0400
Subject: [PATCH] reworking scons file for pedi insanity
---
.gitignore | 3 +--
SConscript | 20 +++++++++-----------
SConstruct | 2 +-
3 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/.gitignore b/.gitignore
index 76ce80106..cc1ac4b5b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,4 @@ test/MemorySpace.exe
test/Options.exe
test/Range.exe
scons_build
-
-
+*.exe
diff --git a/SConscript b/SConscript
index 5931273aa..9558bf124 100644
--- a/SConscript
+++ b/SConscript
@@ -2,23 +2,21 @@ import shutil
import os
import tarfile
-(sysname, nodename, release, version, machine)=os.uname()
-
Import('env')
# build security transforms
irdbenv=env.Clone();
-zipr=SConscript("src/SConscript", variant_dir='scons_build/zipr')
+zipr=SConscript("src/SConscript")
+
+pedi = Command( target = "./zipr-testoutput",
+ source = zipr,
+ action = "echo zipr; cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" )
-if sysname != "SunOS":
- SConscript("test/SConscript")
+ret=[zipr]
+if Dir('.').abspath == Dir('#.').abspath:
+ ret=pedi+zipr
-pedi = Command( target = "./testoutput",
- source = "./SConscript",
- action = "cd "+os.environ['ZIPR_INSTALL']+" ; " +os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; cd -" )
-Depends(pedi,zipr)
-Default( pedi )
-ret=pedi+zipr
+Default(ret)
Return('ret')
diff --git a/SConstruct b/SConstruct
index f6d20b0f1..cf51ffc05 100644
--- a/SConstruct
+++ b/SConstruct
@@ -56,5 +56,5 @@ else:
Export('env')
-SConscript("SConscript", variant_dir='build')
+SConscript("SConscript")
--
GitLab