Commit 02edf14e authored by Manish Singh's avatar Manish Singh Committed by Manish Singh
Browse files

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.
parent f27621b6
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
......
......@@ -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);
......
......@@ -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);
......
......@@ -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)'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment