reworking scons file for pedi insanity

.gitignore

@@ -62,5 +62,4 @@ tests/quick/*.til
 tests/quick/*.infoannot
 tests/quick/*.idaoutput
 tests/quick/*.annot
-
-
+build

SConscript

@@ -137,8 +137,7 @@ if processor == "x86_64":
 
 env=libehpEnv
 Export('env')
-libehp=libehpEnv.SConscript("libehp/SConscript", variant_dir='scons_build/libehp');
-libehp=libehpEnv.Install("$SMPSA_HOME/libehp/lib", libehp);
+libehp=libehpEnv.SConscript("libehp/SConscript")
 
 
 if int(argenv['build_ida']) == 1 or int(argenv['build_ida7']) == 1:
@@ -160,20 +159,12 @@ if int(argenv['build_ida']) == 1 or int(argenv['build_ida7']) == 1:
 
 	if int(argenv['build_ida']) == 1:
 		print "Build IDA Plugin"
-		idalib=SConscript('SConscript.ida', variant_dir='build_ida')
+		idalib=SConscript('SConscript.ida', variant_dir='build/ida')
 	elif int(argenv['build_ida7']) == 1:
 		print "Build IDA 7.0+ Plugin"
-		idalib=SConscript('SConscript.ida7', variant_dir='build_ida')
+		idalib=SConscript('SConscript.ida7', variant_dir='build/ida')
 	print "Done build IDA Plugin"
 
-# Prepare to remove test binaries from repo by not running STARS on them
-#	test=argenv.Command(target="./test.log", source=idalib, action="IDAROOT=$IDAROOT SMPSA_HOME=$SMPSA_HOME $SMPSA_HOME/tests/scripts/make_baseline.sh 2>&1 |tee ./test.log")
-#	argenv.Depends(test,idalib)
-#	ab=argenv.AlwaysBuild(test)
-#	argenv.Default(ab)
-#	installers=installers+ab
-
-
 	Default(idalib)
 	argenv.Depends(idalib, libehp)
 	
@@ -183,7 +174,7 @@ if int(argenv['build_irdb']) == 1 or int(argenv['build_irdb_driver']) == 1:
 	    print 'Cannot build libstars.a without SECURITY_TRANSFORMS_HOME set.  Did you forget the env. var.?  Or try setting build_irdb=0. '
 	    exit(1)
 	print "Build IDA/IRDB library"
-	irdblib=SConscript('SConscript.irdb_lib', variant_dir='build_irdb_lib')
+	irdblib=SConscript('SConscript.irdb_lib', variant_dir='build/irdb_lib')
 	installers=installers+irdblib
 	Default(irdblib)
 	argenv.Depends(irdblib, libehp)
@@ -191,12 +182,16 @@ if int(argenv['build_irdb']) == 1 or int(argenv['build_irdb_driver']) == 1:
 
 
 if 'PEDI_HOME' in os.environ:
-	pedi = Command( target = "./testoutput",
-			source = "./SConscript",
+	pedi = Command( target = "./smp-testoutput",
+			source = installers,
 			action = "if [ -f manifest.txt.config ]; then "+os.environ['PEDI_HOME']+"/pedi -m manifest.txt ; else echo Skipping PEDI; fi" )
-	Depends(pedi,installers)
-	Default( pedi )
-	Return('pedi')
+	ret=installers
+	if Dir('.').abspath == Dir('#.').abspath:
+		Default( pedi )
+		ret = ret + pedi
+	else:
+		Default( installers )
+	Return('ret')