dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feed environment values through gimp_config_path_expand, so ${gimp..} 

2005-06-26  Manish Singh  <yosh@gimp.org>

        * app/core/gimpenvirontable.c: feed environment values through
        gimp_config_path_expand, so ${gimp..} variables can be used.

        * plug-ins/pygimp/Makefile.am: define PYTHONPATH in terms of
        ${gimp_plug_in_dir}. Use ; as a path separator on windows.

        With this final changes, pygimp should work out of the box on
        Win32 now. Thanks to Michael Schumacher and lode leroy for
        figuring out the high level details and testing.
This commit is contained in:
Manish Singh 2005-06-26 23:20:21 +00:00 committed by Manish Singh
parent f27621b617
commit 02edf14eec
4 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2005-06-26 Manish Singh <yosh@gimp.org>
* app/core/gimpenvirontable.c: feed environment values through
gimp_config_path_expand, so ${gimp..} variables can be used.
* plug-ins/pygimp/Makefile.am: define PYTHONPATH in terms of
${gimp_plug_in_dir}. Use ; as a path separator on windows.
With this final changes, pygimp should work out of the box on
Win32 now. Thanks to Michael Schumacher and lode leroy for
figuring out the high level details and testing.
2005-06-27 Sven Neumann <sven@gimp.org>
* app/config/gimpconfig-dump.c (dump_gimprc_manpage): don't dump

12
app/core/gimpenvirontable.c
View File

@ -28,6 +28,7 @@
#include <glib/gstdio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
#include "core-types.h"
@ -248,7 +249,7 @@ gimp_environ_table_load_env_file (const GimpDatafileData *file_data,
FILE *env;
gchar buffer[4096];
gsize len;
gchar *name, *value, *separator, *p, *q;
gchar *name, *value, *separator, *expanded, *p, *q;
GimpEnvironValue *val;
environ_table = GIMP_ENVIRON_TABLE (user_data);
@ -308,7 +309,14 @@ gimp_environ_table_load_env_file (const GimpDatafileData *file_data,
if (! g_hash_table_lookup (environ_table->vars, name))
{
val = g_new (GimpEnvironValue, 1);
val->value = g_strdup (value);
expanded = gimp_config_path_expand (value, FALSE, NULL);
if (expanded)
val->value = expanded;
else
val->value = g_strdup (value);
val->separator = g_strdup (separator);
g_hash_table_insert (environ_table->vars, g_strdup (name), val);

12
app/plug-in/gimpenvirontable.c
View File

@ -28,6 +28,7 @@
#include <glib/gstdio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpconfig/gimpconfig.h"
#include "core-types.h"
@ -248,7 +249,7 @@ gimp_environ_table_load_env_file (const GimpDatafileData *file_data,
FILE *env;
gchar buffer[4096];
gsize len;
gchar *name, *value, *separator, *p, *q;
gchar *name, *value, *separator, *expanded, *p, *q;
GimpEnvironValue *val;
environ_table = GIMP_ENVIRON_TABLE (user_data);
@ -308,7 +309,14 @@ gimp_environ_table_load_env_file (const GimpDatafileData *file_data,
if (! g_hash_table_lookup (environ_table->vars, name))
{
val = g_new (GimpEnvironValue, 1);
val->value = g_strdup (value);
expanded = gimp_config_path_expand (value, FALSE, NULL);
if (expanded)
val->value = expanded;
else
val->value = g_strdup (value);
val->separator = g_strdup (separator);
g_hash_table_insert (environ_table->vars, g_strdup (name), val);

7
plug-ins/pygimp/Makefile.am
View File

@ -13,12 +13,17 @@ SUBDIRS = plug-ins
if PLATFORM_WIN32
no_undefined = -no-undefined
path_separator = ;
else
path_separator = :
endif
AM_CFLAGS = $(PYGIMP_EXTRA_CFLAGS)
INCLUDES = -I$(top_srcdir) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) $(GTK_CFLAGS)
pygimpbase = python
pygimpdir = $(gimpplugindir)/python
pygimp_LTLIBRARIES = gimp.la _gimpenums.la gimpcolor.la gimpprocbrowser.la
@ -109,7 +114,7 @@ pyinterpfile = $(pyinterpdir)/pygimp.interp
install-env-file:
$(mkinstalldirs) '$(DESTDIR)$(pyenvdir)'
echo ": PYTHONPATH=$(pygimpdir)" > '$(DESTDIR)$(pyenvfile)'
echo '$(path_separator) PYTHONPATH=$${gimp_plug_in_dir}/$(pygimpbase)' > '$(DESTDIR)$(pyenvfile)'
install-interp-file:
$(mkinstalldirs) '$(DESTDIR)$(pyinterpdir)'