Merge V9_dev branch into master

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

diff --git a/Examples/cpp2/components.py b/Examples/cpp2/components.py
index c99105acb032656a824292de9fce1ad4d93047f8..cf00113150110cb025638d98e0b31c15388b13fc 100644 (file)
--- a/Examples/cpp2/components.py
+++ b/Examples/cpp2/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,7 +20,7 @@
 import os
 
 #import context from ..
-execfile("../context.py")
+exec(compile(open("../context.py").read(), "../context.py", 'exec'))
 from module_generator import Generator,Module,Service,CPPComponent
 
 cwd=os.getcwd()
@@ -48,7 +48,6 @@ c1=CPPComponent("compo1",services=[
                        defs="//def1",body=body,
                  ),
           ],
-         includes="-I/usr/include",
          kind="exe",
          exe_path=os.path.join(cwd,"prog"),
          )
@@ -56,7 +55,6 @@ c1=CPPComponent("compo1",services=[
 
 g=Generator(Module("cppcompos",components=[c1],prefix="./install"),context)
 g.generate()
-g.bootstrap()
 g.configure()
 g.make()
 g.install()