From 26e1e9b713dfe1822f23b679ed8c6c606a9d844f Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Sat, 11 Jul 2015 12:58:53 +0000
Subject: [PATCH] Updated sconncs files to inheret a list of IRDB libs from the
root so we can change that list easier and in one place
Former-commit-id: 09feceab7eafc884f4f5dfb407cabb0194aa9d33
---
SConscript | 4 ++++
libIRDB/test/SConscript | 2 +-
pebliss/trunk/pe_lib/SConscript | 7 ++++---
pebliss/trunk/samples/sample.mak | 4 ++--
pebliss/trunk/tests/tests.mak | 2 +-
tools/c2e/SConscript | 2 +-
tools/cgc_hlx/SConscript | 2 +-
tools/cgc_rigrandom/SConscript | 2 +-
tools/cgclibc/SConscript | 2 +-
tools/cinderella/SConscript | 2 +-
tools/cover/SConscript | 2 +-
tools/fix_rets/SConscript | 2 +-
tools/fptr_shadow/SConscript | 2 +-
tools/inferfn/SConscript | 2 +-
tools/meds2pdb/SConscript | 2 +-
tools/memcover/SConscript | 2 +-
tools/prince/SConscript | 2 +-
tools/ret_shadow_stack/SConscript | 2 +-
tools/safefr/SConscript | 2 +-
tools/selective_cfi/SConscript | 2 +-
tools/simple_cdi/SConscript | 2 +-
tools/spasm/SConscript | 2 +-
tools/transforms/SConscript | 2 +-
tools/watch_syscall/SConscript | 2 +-
24 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/SConscript b/SConscript
index d2597775a..79a031c1e 100644
--- a/SConscript
+++ b/SConscript
@@ -55,8 +55,12 @@ else:
os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'],"include","targ-config.h"))
+
+env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "beaEngine_s_d", "EXEIO", "pebliss", "iconv"
+Export('env')
#print 'env='
#print env.Dump()
+libPEBLISS=SConscript("pebliss/trunk/pe_lib/SConscript", variant_dir='scons_build/libPEBLISS')
libEXEIO=SConscript("libEXEIO/SConscript", variant_dir='scons_build/libEXEIO')
libbea=SConscript("beaengine/SConscript", variant_dir='scons_build/beaengine')
libMEDSannotation=SConscript("libMEDSannotation/SConscript", variant_dir='scons_build/libMEDSannotation')
diff --git a/libIRDB/test/SConscript b/libIRDB/test/SConscript
index dd0a1ab01..efd2d9447 100644
--- a/libIRDB/test/SConscript
+++ b/libIRDB/test/SConscript
@@ -13,7 +13,7 @@ cpppath='''
'''
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d pq EXEIO")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program("fill_in_indtargs.exe", Split("read_ehframe.cpp fill_in_indtargs.cpp check_thunks.cpp"), LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/pebliss/trunk/pe_lib/SConscript b/pebliss/trunk/pe_lib/SConscript
index 3a50ddb0e..32f9fa6f7 100644
--- a/pebliss/trunk/pe_lib/SConscript
+++ b/pebliss/trunk/pe_lib/SConscript
@@ -45,15 +45,16 @@ files= '''
version_info_editor.cpp
version_info_viewer.cpp
'''
+
cpppath='''
.
'''
-myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
+#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
lib=myenv.Library(libname, Split(files))
-#install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
-#Default(install)
+install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
+Default(install)
diff --git a/pebliss/trunk/samples/sample.mak b/pebliss/trunk/samples/sample.mak
index 19c822874..688875a86 100644
--- a/pebliss/trunk/samples/sample.mak
+++ b/pebliss/trunk/samples/sample.mak
@@ -2,7 +2,7 @@ PWD=$(shell pwd)
OUTDIR = ../out/
LIBPATH = ../../lib/libpebliss.a
NAME=$(shell basename $(PWD))
-CXXFLAGS = -O2 -Wall -I../../pe_lib
+CXXFLAGS = -Wall -I../../pe_lib
ifdef PE_DEBUG
CXXFLAGS += -g -O0
@@ -15,7 +15,7 @@ clean:
rm -f $(OUTDIR)$(NAME)
$(NAME): main.o
- $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME)
+ $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME) -liconv
main.o: $(LIBPATH)
diff --git a/pebliss/trunk/tests/tests.mak b/pebliss/trunk/tests/tests.mak
index dee47fea4..430bcdcc1 100644
--- a/pebliss/trunk/tests/tests.mak
+++ b/pebliss/trunk/tests/tests.mak
@@ -15,7 +15,7 @@ clean:
rm -f $(OUTDIR)$(NAME)
$(NAME): main.o
- $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME)
+ $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME) -liconv
main.o: $(LIBPATH)
diff --git a/tools/c2e/SConscript b/tools/c2e/SConscript
index 3dac89082..8dde6320e 100644
--- a/tools/c2e/SConscript
+++ b/tools/c2e/SConscript
@@ -25,7 +25,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="c2e.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/tools/cgc_hlx/SConscript b/tools/cgc_hlx/SConscript
index 17e2a4e4b..75abdbef6 100644
--- a/tools/cgc_hlx/SConscript
+++ b/tools/cgc_hlx/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="cgc_hlx.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/cgc_rigrandom/SConscript b/tools/cgc_rigrandom/SConscript
index 97311ba07..e427c73de 100644
--- a/tools/cgc_rigrandom/SConscript
+++ b/tools/cgc_rigrandom/SConscript
@@ -23,7 +23,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="rigrandom.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/tools/cgclibc/SConscript b/tools/cgclibc/SConscript
index f5d0b8a91..971310ea6 100644
--- a/tools/cgclibc/SConscript
+++ b/tools/cgclibc/SConscript
@@ -26,7 +26,7 @@ files3=Split("infer_syscall_wrappers.cpp")+cgclibc
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-syscall IRDB-util pqxx BeaEngine_s_d rewrite pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-syscall IRDB-util rewrite ")
pgm=myenv.Program("cgclibc.exe", files1, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/cinderella/SConscript b/tools/cinderella/SConscript
index 733c95a06..ab0c364a8 100644
--- a/tools/cinderella/SConscript
+++ b/tools/cinderella/SConscript
@@ -22,7 +22,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="cinderella_prep.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/cover/SConscript b/tools/cover/SConscript
index ca9993e84..42727d83e 100644
--- a/tools/cover/SConscript
+++ b/tools/cover/SConscript
@@ -19,7 +19,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="cover"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite pq")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/tools/fix_rets/SConscript b/tools/fix_rets/SConscript
index 16133c7f5..b191a04ea 100644
--- a/tools/fix_rets/SConscript
+++ b/tools/fix_rets/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="fix_rets.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/fptr_shadow/SConscript b/tools/fptr_shadow/SConscript
index 2a675c993..65ce37772 100644
--- a/tools/fptr_shadow/SConscript
+++ b/tools/fptr_shadow/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="fptr_shadow64.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/inferfn/SConscript b/tools/inferfn/SConscript
index 15c90309d..198aee0e5 100644
--- a/tools/inferfn/SConscript
+++ b/tools/inferfn/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="inferfn.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/meds2pdb/SConscript b/tools/meds2pdb/SConscript
index db59e178d..43c82a3e0 100644
--- a/tools/meds2pdb/SConscript
+++ b/tools/meds2pdb/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="meds2pdb"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx xform BeaEngine_s_d rewrite MEDSannotation pq pq ")
+LIBS=Split(" IRDB-cfg IRDB-util xform rewrite MEDSannotation $BASE_IRDB_LIBS ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
Default(myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm))
diff --git a/tools/memcover/SConscript b/tools/memcover/SConscript
index 5a84df9e9..c4e66ab6c 100644
--- a/tools/memcover/SConscript
+++ b/tools/memcover/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="memcover.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/prince/SConscript b/tools/prince/SConscript
index 6b06dec1c..296ed27f2 100644
--- a/tools/prince/SConscript
+++ b/tools/prince/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="prince_driver.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/ret_shadow_stack/SConscript b/tools/ret_shadow_stack/SConscript
index 787236adb..d14492eed 100644
--- a/tools/ret_shadow_stack/SConscript
+++ b/tools/ret_shadow_stack/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="ret_shadow_stack.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/safefr/SConscript b/tools/safefr/SConscript
index 84ced8fc5..4fd635798 100644
--- a/tools/safefr/SConscript
+++ b/tools/safefr/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="fill_in_safefr.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/selective_cfi/SConscript b/tools/selective_cfi/SConscript
index e117ea403..b4572bf84 100644
--- a/tools/selective_cfi/SConscript
+++ b/tools/selective_cfi/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="selective_cfi.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/simple_cdi/SConscript b/tools/simple_cdi/SConscript
index 930e56847..ca7abb625 100644
--- a/tools/simple_cdi/SConscript
+++ b/tools/simple_cdi/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="simple_cdi.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/spasm/SConscript b/tools/spasm/SConscript
index c6075c809..e82a61623 100644
--- a/tools/spasm/SConscript
+++ b/tools/spasm/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="spasm"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/transforms/SConscript b/tools/transforms/SConscript
index 5b9a533a2..f418517fa 100644
--- a/tools/transforms/SConscript
+++ b/tools/transforms/SConscript
@@ -19,7 +19,7 @@ cpppath='''
$SECURITY_TRANSFORMS_HOME/beaengine/beaengineSources/Includes/
'''
-LIBS="xform IRDB-core IRDB-cfg BeaEngine_s_d pqxx MEDSannotation transform pq EXEIO pq "
+LIBS="$BASE_IRDB_LIBS xform IRDB-cfg MEDSannotation transform "
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
integer_files="transformutils.cpp integertransformdriver.cpp"
diff --git a/tools/watch_syscall/SConscript b/tools/watch_syscall/SConscript
index 28f5fafda..abc71d99a 100644
--- a/tools/watch_syscall/SConscript
+++ b/tools/watch_syscall/SConscript
@@ -22,7 +22,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="watch_syscall.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-syscall IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-syscall IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
--
GitLab