X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Examples%2Fcalcium2%2Fcomponents.py;h=c6fd48b576f1306ca7fa6777882f81654d9a147a;hb=c3e6f9efc2a68074a087d0600f48a7313d3fff60;hp=e49df648214c0dfd7c6db70276d8745a145e15a2;hpb=c9166beae71cfa6d65831084571e72fde3b405b2;p=tools%2Fyacsgen.git

diff --git a/Examples/calcium2/components.py b/Examples/calcium2/components.py
index e49df64..c6fd48b 100644
--- a/Examples/calcium2/components.py
+++ b/Examples/calcium2/components.py
@@ -1,9 +1,9 @@
-# Copyright (C) 2009-2013  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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()