Merge remote-tracking branch 'origin/master' into V9_dev

[tools/yacsgen.git] / Examples / calcium2 / components.py

diff --git a/Examples/calcium2/components.py b/Examples/calcium2/components.py
index 7fd81fe3642a1ef9eb7f9fa0d4674fe0767e2d3b..c6fd48b576f1306ca7fa6777882f81654d9a147a 100644 (file)
--- a/Examples/calcium2/components.py
+++ b/Examples/calcium2/components.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2014  EDF R&D
+# Copyright (C) 2009-2016  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -20,8 +20,9 @@
 import os
 
 #import context from ..
-execfile("../context.py")
+exec(compile(open("../context.py").read(), "../context.py", 'exec'))
 from module_generator import Generator,Module,Service,PYComponent,CPPComponent,F77Component
+from module_generator import Library
 
 # C++ component
 
@@ -447,13 +448,12 @@ c3=F77Component("fcode1",
                                             ],
                                  ),
                          ],
-                libs="-L%s -lcode1" % cwd,
-                rlibs="-Wl,--rpath -Wl,%s" % cwd,
+                libs=[Library(name="code1", path=cwd)],
+                rlibs=cwd,
                )
 
-g=Generator(Module("pycompos",components=[c1,c2,c3],prefix="./install",layout="multidir"),context)
+g=Generator(Module("pycompos",components=[c1,c2,c3],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()