Skip to content
Snippets Groups Projects
Commit 26e1e9b7 authored by jdh8d's avatar jdh8d
Browse files

Updated sconncs files to inheret a list of IRDB libs from the root so we can... 

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
parent fce7ecf7
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 22 deletions
SConscript
+ 4
− 0
View file @ 26e1e9b7
......@@ -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')
......
libIRDB/test/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
pebliss/trunk/pe_lib/SConscript
+ 4
− 3
View file @ 26e1e9b7
......@@ -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)
pebliss/trunk/samples/sample.mak
+ 2
− 2
View file @ 26e1e9b7
......@@ -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)
......
pebliss/trunk/tests/tests.mak
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/c2e/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/cgc_hlx/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/cgc_rigrandom/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/cgclibc/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/cinderella/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/cover/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/fix_rets/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/fptr_shadow/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/inferfn/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/meds2pdb/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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))
......
tools/memcover/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/prince/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/ret_shadow_stack/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/safefr/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
tools/selective_cfi/SConscript
+ 1
− 1
View file @ 26e1e9b7
......@@ -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)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment