X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FSConscript;h=d9d48ce2f1cd2d28ae0d8f1e1032ef103f90d243;hb=4e8157262b1ac3c38cb9cbd56c0b41a11b90e1d3;hp=c0dc64d93dff3cf6cbfefda02c8e090a3bd9aee9;hpb=706c5ba5c35199816446453e6e144200cf79265b;p=anna.git

diff --git a/example/diameter/launcher/SConscript b/example/diameter/launcher/SConscript
index c0dc64d..d9d48ce 100644
--- a/example/diameter/launcher/SConscript
+++ b/example/diameter/launcher/SConscript
@@ -1,3 +1,4 @@
+import os
 Import ('env')
 
 # Process #################################################################
@@ -10,12 +11,20 @@ pPath = pName.replace("_", "/") + "/"
 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("_", ".")
+  kk = pwd.replace (pPath, ("source/" + module + "/"))
   anna_libpaths.append (pwd.replace (pPath, ("source/" + module + "/")))
 
+# dynamic lib:
+anna_libs.append ("anna_dynamicLauncherProcedure")
+variant = env ['VARIANT']
+dynamic_libpath = os.path.join (pwd, "../../../../dynamic/launcher/default/" + variant)
+anna_libpaths.append (dynamic_libpath)
+
 anna_rlibs = list(anna_libs)
 anna_rlibs.reverse()
 
@@ -31,8 +40,15 @@ localEnv.MergeFlags (system_library)
 
 localEnv.Append(LIBPATH = anna_libpaths)
 
+
 # Linking #################################################################
-result = localEnv.Program (pName, Glob ('*.cpp'))
 
+# Process includes (avoid mandatory using of quoted includes and ../ paths from testing directory):
+current_directory = Dir ('.').abspath
+testing_include = os.path.join (current_directory, "testing")
+dynamic_include = os.path.join (pwd, "../../../../dynamic/launcher/default/")
+localEnv.Append (CPPPATH = [current_directory, testing_include, dynamic_include])
+
+result = localEnv.Program (pName, Glob ('*.cpp') + Glob ('testing/*.cpp'))
 
 Return ('result')