diff --git a/bora/python/__init__.py b/bora/python/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/bora/python/meson.build b/bora/python/meson.build index 45ad7063..7ec51812 100644 --- a/bora/python/meson.build +++ b/bora/python/meson.build @@ -1,4 +1,5 @@ py.install_sources( + '__init__.py', 'initHook.py', subdir: 'coriolis/bora', ) diff --git a/bora/src/BoraEngine.cpp b/bora/src/BoraEngine.cpp index 925d787f..758e78ca 100644 --- a/bora/src/BoraEngine.cpp +++ b/bora/src/BoraEngine.cpp @@ -110,22 +110,9 @@ namespace Bora { void BoraEngine::_runBoraInit () { - Utilities::Path pythonSitePackages = System::getPath("pythonSitePackages"); - Utilities::Path confFile = "coriolis/bora/initHook.py"; - Utilities::Path systemConfFile = pythonSitePackages / confFile; - - if (systemConfFile.exists()) { - //Isobar::Script::addPath( systemConfDir.toString() ); - - dbo_ptr script = Isobar::Script::create( confFile.toPyModPath() ); - script->addKwArgument( "bora" , (PyObject*)PyBoraEngine_Link(this) ); - script->runFunction ( "boraHook", getCell() ); - - //Isobar::Script::removePath( systemConfDir.toString() ); - } else { - cerr << Warning( "Bora system configuration file:\n <%s> not found." - , systemConfFile.toString().c_str() ) << endl; - } + dbo_ptr script = Isobar::Script::create( "coriolis.bora.initHook" ); + script->addKwArgument( "bora" , (PyObject*)PyBoraEngine_Link(this) ); + script->runFunction ( "boraHook", getCell() ); } diff --git a/katana/python/__init__.py b/katana/python/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/katana/python/meson.build b/katana/python/meson.build index 11c8e317..80ec39ac 100644 --- a/katana/python/meson.build +++ b/katana/python/meson.build @@ -1,4 +1,5 @@ py.install_sources( + '__init__.py', 'initHook.py', subdir: 'coriolis/katana', ) diff --git a/katana/src/KatanaEngine.cpp b/katana/src/KatanaEngine.cpp index 9b000743..a4ca2443 100644 --- a/katana/src/KatanaEngine.cpp +++ b/katana/src/KatanaEngine.cpp @@ -221,22 +221,9 @@ namespace Katana { void KatanaEngine::_runKatanaInit () { - Utilities::Path pythonSitePackages = System::getPath( "pythonSitePackages" ); - Utilities::Path confFile = "coriolis/katana/initHook.py"; - Utilities::Path systemConfFile = pythonSitePackages / confFile; - - if (systemConfFile.exists()) { - //Isobar::Script::addPath( systemConfDir.toString() ); - - dbo_ptr script = Isobar::Script::create( confFile.toPyModPath() ); - script->addKwArgument( "katana" , (PyObject*)PyKatanaEngine_Link(this) ); - script->runFunction ( "katanaHook", getCell() ); - - //Isobar::Script::removePath( systemConfDir.toString() ); - } else { - cerr << Warning( "Katana system configuration file:\n <%s> not found." - , systemConfFile.toString().c_str() ) << endl; - } + dbo_ptr script = Isobar::Script::create( "coriolis.katana.initHook" ); + script->addKwArgument( "katana" , (PyObject*)PyKatanaEngine_Link(this) ); + script->runFunction ( "katanaHook", getCell() ); } diff --git a/unicorn/python/__init__.py b/unicorn/python/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/unicorn/python/meson.build b/unicorn/python/meson.build index 5cae201c..d4cf2ce3 100644 --- a/unicorn/python/meson.build +++ b/unicorn/python/meson.build @@ -1,4 +1,5 @@ py.install_sources( + '__init__.py', 'initHook.py', subdir: 'coriolis/unicorn', ) diff --git a/unicorn/src/UnicornGui.cpp b/unicorn/src/UnicornGui.cpp index ccd95bd8..99d6dd06 100644 --- a/unicorn/src/UnicornGui.cpp +++ b/unicorn/src/UnicornGui.cpp @@ -118,22 +118,9 @@ namespace Unicorn { void UnicornGui::_runUnicornInit () { - Utilities::Path pythonSitePackages = System::getPath("pythonSitePackages"); - Utilities::Path confFile = "coriolis/unicorn/initHook.py"; - Utilities::Path systemConfFile = pythonSitePackages / confFile; - - if (systemConfFile.exists()) { - //Isobar::Script::addPath( systemConfDir.toString() ); - - dbo_ptr script = Isobar::Script::create( confFile.toPyModPath() ); - script->addKwArgument( "editor" , (PyObject*)PyCellViewer_Link(this) ); - script->runFunction ( "unicornConfigure", getCell() ); - - //Isobar::Script::removePath( systemConfDir.toString() ); - } else { - cerr << Warning("Unicorn system configuration file:\n <%s> not found." - ,systemConfFile.toString().c_str()) << endl; - } + dbo_ptr script = Isobar::Script::create( "coriolis.unicorn.initHook" ); + script->addKwArgument( "editor" , (PyObject*)PyCellViewer_Link(this) ); + script->runFunction ( "unicornConfigure", getCell() ); }