nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Install moo.pyd into lib/moo/plugins/lib

master
Yevgen Muntyan 2008-01-18 15:12:41 -06:00
parent 3aa1205419
commit 8161c1cf14
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makewin
View File

@ -125,9 +125,9 @@ def copy_files():
do_cmd("mkdir -p %s/lib/site-packages" % (moo_windir,))
do_cmd("cp %s/usr/local/win/gtk-dist/lib/moo/plugins/lib/moo.pyd %s/lib/site-packages/moo.pyd" % (installdir, moo_windir))
else:
do_cmd("mkdir -p %s/lib/moo/plugins" % (moo_windir,))
do_cmd("mkdir -p %s/lib/moo/plugins/lib" % (moo_windir,))
do_cmd("cp %s/usr/local/win/gtk-dist/lib/moo/plugins/pymoo.dll %s/lib/moo/plugins/" % (installdir, moo_windir))
do_cmd("cp %s/usr/local/win/gtk-dist/lib/moo/plugins/lib/moo.pyd %s/lib/moo/plugins/" % (installdir, moo_windir))
do_cmd("cp %s/usr/local/win/gtk-dist/lib/moo/plugins/lib/moo.pyd %s/lib/moo/plugins/lib/" % (installdir, moo_windir))
if do_strip:
if not bin_only and not no_python:

16
moo/moopython/moopython-mod.c
View File

@ -121,6 +121,7 @@ MOO_MODULE_INIT_FUNC_DECL
{
PyObject *moo_mod;
char *dlldir = NULL;
char *libdir = NULL;
if (g_getenv ("MOO_DEBUG_NO_PYTHON"))
return FALSE;
@ -138,18 +139,25 @@ MOO_MODULE_INIT_FUNC_DECL
dlldir = moo_win32_get_dll_dir (MOO_PYTHON_MODULE_DLL_NAME);
#endif
if (dlldir && !sys_path_add_dir (dlldir))
if (dlldir)
{
libdir = g_build_filename (dlldir, "lib", NULL);
g_free (dlldir);
dlldir = NULL;
}
if (libdir && !sys_path_add_dir (libdir))
{
g_free (libdir);
libdir = NULL;
}
moo_mod = PyImport_ImportModule ("moo");
if (dlldir)
if (libdir)
{
sys_path_remove_dir (dlldir);
g_free (dlldir);
sys_path_remove_dir (libdir);
g_free (libdir);
}
if (!moo_mod)