changes to support scons from peasoup-umbrella dir

Former-commit-id: 2af4f3995de9c2d5984bb37150863201dbd53e00

.gitignore

@@ -9,3 +9,7 @@ tools/meds2pdb/meds2pdb
 plugins_install/*.exe
 plugins_install/*.so
 *.swp
+*.os
+*.o
+
+scons_build

SConscript

@@ -96,9 +96,6 @@ dump_map=SConscript("dump_map/SConscript", variant_dir='scons_build/dump_map')
 dump_insns=SConscript("dump_insns/SConscript", variant_dir='scons_build/dump_insns')
 ir_builders=SConscript("ir_builders/SConscript", variant_dir='scons_build/ir_builders')
 
-if int(env['build_deep']) == 1:
-	libIRDBdeep=env.SConscript("libIRDB-deep/src/SConscript", variant_dir='scons_build/libIRDB-deep')
-
 
 tools=None
 if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
@@ -124,14 +121,13 @@ libs=( libIRDBcore,
 	dump_insns, 
 	ir_builders)
 
-if int(env['build_deep'] == 1):
-	libs=libs+libIRDBdeep
-
 if "PEDI_HOME" in os.environ:
 	Depends(pedi,  libs)
 	Default( pedi )
+	Return('pedi')
 else:
 
 	Default(libIRDBcore, libIRDBcfg, libIRDButil, libIRDBdeep, libIRDBcore, libehp,libtransform,libEXEIO,libMEDSannotation,libStructDiv,libElfDep, libcapstone, thanos, rida, meds2pdb, dump_map, dump_insns, ir_builders)
 	if 'build_tools' not in env or env['build_tools'] is None or int(env['build_tools']) == 1:
 		Default(tools)
+

SConscript.deep

+import os
+
+Import('env')
+
+pedi = Command( target = "./testoutput",
+		source = "./SConscript",
+		action = os.environ['PEDI_HOME']+"/pedi -m manifest.txt " )
+
+env['BASE_IRDB_LIBS']="irdb-core", "pqxx", "pq"
+
+libIRDBdeep=env.SConscript("libIRDB-deep/src/SConscript", variant_dir='scons_build/libIRDB-deep')
+
+Depends(pedi,  libIRDBdeep)
+Default( pedi )
+
+Return('pedi')

SConstruct

@@ -70,5 +70,8 @@ if sysname == "SunOS":
 
 
 Export('env')
-SConscript("SConscript", variant_dir='build')
+if int(env['build_deep']) == 1:
+	SConscript("SConscript.deep", variant_dir='build')
+else:
+	SConscript("SConscript", variant_dir='build')
 

libIRDB-deep/src/SConscript

@@ -11,6 +11,7 @@ files=  '''
 cpppath=''' 
 	$IRDB_SDK/include/
 	$SECURITY_TRANSFORMS_HOME/include/
+	$SECURITY_TRANSFORMS_HOME/libIRDB-deep/src
 	$SECURITY_TRANSFORMS_HOME/libMEDSannotation/include
 	$SMPSA_HOME/include/
 	'''

libIRDB-deep/src/deep.cpp

@@ -2,7 +2,7 @@
 #include <map>
 #include <set>
 #include <memory>
-#include "deep.hpp"
+#include <deep.hpp>
 #include <MEDS_DeadRegAnnotation.hpp>
 #include <MEDS_MemoryRangeAnnotation.hpp>
 #include <MEDS_SafeFuncAnnotation.hpp>

libStructDiv/include/structured_diversity.h

@@ -43,7 +43,7 @@ class StructuredDiversity_t
         		// pass marshalled value to DoBarrier
         		const vector<string> &string_res=DoBarrier(s.str());
 		
-        		assert(string_res.size()==m_total_variants);
+        		assert((size_t)string_res.size()==(size_t)m_total_variants);
 		
         		/* declare a result */
         		vector<T> t_res;

pebliss/trunk/pe_lib/SConscript

@@ -47,7 +47,7 @@ files=  '''
 	'''
 
 cpppath=''' 
-	.
+	$SECURITY_TRANSFORMS_HOME/pebliss/trunk/pe_lib
 	'''
 
 myenv=myenv.Clone(CPPPATH=Split(cpppath))