.gitignore

@@ -6,5 +6,4 @@ test/MemorySpace.exe
 test/Options.exe
 test/Range.exe
 scons_build
-
-
+*.exe

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')

SConstruct

@@ -56,5 +56,5 @@ else:
 
 
 Export('env')
-SConscript("SConscript", variant_dir='build')
+SConscript("SConscript")