From: Eduardo Ramos Testillano Date: Tue, 6 Jun 2017 21:52:50 +0000 (+0200) Subject: Remove scons files. Update README, gitignore and install targets. X-Git-Url: https://git.teslayout.com/public/public/public/?a=commitdiff_plain;h=ec9c52668a43af61eb0c4e1f72bc69db78378e86;p=anna.git Remove scons files. Update README, gitignore and install targets. --- diff --git a/.gitignore b/.gitignore index 5507480..9f57f12 100644 --- a/.gitignore +++ b/.gitignore @@ -12,14 +12,20 @@ *.la *.a -debug -release docs/doxygen/html docs/doxygen/latex docs/doxygen/man -.sconsign.dblite *.log *.old .cproject .project -/Debug/ + +# CMake +CMakeCache.txt +CMakeFiles/ +CTestTestfile.cmake +Makefile +cmake_install.cmake +build/ +Testing/ +install_manifest.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index dbce3e3..a4bc412 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug Release RelWithDebInfo MinSizeRel." FORCE) endif(NOT CMAKE_BUILD_TYPE) +message(STATUS "CMAKE_BUILD_TYPE = ${CMAKE_BUILD_TYPE}") # Build output directory: set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build/${CMAKE_BUILD_TYPE}/bin) @@ -208,11 +209,16 @@ ENDFOREACH() # Install -# see http://stackoverflow.com/questions/14084759/keep-a-single-files-permissions-when-using-install-in-cmake -####set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/deploy") -####install(FILES build/lib/libtools_static.a DESTINATION lib) -####install(PROGRAMS build/lib/libtools_shared.so DESTINATION lib) -####install(PROGRAMS build/bin/hello DESTINATION bin) +message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}") +# Binaries: +file(GLOB_RECURSE BINARIES ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/bin/*) +install(PROGRAMS ${BINARIES} DESTINATION bin) +# Headers: +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/anna/ DESTINATION include) +# Libraries: +file(GLOB_RECURSE LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/build/${CMAKE_BUILD_TYPE}/lib/*) +install(FILES ${LIBRARIES} DESTINATION lib) + # Add target for API documentation with Doxygen find_package(Doxygen) diff --git a/README.md b/README.md index 26e44f1..10d9445 100644 --- a/README.md +++ b/README.md @@ -13,51 +13,44 @@ Based on GIT, hosted on http://redmine.teslayout.com You could use my pre-commit specific template if you want to do some basic checkings (i.e. astyle code processing): Execute './scripts/git/use-pre-commit.sh' -## Documentation -Execute 'scons doc' +## Build project -## Unit tests +This is a CMake based building suite. +Install cmake: -Execute 'scons test' + > sudo apt-get install cmake -## Examples +And then generate the makefiles from project root directory: -Execute 'scons example' to generate example binaries + > cmake . -## Install +You could specify type of build, 'Debug' or 'Release', for example: -Execute 'sudo scons install-include' for only headers -Execute 'sudo scons install-lib' for only libraries -Execute 'sudo scons install-include-and-lib' for headers & libraries -Execute 'sudo scons install-example' for only example binaries/resources -Execute 'sudo scons install' to install the whole suite + > cmake -DCMAKE_BUILD_TYPE=Debug . + > cmake -DCMAKE_BUILD_TYPE=Release . -## Uninstall - -Execute 'sudo scons uninstall' +## Clean project + > make clean ## Some basic ubuntu requirements -### Scons python-based building suite: - sudo apt-get install scons - ### OpenSSL: - sudo apt-get install libssl-dev + > sudo apt-get install libssl-dev ### Gnome XML: - sudo apt-get install libxml2-dev + > sudo apt-get install libxml2-dev ### OpenLDAP: - sudo apt-get install libldap2-dev + > sudo apt-get install libldap2-dev ### Pcap: - sudo apt-get install libpcap-dev + > sudo apt-get install libpcap-dev ### MySql: - sudo apt-get install libmysqlclient-dev + > sudo apt-get install libmysqlclient-dev ### Oracle: https://help.ubuntu.com/community/Oracle%20Instant%20Client @@ -67,7 +60,7 @@ Execute 'sudo scons uninstall' Be sure to create in that directory, a link to oracle includes, for example: - @:/usr/lib/oracle/12.1/client64$ ls -lrt + > /usr/lib/oracle/12.1/client64$ ls -lrt total 8 drwxr-xr-x 2 root root 4096 Feb 28 15:59 bin drwxr-xr-x 2 root root 4096 Feb 28 15:59 lib @@ -79,17 +72,55 @@ Execute 'sudo scons uninstall' ### Oracle-OpenLDAP conflict: as usual, Oracle is doing things very bad. Move the ldap.h from oracle includes, i.e.: - cd /usr/include/oracle/12.1/client64 - sudo mv ldap.h ldap.h.orig + > cd /usr/include/oracle/12.1/client64 + > sudo mv ldap.h ldap.h.orig + +### Google Test Framework: + + > sudo apt-get install libgtest-dev + + Note that this package only install source files. You have to compile the + code yourself to create the necessary library files. These source files + should be located at /usr/src/gtest. Browse to this folder and use cmake + to compile the library: + + > cd /usr/src/gtest + > sudo cmake CMakeLists.txt + > sudo make + + Copy or symlink libgtest.a and libgtest_main.a to your /usr/lib folder: + > sudo cp *.a /usr/lib + +## Documentation + +Execute 'make doc' + + > cd docs/doxygen + > tree -L 1 -### Boost: - Although the more i use, the more i dislike, this suite is included (ambition to learn - new things...): + . + ├── Doxyfile + ├── html + ├── latex + └── man - sudo apt-get install libboost-dev - sudo apt-get install libboost-test-dev - Development module is no longer needed, but still unit testing is done through boost. - Pending migration to google test framework. +## Unit tests + +Execute 'make test' + +## Install + +To install headers, libraries, and examples, execute: + + > make install + +Optionally you could specify another prefix for installation: + + > cmake -DCMAKE_INSTALL_PREFIX=$HOME/anna_deploy . + +## Uninstall + + > cat install_manifest.txt | sudo xargs rm diff --git a/SConstruct b/SConstruct deleted file mode 100644 index 399676e..0000000 --- a/SConstruct +++ /dev/null @@ -1,214 +0,0 @@ -import os -import sys, select - -# Basic paths -prefix = ARGUMENTS.get ('prefix', "/usr/local") -usr_local_include = os.path.join (prefix, "include") -usr_local_lib = os.path.join (prefix, "lib") -usr_local_bin = os.path.join (prefix, "bin") -opt_bin = "/opt/bin" -current_directory = Dir ('.').abspath - -# Anna targets -target_usr_local_include = os.path.join (usr_local_include, "anna") -target_usr_local_lib = os.path.join (usr_local_lib, "anna") -#target_usr_local_bin = usr_local_bin -target_opt_bin = os.path.join (opt_bin, "anna") - -# Versioning -release = ARGUMENTS.get ('release', 0) - -# Environment -env = None -rc = os.system("clang++ --version >/dev/null 2>/dev/null") -if rc == 0: - print "\nDetected clang++ installed in the system" - print "\nSelect compiler:\n 1. g++\n 2. clang++" - #option = raw_input("\nInput option [1]: ") or "1" - # Read with timeout: - print "\nInput option [1]: " - option = 1 - i, o, e = select.select( [sys.stdin], [], [], 60 ) - if (i): option = sys.stdin.readline().strip() - else: print "expired! using default ..." - if option == "2": - env = Environment(CXX = 'clang++') - env.Append (CCFLAGS = '-DIS_CLANG') - env.Append (CXXFLAGS = '-Wno-parentheses-equality') - else: - env = Environment() -else: - env = Environment() - -#oracle_includes = os.environ["ORACLE_HOME"] + "/include" -oracle_includes = "/usr/lib/oracle/12.1/client64/include" - -# Headers -source_include = os.path.join (current_directory, "include") -usr_include = [ - #"/usr/include/oracle/12.1/client64", - oracle_includes, - "/usr/include/libxml2", - #"/usr/include/boost", - #"/usr/include/mysql", - #"/usr/include/openssl", -] - -# Libraries -libraries = [] - -# Environment -#env = Environment () -# CPPPATH will be relative to src/ -env.Append (CPPPATH = [source_include, usr_local_include, usr_include ]) -#env.Append (CCFLAGS = '-std=c++0x') -# C++11 support: -env.Append (CXXFLAGS = '-std=c++11') -# Shared libraries using static ones: -env.Append (CXXFLAGS = '-fPIC') -#env.Append (CXXFLAGS = '-export-dynamic') - -env.Append (LIBS = ['']) -# scons -Q release=1 -if int(release): - variant='release' - env.Append (CCFLAGS = '-O3') - env.Append (VARIANT = variant) -else: - variant='debug' - env.Append (CCFLAGS = '-g -O0') - env.Append (LIBPATH = os.path.join (current_directory, variant)) - env.Append (VARIANT = variant) - -variant_dir=variant -source = os.path.join (current_directory, "source") -sources = Glob(source + '/*') -for source in sources: - ss = str (source) - ss += '/SConstruct' - compile_library = SConscript (ss, exports='env') - libraries.extend (compile_library) - -env.Default (libraries) - -# User environment variables -env.Append (PROJECT_ROOT = current_directory) -env.Append (VARIANT_DIR = variant_dir) - -# -## Run 'scons dynamic' to compile dynamic libraries -# -dynamic_list = [] -dynamic = os.path.join (current_directory, "dynamic") -# Find SConstruct files: -dynamics=[os.path.join(r,f) for r,d,fs in os.walk(dynamic) for f in fs if f.endswith('SConstruct')] -for dynamic in dynamics: - ss = str (dynamic) - bn_ss = os.path.basename(ss) - if (bn_ss == "SConstruct"): - dynamic_program = SConscript (ss, exports='env') - if dynamic_program: - dynamic_list.extend (dynamic_program) - print dynamic_program [0] - -#Depends (dynamic_list, compile_library) - -# In order to remove dynamics objects with 'scons -c' we need to default them at built ('scons') procedure: -env.Default (dynamic_list) -#env.Alias ('dynamic', dynamic_list) - - -# -## Run 'scons example' to compile examples -# -example_list = [] -example = os.path.join (current_directory, "example") -examples = Glob(example + '/*/*') -for example in examples: - ss = str (example) - bn_ss = os.path.basename(ss) - noExtension = (len(bn_ss.split('.')) == 1) - if noExtension: - ss += '/SConstruct' - example_program = SConscript (ss, exports='env') - example_list.extend (example_program) - print example_program [0] - -#Depends (example_list, compile_library) - -# In order to remove examples objects with 'scons -c' we need to default them at built ('scons') procedure: -env.Default (example_list) -#env.Alias ('example', example_list) - -# -# Run 'scons test' to compile unit-tests -# -test_unit_result = None -test_unit_list = [] -run_tests = [] - -test = os.path.join (current_directory, "test") -tests = Glob(test + '/*') -for test in tests: - ss = str (test) - ss += '/SConstruct' - test_unit_program = SConscript (ss, exports='env') - test_unit_list.extend (test_unit_program) - print test_unit_program [0] - test_unit = Builder (action = '%s --report_level=short > $TARGET' % test_unit_program [0]) - env ['BUILDERS']['RunTestUnit'] = test_unit - test_unit_result = env.RunTestUnit ('%s.output' % test_unit_program [0], 'SConstruct') - run_tests.extend (test_unit_result) - Depends (test_unit_result, test_unit_program) - -env.Alias ('test', run_tests) -# In order to remove test objects with 'scons -c' we need to default them at built ('scons') procedure: -env.Default (test_unit_list) - -# -# Run 'scons doc' to generate documentation -# -# Doxygen Builder does not work properly at the moment. We will use an alias/action -#env = Environment(tools = ["default", "doxygen"], toolpath = './docs/doxygen') -#env.Doxygen("./docs/doxygen/Doxyfile") -# Finally, is enough to execute doxygen which will solve dependences and work for -# only modified files: -env.Alias('doc', env.Command('doc.dummy', [], 'cd docs/doxygen; doxygen')) - -# Installation aliases: -# -# 'sudo scons install-include' for only headers -# 'sudo scons install-lib' for only libraries -# 'sudo scons install-include-and-lib' for headers & libraries -# 'sudo scons install-example' for only example binaries/resources -# 'sudo scons install' to install the whole suite -# -# Run 'sudo scons uninstall' to uninstall the suite -# -# See http://www.scons.org/wiki/InstallTargets and http://www.scons.org/doc/production/HTML/scons-user/c2938.html -install_include = env.Install (target_usr_local_include, Glob("include/anna/*")) -static_lib_files = 'source/*/' + variant + '/*.a' -dynamic_lib_files = 'source/*/' + variant + '/*.so' -files_grabbed = [Glob(e) for e in [static_lib_files, dynamic_lib_files]] - -install_lib = env.Install (target_usr_local_lib, files_grabbed) -install_dynlib = env.Install (target_usr_local_lib, Glob("dynamic/launcher/default/" + variant + "/*.so")) -install_example = env.Install (target_opt_bin, Glob("example/*/*/" + variant + "/example_*")) -postinstall_example = env.Command('./example/postinstall.out', None, './example/postinstall.sh') - -#Default ('install') -if test_unit_result: - Depends (install_include, test_unit_result) - Depends (install_lib, test_unit_result) - Depends (install_dynlib, test_unit_result) - Depends (install_example, test_unit_result) - -ii = env.Alias('install-include', [target_usr_local_include]) -il = env.Alias('install-lib', [target_usr_local_lib]) -idl = env.Alias('install-dynlib', [target_usr_local_lib]) -iil = env.Alias('install-include-and-lib', [target_usr_local_include, target_usr_local_lib]) -iex = env.Alias('install-example', [target_opt_bin, postinstall_example]) -env.Alias('install', [iil, iex]) - -env.Command ("uninstall", None, [ Delete(target_usr_local_include), Delete(target_usr_local_lib), Delete(target_opt_bin) ]) - diff --git a/dynamic/launcher/default/SConscript b/dynamic/launcher/default/SConscript deleted file mode 100644 index d9a9862..0000000 --- a/dynamic/launcher/default/SConscript +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') - -result = env.SharedLibrary ('anna_dynamicLauncherProcedure', sources); - -Return ('result') - diff --git a/dynamic/launcher/default/SConstruct b/dynamic/launcher/default/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/dynamic/launcher/default/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/dynamic/launcher/gx/00001/SConscript b/dynamic/launcher/gx/00001/SConscript deleted file mode 100644 index d9a9862..0000000 --- a/dynamic/launcher/gx/00001/SConscript +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') - -result = env.SharedLibrary ('anna_dynamicLauncherProcedure', sources); - -Return ('result') - diff --git a/dynamic/launcher/gx/00001/SConstruct b/dynamic/launcher/gx/00001/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/dynamic/launcher/gx/00001/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/example/comm/blocker/SConscript b/example/comm/blocker/SConscript deleted file mode 100644 index 74c575c..0000000 --- a/example/comm/blocker/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/blocker/SConstruct b/example/comm/blocker/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/blocker/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/brkClient/SConscript b/example/comm/brkClient/SConscript deleted file mode 100644 index 28a01a5..0000000 --- a/example/comm/brkClient/SConscript +++ /dev/null @@ -1,39 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) -pName = "example_comm_brkClient" - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/brkClient/SConstruct b/example/comm/brkClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/brkClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/client/SConscript b/example/comm/client/SConscript deleted file mode 100644 index 0d41dbd..0000000 --- a/example/comm/client/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'timex', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/client/SConstruct b/example/comm/client/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/client/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/codec/SConscript b/example/comm/codec/SConscript deleted file mode 100644 index 81e9833..0000000 --- a/example/comm/codec/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/codec/SConstruct b/example/comm/codec/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/codec/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/datagramKClient/SConscript b/example/comm/datagramKClient/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/datagramKClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/datagramKClient/SConstruct b/example/comm/datagramKClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/datagramKClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/datagramRServer/SConscript b/example/comm/datagramRServer/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/datagramRServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/datagramRServer/SConstruct b/example/comm/datagramRServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/datagramRServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/irkClient/SConscript b/example/comm/irkClient/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/irkClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/irkClient/SConstruct b/example/comm/irkClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/irkClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/kClient/SConscript b/example/comm/kClient/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/kClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/kClient/SConstruct b/example/comm/kClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/kClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/kxClient/SConscript b/example/comm/kxClient/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/kxClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/kxClient/SConstruct b/example/comm/kxClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/kxClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/largeBinaryCodec/SConscript b/example/comm/largeBinaryCodec/SConscript deleted file mode 100644 index 81e9833..0000000 --- a/example/comm/largeBinaryCodec/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/largeBinaryCodec/SConstruct b/example/comm/largeBinaryCodec/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/largeBinaryCodec/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/rServer/SConscript b/example/comm/rServer/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/rServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/rServer/SConstruct b/example/comm/rServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/rServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/rrClient/SConscript b/example/comm/rrClient/SConscript deleted file mode 100644 index d199352..0000000 --- a/example/comm/rrClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'timex', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/rrClient/SConstruct b/example/comm/rrClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/rrClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/rrkClient/SConscript b/example/comm/rrkClient/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/rrkClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/rrkClient/SConstruct b/example/comm/rrkClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/rrkClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/comm/server/SConscript b/example/comm/server/SConscript deleted file mode 100644 index 52d8393..0000000 --- a/example/comm/server/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/comm/server/SConstruct b/example/comm/server/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/comm/server/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/genLogon/SConscript b/example/core/genLogon/SConscript deleted file mode 100644 index 4041708..0000000 --- a/example/core/genLogon/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'crypto', 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/genLogon/SConstruct b/example/core/genLogon/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/genLogon/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/ipManaging/SConscript b/example/core/ipManaging/SConscript deleted file mode 100644 index 9a31d44..0000000 --- a/example/core/ipManaging/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/ipManaging/SConstruct b/example/core/ipManaging/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/ipManaging/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/recycler/SConscript b/example/core/recycler/SConscript deleted file mode 100644 index 9a31d44..0000000 --- a/example/core/recycler/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/recycler/SConstruct b/example/core/recycler/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/recycler/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/regularExpression/SConscript b/example/core/regularExpression/SConscript deleted file mode 100644 index 9a31d44..0000000 --- a/example/core/regularExpression/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/regularExpression/SConstruct b/example/core/regularExpression/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/regularExpression/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/selectiveTracing/SConscript b/example/core/selectiveTracing/SConscript deleted file mode 100644 index 49a382b..0000000 --- a/example/core/selectiveTracing/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/selectiveTracing/SConstruct b/example/core/selectiveTracing/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/selectiveTracing/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/showLogon/SConscript b/example/core/showLogon/SConscript deleted file mode 100644 index 4041708..0000000 --- a/example/core/showLogon/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'crypto', 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/showLogon/SConstruct b/example/core/showLogon/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/showLogon/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/sort/SConscript b/example/core/sort/SConscript deleted file mode 100644 index d7310cd..0000000 --- a/example/core/sort/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/sort/SConstruct b/example/core/sort/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/sort/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/sortName/SConscript b/example/core/sortName/SConscript deleted file mode 100644 index 5087263..0000000 --- a/example/core/sortName/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/sortName/SConstruct b/example/core/sortName/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/sortName/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/thread/SConscript b/example/core/thread/SConscript deleted file mode 100644 index 119f555..0000000 --- a/example/core/thread/SConscript +++ /dev/null @@ -1,39 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -anna_libs.append ("xml2") -modules = [ 'xml', 'core', 'io' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/thread/SConstruct b/example/core/thread/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/thread/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/threadManager/SConscript b/example/core/threadManager/SConscript deleted file mode 100644 index 918b912..0000000 --- a/example/core/threadManager/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'xml', 'core' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/threadManager/SConstruct b/example/core/threadManager/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/threadManager/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/trace/SConscript b/example/core/trace/SConscript deleted file mode 100644 index 5087263..0000000 --- a/example/core/trace/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/trace/SConstruct b/example/core/trace/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/trace/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/core/zBlock/SConscript b/example/core/zBlock/SConscript deleted file mode 100644 index 84df189..0000000 --- a/example/core/zBlock/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'xml', 'core', 'io' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'z' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/core/zBlock/SConstruct b/example/core/zBlock/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/core/zBlock/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/dbms.mysql/insert/SConscript b/example/dbms.mysql/insert/SConscript deleted file mode 100644 index ab8a48f..0000000 --- a/example/dbms.mysql/insert/SConscript +++ /dev/null @@ -1,20 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example_dbms.mysql_insert" -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -system_library = { 'LIBS' : [ 'mysqlclient' ] } -localEnv.MergeFlags (system_library) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.c')) - - -Return ('result') diff --git a/example/dbms.mysql/insert/SConstruct b/example/dbms.mysql/insert/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/dbms.mysql/insert/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/dbms.mysql/select/SConscript b/example/dbms.mysql/select/SConscript deleted file mode 100644 index b3df304..0000000 --- a/example/dbms.mysql/select/SConscript +++ /dev/null @@ -1,20 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example_dbms.mysql_select" -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -system_library = { 'LIBS' : [ 'mysqlclient' ] } -localEnv.MergeFlags (system_library) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.c')) - - -Return ('result') diff --git a/example/dbms.mysql/select/SConstruct b/example/dbms.mysql/select/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/dbms.mysql/select/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/dbms.mysql/xInsert/SConscript b/example/dbms.mysql/xInsert/SConscript deleted file mode 100644 index 24ae4ed..0000000 --- a/example/dbms.mysql/xInsert/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example_dbms.mysql_xInsert" -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'dbms', 'dbms_mysql' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'mysqlclient' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/dbms.mysql/xInsert/SConstruct b/example/dbms.mysql/xInsert/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/dbms.mysql/xInsert/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/dbms.mysql/xSelect/SConscript b/example/dbms.mysql/xSelect/SConscript deleted file mode 100644 index 5185a1a..0000000 --- a/example/dbms.mysql/xSelect/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example_dbms.mysql_xSelect" -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'dbms', 'dbms_mysql' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'mysqlclient' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/dbms.mysql/xSelect/SConstruct b/example/dbms.mysql/xSelect/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/dbms.mysql/xSelect/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/dbos/workdir/SConscript b/example/dbos/workdir/SConscript deleted file mode 100644 index 8c6f5c8..0000000 --- a/example/dbos/workdir/SConscript +++ /dev/null @@ -1,39 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'dbms', 'dbos' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -sources = [ Glob('*.cpp'), Glob('filesystem/*.cpp'), Glob('storage/*.cpp') ] -result = localEnv.Program (pName, sources) - - -Return ('result') diff --git a/example/dbos/workdir/SConstruct b/example/dbos/workdir/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/dbos/workdir/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/diameter/batchConverter/SConscript b/example/diameter/batchConverter/SConscript deleted file mode 100644 index 762e01b..0000000 --- a/example/diameter/batchConverter/SConscript +++ /dev/null @@ -1,44 +0,0 @@ -Import ('env') - -# To avoid other libraries accumulation: -localEnv = env.Clone() - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'time' ]; -for module in modules: - anna_libs.append ("anna_" + module) - #module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -# http://scons.1086193.n5.nabble.com/How-to-force-the-use-of-a-static-library-when-the-dynamic-library-is-available-as-well-td28385.html -# libdiameter static variant: -project_root = localEnv['PROJECT_ROOT'] -variant_dir = localEnv['VARIANT_DIR'] -anna_libs.append (File (project_root + "/source/diameter/" + variant_dir + "/libanna_diameter.a")) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/diameter/batchConverter/SConstruct b/example/diameter/batchConverter/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/diameter/batchConverter/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript deleted file mode 100644 index 5caeec9..0000000 --- a/example/diameter/launcher/SConscript +++ /dev/null @@ -1,56 +0,0 @@ -import os -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] - -modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -# dynamic lib: -anna_libs.append ("anna_dynamicLauncherProcedure") -anna_libs.append ("anna_testing") -variant = env ['VARIANT'] -dynamic_libpath = os.path.join (pwd, "../../../../dynamic/launcher/default/" + variant) -anna_libpaths.append (dynamic_libpath) -dynamic_libpath = os.path.join (pwd, "../../../../source/testing/" + variant) -anna_libpaths.append (dynamic_libpath) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - - -# Linking ################################################################# - -# Process includes: -current_directory = Dir ('.').abspath -dynamic_include = os.path.join (pwd, "../../../../dynamic/launcher/default/") -localEnv.Append (CPPPATH = [current_directory, dynamic_include]) -#dynamic_include = os.path.join (pwd, "../../../../include/anna/testing/") -#localEnv.Append (CPPPATH = [current_directory, dynamic_include]) - -result = localEnv.Program (pName, Glob ('*.cpp')) -Return ('result') diff --git a/example/diameter/launcher/SConstruct b/example/diameter/launcher/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/diameter/launcher/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/diameter/pcapDecoder/SConscript b/example/diameter/pcapDecoder/SConscript deleted file mode 100644 index e0b60ad..0000000 --- a/example/diameter/pcapDecoder/SConscript +++ /dev/null @@ -1,43 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core' ]; -for module in modules: - anna_libs.append ("anna_" + module) - #module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -# Pcap resources: -localEnv.Append (CPPPATH = '/usr/include') -anna_libpaths.append ('/usr/lib64') -# # another way is to put this below: localEnv.Append(LIBPATH = [anna_libpaths, '/usr/lib64']) - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'rt', 'pcap' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/diameter/pcapDecoder/SConstruct b/example/diameter/pcapDecoder/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/diameter/pcapDecoder/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/diameter/stackManagement/SConscript b/example/diameter/stackManagement/SConscript deleted file mode 100644 index 762e01b..0000000 --- a/example/diameter/stackManagement/SConscript +++ /dev/null @@ -1,44 +0,0 @@ -Import ('env') - -# To avoid other libraries accumulation: -localEnv = env.Clone() - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'time' ]; -for module in modules: - anna_libs.append ("anna_" + module) - #module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -# http://scons.1086193.n5.nabble.com/How-to-force-the-use-of-a-static-library-when-the-dynamic-library-is-available-as-well-td28385.html -# libdiameter static variant: -project_root = localEnv['PROJECT_ROOT'] -variant_dir = localEnv['VARIANT_DIR'] -anna_libs.append (File (project_root + "/source/diameter/" + variant_dir + "/libanna_diameter.a")) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/diameter/stackManagement/SConstruct b/example/diameter/stackManagement/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/diameter/stackManagement/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/diameter/tme/SConscript b/example/diameter/tme/SConscript deleted file mode 100644 index 6b09162..0000000 --- a/example/diameter/tme/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'time', 'diameter' ]; -for module in modules: - anna_libs.append ("anna_" + module) - #module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/diameter/tme/SConstruct b/example/diameter/tme/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/diameter/tme/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/buffer/SConscript b/example/http/buffer/SConscript deleted file mode 100644 index e74f30d..0000000 --- a/example/http/buffer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/buffer/SConstruct b/example/http/buffer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/buffer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/client/SConscript b/example/http/client/SConscript deleted file mode 100644 index c7b411b..0000000 --- a/example/http/client/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'timex', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/client/SConstruct b/example/http/client/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/client/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/echo/SConscript b/example/http/echo/SConscript deleted file mode 100644 index e74f30d..0000000 --- a/example/http/echo/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/echo/SConstruct b/example/http/echo/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/echo/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/kClient/SConscript b/example/http/kClient/SConscript deleted file mode 100644 index 2a11ca7..0000000 --- a/example/http/kClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/kClient/SConstruct b/example/http/kClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/kClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/rServer/SConscript b/example/http/rServer/SConscript deleted file mode 100644 index 2a11ca7..0000000 --- a/example/http/rServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/rServer/SConstruct b/example/http/rServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/rServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/server/SConscript b/example/http/server/SConscript deleted file mode 100644 index 2a11ca7..0000000 --- a/example/http/server/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/server/SConstruct b/example/http/server/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/server/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/wims20Client/SConscript b/example/http/wims20Client/SConscript deleted file mode 100644 index e74f30d..0000000 --- a/example/http/wims20Client/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/wims20Client/SConstruct b/example/http/wims20Client/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/wims20Client/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/wims20RServer/SConscript b/example/http/wims20RServer/SConscript deleted file mode 100644 index e74f30d..0000000 --- a/example/http/wims20RServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/wims20RServer/SConstruct b/example/http/wims20RServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/wims20RServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/wims20XClient/SConscript b/example/http/wims20XClient/SConscript deleted file mode 100644 index c7b411b..0000000 --- a/example/http/wims20XClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'timex', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/wims20XClient/SConstruct b/example/http/wims20XClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/wims20XClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/wims20XRServer/SConscript b/example/http/wims20XRServer/SConscript deleted file mode 100644 index 2a11ca7..0000000 --- a/example/http/wims20XRServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/wims20XRServer/SConstruct b/example/http/wims20XRServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/wims20XRServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/xmlClient/SConscript b/example/http/xmlClient/SConscript deleted file mode 100644 index c7b411b..0000000 --- a/example/http/xmlClient/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'timex', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/xmlClient/SConstruct b/example/http/xmlClient/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/xmlClient/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/xmlRServer/SConscript b/example/http/xmlRServer/SConscript deleted file mode 100644 index 2a11ca7..0000000 --- a/example/http/xmlRServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'test', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/xmlRServer/SConstruct b/example/http/xmlRServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/xmlRServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/http/xmlSender/SConscript b/example/http/xmlSender/SConscript deleted file mode 100644 index e74f30d..0000000 --- a/example/http/xmlSender/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/http/xmlSender/SConstruct b/example/http/xmlSender/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/http/xmlSender/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/io/reader/SConscript b/example/io/reader/SConscript deleted file mode 100644 index 10d2c52..0000000 --- a/example/io/reader/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'xml', 'io', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - #module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/io/reader/SConstruct b/example/io/reader/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/io/reader/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/ldap/tSearch/SConscript b/example/ldap/tSearch/SConscript deleted file mode 100644 index e0c02b2..0000000 --- a/example/ldap/tSearch/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'timex', 'ldap' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'lber', 'ldap', 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/ldap/tSearch/SConstruct b/example/ldap/tSearch/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/ldap/tSearch/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/time/conversor/SConscript b/example/time/conversor/SConscript deleted file mode 100644 index 1fcd953..0000000 --- a/example/time/conversor/SConscript +++ /dev/null @@ -1,35 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'xml', 'time' ]; -for module in modules: - anna_libs.append ("anna_" + module) - #module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/time/conversor/SConstruct b/example/time/conversor/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/time/conversor/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/timex/ArithmeticHTTPServer/SConscript b/example/timex/ArithmeticHTTPServer/SConscript deleted file mode 100644 index c196b74..0000000 --- a/example/timex/ArithmeticHTTPServer/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app', 'comm', 'timex', 'http' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'pthread' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/timex/ArithmeticHTTPServer/SConstruct b/example/timex/ArithmeticHTTPServer/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/timex/ArithmeticHTTPServer/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/xml/xmlBasic/SConscript b/example/xml/xmlBasic/SConscript deleted file mode 100644 index 5087263..0000000 --- a/example/xml/xmlBasic/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/xml/xmlBasic/SConstruct b/example/xml/xmlBasic/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/xml/xmlBasic/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/xml/xmlBinary/SConscript b/example/xml/xmlBinary/SConscript deleted file mode 100644 index c357fa0..0000000 --- a/example/xml/xmlBinary/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt', 'z' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/xml/xmlBinary/SConstruct b/example/xml/xmlBinary/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/xml/xmlBinary/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/example/xml/xpath/SConscript b/example/xml/xpath/SConscript deleted file mode 100644 index 5087263..0000000 --- a/example/xml/xpath/SConscript +++ /dev/null @@ -1,38 +0,0 @@ -Import ('env') - -# Process ################################################################# -#pName = "example__" -bnames = Dir('..').abspath.rsplit('/', 2) -pName = "example_" + bnames[-2] + "_" + bnames[-1] -pPath = pName.replace("_", "/") + "/" - -# Anna modules ############################################################ -pwd = str(Dir ('.').abspath); -anna_libpaths = [] -anna_libs = [] -modules = [ 'core', 'io', 'xml', 'app' ]; -for module in modules: - anna_libs.append ("anna_" + module) - module = module.replace("_", ".") - anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/"))) - -anna_rlibs = list(anna_libs) -anna_rlibs.reverse() - -# Libraries ############################################################### -# To avoid other libraries accumulation: -localEnv = env.Clone() - -anna_library = { 'LIBS' : anna_rlibs } -localEnv.MergeFlags (anna_library) - -system_library = { 'LIBS' : [ 'xml2', 'rt' ] } -localEnv.MergeFlags (system_library) - -localEnv.Append(LIBPATH = anna_libpaths) - -# Linking ################################################################# -result = localEnv.Program (pName, Glob ('*.cpp')) - - -Return ('result') diff --git a/example/xml/xpath/SConstruct b/example/xml/xpath/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/example/xml/xpath/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/source/app/SConscript b/source/app/SConscript deleted file mode 100644 index c56bcd1..0000000 --- a/source/app/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -source_files = [ - sources, - sources_internal, -] - -result = env.StaticLibrary ('anna_app', source_files); - -Return ('result') - diff --git a/source/app/SConstruct b/source/app/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/app/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/comm/SConscript b/source/comm/SConscript deleted file mode 100644 index f30dde1..0000000 --- a/source/comm/SConscript +++ /dev/null @@ -1,18 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_transport = Glob('transport/*.cpp') -sources_handler = Glob('handler/*.cpp') -sources_internal = Glob('internal/*.cpp') - -source_files = [ - sources, - sources_transport, - sources_handler, - sources_internal, -] - -result = env.StaticLibrary ('anna_comm', source_files); - -Return ('result') - diff --git a/source/comm/SConstruct b/source/comm/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/comm/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/config/SConscript b/source/config/SConscript deleted file mode 100644 index fda2dea..0000000 --- a/source/config/SConscript +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') - -result = env.StaticLibrary ('anna_config', sources); - -Return ('result') - diff --git a/source/config/SConstruct b/source/config/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/config/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/core/SConscript b/source/core/SConscript deleted file mode 100644 index b57cf99..0000000 --- a/source/core/SConscript +++ /dev/null @@ -1,22 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_mt = Glob('mt/*.cpp') -sources_util = Glob('util/*.cpp') -sources_internal = Glob('internal/*.cpp') -sources_tracing = Glob('tracing/*.cpp') -sources_oam = Glob('oam/*.cpp') - -source_files = [ - sources, - sources_mt, - sources_util, - sources_internal, - sources_tracing, - sources_oam, -] - -result = env.StaticLibrary ('anna_core', source_files); - -Return ('result') - diff --git a/source/core/SConstruct b/source/core/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/core/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/dbms.mysql/SConscript b/source/dbms.mysql/SConscript deleted file mode 100644 index c607711..0000000 --- a/source/dbms.mysql/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_dbms_mysql', [sources, sources_internal]); - -Return ('result') - diff --git a/source/dbms.mysql/SConstruct b/source/dbms.mysql/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/dbms.mysql/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/dbms.oracle/SConscript b/source/dbms.oracle/SConscript deleted file mode 100644 index 4618113..0000000 --- a/source/dbms.oracle/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_dbms_oracle', [sources, sources_internal]); - -Return ('result') - diff --git a/source/dbms.oracle/SConstruct b/source/dbms.oracle/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/dbms.oracle/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/dbms/SConscript b/source/dbms/SConscript deleted file mode 100644 index 7c72ae0..0000000 --- a/source/dbms/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_dbms', [sources, sources_internal]); - -Return ('result') - diff --git a/source/dbms/SConstruct b/source/dbms/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/dbms/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/dbos/SConscript b/source/dbos/SConscript deleted file mode 100644 index bf9af40..0000000 --- a/source/dbos/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_dbos', [sources, sources_internal]); - -Return ('result') - diff --git a/source/dbos/SConstruct b/source/dbos/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/dbos/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/diameter.comm/SConscript b/source/diameter.comm/SConscript deleted file mode 100644 index b1f7be3..0000000 --- a/source/diameter.comm/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_diameter_comm', [sources, internal]); - -Return ('result') - diff --git a/source/diameter.comm/SConstruct b/source/diameter.comm/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/diameter.comm/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/diameter/SConscript b/source/diameter/SConscript deleted file mode 100644 index 1b25bb3..0000000 --- a/source/diameter/SConscript +++ /dev/null @@ -1,22 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') -sources_app = Glob('app/dcca/*.cpp') -sources_codec = Glob('codec/*.cpp') + Glob('codec/basetypes/*.cpp') + Glob('codec/tme/*.cpp') -sources_core = Glob('core/*.cpp') -sources_helpers =\ - Glob('helpers/*.cpp') +\ - Glob('helpers/base/*.cpp') +\ - Glob('helpers/dcca/*.cpp') +\ - Glob('helpers/ericsson/*.cpp') +\ - Glob('helpers/tid/*.cpp') +\ - Glob('helpers/tme/*.cpp') +\ - Glob('helpers/tme/codectypes/*.cpp') - -sources_stack = Glob('stack/*.cpp') - -result = env.SharedLibrary ('anna_diameter', [ sources, sources_internal, sources_app, sources_codec, sources_core, sources_helpers, sources_stack ]); -result = env.StaticLibrary ('anna_diameter', [ sources, sources_internal, sources_app, sources_codec, sources_core, sources_helpers, sources_stack ]); - -Return ('result') diff --git a/source/diameter/SConstruct b/source/diameter/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/diameter/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/html/SConscript b/source/html/SConscript deleted file mode 100644 index f281eaa..0000000 --- a/source/html/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_html', [sources, sources_internal]); - -Return ('result') - diff --git a/source/html/SConstruct b/source/html/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/html/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/http/SConscript b/source/http/SConscript deleted file mode 100644 index ffccd53..0000000 --- a/source/http/SConscript +++ /dev/null @@ -1,11 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') -sources_parser = Glob('parser/*.cpp') -sources_wims20 = Glob('wims20/*.cpp') - -result = env.StaticLibrary ('anna_http', [sources, sources_internal, sources_parser, sources_wims20]); - -Return ('result') - diff --git a/source/http/SConstruct b/source/http/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/http/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/io/SConscript b/source/io/SConscript deleted file mode 100644 index bb9cf98..0000000 --- a/source/io/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_io', [sources, sources_internal]); - -Return ('result') - diff --git a/source/io/SConstruct b/source/io/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/io/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/ldap/SConscript b/source/ldap/SConscript deleted file mode 100644 index d5e77ab..0000000 --- a/source/ldap/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -Import ('env') - -# Copy environment to add LDAP_DEPRECATED only for ldap module -envLDAP = env.Clone() -envLDAP.Append(CCFLAGS = ['-DLDAP_DEPRECATED']) -#envLDAP['CCFLAGS'] += ['-DLDAP_DEPRECATED'] - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = envLDAP.StaticLibrary ('anna_ldap', [sources, sources_internal]); - -Return ('result') - diff --git a/source/ldap/SConstruct b/source/ldap/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/ldap/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/statistics/SConscript b/source/statistics/SConscript deleted file mode 100644 index a03ad48..0000000 --- a/source/statistics/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_statistics', [sources, sources_internal]); - -Return ('result') - diff --git a/source/statistics/SConstruct b/source/statistics/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/statistics/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/test/SConscript b/source/test/SConscript deleted file mode 100644 index c238aa3..0000000 --- a/source/test/SConscript +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') - -result = env.StaticLibrary ('anna_test', sources); - -Return ('result') - diff --git a/source/test/SConstruct b/source/test/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/test/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/testing/SConscript b/source/testing/SConscript deleted file mode 100644 index b706a38..0000000 --- a/source/testing/SConscript +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') - -result = env.SharedLibrary ('anna_testing', sources); - -Return ('result') - diff --git a/source/testing/SConstruct b/source/testing/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/testing/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/time/SConscript b/source/time/SConscript deleted file mode 100644 index 17cd90c..0000000 --- a/source/time/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_time', [sources, sources_internal]); - -Return ('result') - diff --git a/source/time/SConstruct b/source/time/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/time/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/timex/SConscript b/source/timex/SConscript deleted file mode 100644 index 4f13cc9..0000000 --- a/source/timex/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_timex', [sources, sources_internal]); - -Return ('result') - diff --git a/source/timex/SConstruct b/source/timex/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/timex/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/source/xml/SConscript b/source/xml/SConscript deleted file mode 100644 index 01cb3dc..0000000 --- a/source/xml/SConscript +++ /dev/null @@ -1,9 +0,0 @@ -Import ('env') - -sources = Glob('*.cpp') -sources_internal = Glob('internal/*.cpp') - -result = env.StaticLibrary ('anna_xml', [sources, sources_internal]); - -Return ('result') - diff --git a/source/xml/SConstruct b/source/xml/SConstruct deleted file mode 100644 index bc482f0..0000000 --- a/source/xml/SConstruct +++ /dev/null @@ -1,12 +0,0 @@ -release = ARGUMENTS.get ('release', 0) - -Import ('env') - -# See http://stackoverflow.com/questions/4693826/scons-binary-directory -if int(release): - result = SConscript ('SConscript', exports='env', variant_dir="release", duplicate=0) -else: - result = SConscript ('SConscript', exports='env', variant_dir="debug", duplicate=0) - -Return ('result') - diff --git a/test/config/SConscript b/test/config/SConscript deleted file mode 100644 index 2618190..0000000 --- a/test/config/SConscript +++ /dev/null @@ -1,19 +0,0 @@ -Import ('env') - -# See http://www.scons.org/doc/2.0.1/HTML/scons-user/c1809.html -# about merging flags -boost_library = { 'LIBS' : 'boost_unit_test_framework' } -env.MergeFlags (boost_library) - -anna_library = { 'LIBS' : 'anna_config' } -env.MergeFlags (anna_library) - -pwd = Dir ('.').abspath; -current_directory = str (pwd); - -libpath = current_directory.replace ('test/', 'source/'); -env.Append (LIBPATH = [libpath]) - -result = env.Program ('anna_test_config', Glob ('*.cpp')) - -Return ('result') diff --git a/test/config/SConstruct b/test/config/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/test/config/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/test/core/SConscript b/test/core/SConscript deleted file mode 100644 index 8b742c8..0000000 --- a/test/core/SConscript +++ /dev/null @@ -1,26 +0,0 @@ -Import ('env') - -# See http://www.scons.org/doc/2.0.1/HTML/scons-user/c1809.html -# about merging flags -boost_library = { 'LIBS' : 'boost_unit_test_framework' } -env.MergeFlags (boost_library) - -anna_library = { 'LIBS' : 'anna_core' } -env.MergeFlags (anna_library) - -#system_library = { 'LIBS' : 'boost_program_options' } -#env.MergeFlags (system_library) - -pwd = Dir ('.').abspath; -current_directory = str (pwd); - -libpath = current_directory.replace ('test/', 'source/'); -env.Append (LIBPATH = [libpath]) - -result = env.Program ('anna_test_core', Glob ('*.cpp')) - -Return ('result') - - - - diff --git a/test/core/SConstruct b/test/core/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/test/core/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') - diff --git a/test/time/SConscript b/test/time/SConscript deleted file mode 100644 index 5db2a84..0000000 --- a/test/time/SConscript +++ /dev/null @@ -1,26 +0,0 @@ -Import ('env') - -# To avoid other libraries accumulation: -localEnv = env.Clone() - -# See http://www.scons.org/doc/2.0.1/HTML/scons-user/c1809.html -# about merging flags -boost_library = { 'LIBS' : 'boost_unit_test_framework' } -localEnv.MergeFlags (boost_library) - -anna_library = { 'LIBS' : [ 'anna_time', 'anna_xml', 'anna_core' ] } -localEnv.MergeFlags (anna_library) - -pwd = Dir ('.').abspath; -current_directory = str (pwd); - -context = "test/time/" -libpath_core = current_directory.replace (context, 'source/core/'); -libpath_xml = current_directory.replace (context, 'source/xml/'); -libpath_time = current_directory.replace (context, 'source/time/'); - -localEnv.Append(LIBPATH = [libpath_core, libpath_xml, libpath_time]) - -result = localEnv.Program ('anna_test_time', Glob ('*.cpp')) - -Return ('result') diff --git a/test/time/SConstruct b/test/time/SConstruct deleted file mode 100644 index 3275f35..0000000 --- a/test/time/SConstruct +++ /dev/null @@ -1,8 +0,0 @@ -Import ('env') - -variant = env ['VARIANT'] - -result = SConscript ('SConscript', exports='env', variant_dir='%s' % variant, duplicate=0) - -Return ('result') -