- Add copyright notices to existing builtin python policies
- Implement system to dinamically pass plugins and policies search paths to the sgpemv2 binary and tests (class GlobalSettings) - Drastically reduce usage of hardcoded paths in code except as default overridable values git-svn-id: svn://svn.gna.org/svn/sgpemv2/trunk@514 3ecf2c5c-341e-0410-92b4-d18e462d057c
This commit is contained in:
parent
24a0194368
commit
92e6f3be2b
9 changed files with 353 additions and 88 deletions
|
@ -19,25 +19,50 @@
|
|||
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
#include "python_policy_manager.hh"
|
||||
#include "../global_settings.hh"
|
||||
|
||||
#include <Python.h>
|
||||
#include <glibmm/ustring.h>
|
||||
#include <glibmm/timer.h>
|
||||
|
||||
#include <string>
|
||||
#include <algorithm>
|
||||
#include <cassert>
|
||||
#include <functional>
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
#include <unistd.h>
|
||||
using namespace sgpem;
|
||||
|
||||
|
||||
|
||||
// Concatenate a string with all the policies directories
|
||||
struct pol_dirs_concat : public std::unary_function<void, const Glib::ustring&>
|
||||
{
|
||||
public:
|
||||
pol_dirs_concat(Glib::ustring& cat) : _cat(cat) {}
|
||||
void operator()(const Glib::ustring& add)
|
||||
{
|
||||
// Please note that this string will end finishing with
|
||||
// and additional ","!
|
||||
_cat += "'" + add + "', ";
|
||||
}
|
||||
private:
|
||||
Glib::ustring& _cat;
|
||||
};
|
||||
|
||||
|
||||
|
||||
//static object
|
||||
PythonPolicyManager* PythonPolicyManager::_instance = NULL;
|
||||
|
||||
|
||||
PythonPolicyManager::PythonPolicyManager()
|
||||
: _initialized(false)
|
||||
{
|
||||
PyEval_InitThreads();
|
||||
}
|
||||
|
||||
|
||||
PythonPolicyManager* const
|
||||
PythonPolicyManager::get_instance()
|
||||
{
|
||||
|
@ -46,6 +71,7 @@ PythonPolicyManager::get_instance()
|
|||
return _instance;
|
||||
}
|
||||
|
||||
|
||||
Policy&
|
||||
PythonPolicyManager::get_policy()
|
||||
{
|
||||
|
@ -53,6 +79,7 @@ PythonPolicyManager::get_policy()
|
|||
return *_python_policy;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
PythonPolicyManager::init()
|
||||
{
|
||||
|
@ -63,14 +90,20 @@ PythonPolicyManager::init()
|
|||
Py_Initialize();
|
||||
_initialized = true;
|
||||
|
||||
// The following line is ugly, but necessary if we use
|
||||
// The following lines are ugly, but necessary if we use
|
||||
// non-standard installation directories. Theoretically,
|
||||
// it should be up to the user to set correct
|
||||
// environment variables.
|
||||
// FIXME: find better way to achieve this.
|
||||
|
||||
PyRun_SimpleString("import sys\n"
|
||||
"sys.path[:0] = [ '" MODDIR "', '" POLDIR "' ]\n");
|
||||
Glib::ustring importdirs = "import sys\n"
|
||||
"sys.path[:0] = [ ";
|
||||
for_each(GlobalSettings::instance().policies_dir_begin(),
|
||||
GlobalSettings::instance().policies_dir_end(),
|
||||
pol_dirs_concat(importdirs));
|
||||
importdirs += " '" MODDIR "' ]\n";
|
||||
|
||||
PyRun_SimpleString(importdirs.c_str());
|
||||
|
||||
// Okay, here we go.
|
||||
// Black magic at work.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue