Make testing library dynamic. Refactor DEPLOY.sh

[anna.git] / example / diameter / launcher / SConscript

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index 8e1b064..5caeec9 100644 (file)
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -12,7 +12,7 @@ pwd = str(Dir ('.').abspath);
 anna_libpaths = []
 anna_libs = []
 
-modules = [ 'core', 'io', 'xml', 'app', 'http', 'comm', 'timex', 'http', 'statistics', 'time', 'diameter', 'diameter_comm', 'testing' ];
+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("_", ".")
@@ -20,9 +20,12 @@ for module in modules:
 
 # 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()
@@ -46,6 +49,8 @@ localEnv.Append(LIBPATH = anna_libpaths)
 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')