Commit 637feef2 authored by Garrett Regier's avatar Garrett Regier

Shorten Python plugin loader filenames

Using "peas-plugin-loader-python" as a
prefix is just too long.

https://bugzilla.gnome.org/show_bug.cgi?id=742349
parent 917dbb5a
......@@ -51,8 +51,8 @@ Makefile.in
/intltool-update.in
/libtool
/ltmain.sh
/loaders/python/peas-plugin-loader-python-resources.c
/loaders/python3/peas-plugin-loader-python3-resources.c
/loaders/python/peas-python-resources.c
/loaders/python3/peas-python3-resources.c
/m4
/missing
/mkinstalldirs
......
......@@ -16,9 +16,9 @@ AM_CPPFLAGS = \
loader_LTLIBRARIES = libpythonloader.la
libpythonloader_la_SOURCES = \
peas-plugin-loader-python.c \
peas-plugin-loader-python.h \
peas-plugin-loader-python-resources.c
peas-plugin-loader-python.c \
peas-plugin-loader-python.h \
peas-python-resources.c
libpythonloader_la_LDFLAGS = \
$(LOADER_LIBTOOL_FLAGS) \
......@@ -31,23 +31,23 @@ libpythonloader_la_LIBADD = \
$(PYGOBJECT_LIBS) \
$(PYTHON2_LIBS)
peas-plugin-loader-python-internal.pyc: peas-plugin-loader-python-internal.py
peas-python-internal.pyc: peas-python-internal.py
$(AM_V_GEN) $(PYTHON2_BIN) $(srcdir)/peas-python-compile.py $< $@
all-local: peas-plugin-loader-python-internal.pyc
all-local: peas-python-internal.pyc
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/peas-plugin-loader-python.gresource.xml)
peas-plugin-loader-python-resources.c: $(srcdir)/peas-plugin-loader-python.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/peas-plugin-loader-python.gresource.xml
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/peas-python.gresource.xml)
peas-python-resources.c: $(srcdir)/peas-python.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/peas-python.gresource.xml
EXTRA_DIST = \
peas-python-compile.py \
peas-plugin-loader-python.gresource.xml \
peas-python-compile.py \
peas-python.gresource.xml \
$(loader_resources_deps)
CLEANFILES = \
peas-plugin-loader-python-internal.pyc \
peas-plugin-loader-python-resources.c
peas-python-internal.pyc \
peas-python-resources.c
gcov_sources = $(libpythonloader_la_SOURCES)
include $(top_srcdir)/Makefile.gcov
......@@ -608,7 +608,7 @@ peas_plugin_loader_python_initialize (PeasPluginLoader *loader)
/* Compile it manually so the filename is available */
code = Py_CompileString (g_bytes_get_data (internal_python, NULL),
"peas-plugin-loader-python-internal.py",
"peas-python-internal.py",
Py_file_input);
g_bytes_unref (internal_python);
......
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/libpeas/loaders/python">
<file alias="internal.py">peas-plugin-loader-python-internal.py</file>
<file alias="internal.py">peas-python-internal.py</file>
</gresource>
</gresources>
......@@ -18,7 +18,7 @@ loader_LTLIBRARIES = libpython3loader.la
libpython3loader_la_SOURCES = \
$(top_srcdir)/loaders/python/peas-plugin-loader-python.c \
$(top_srcdir)/loaders/python/peas-plugin-loader-python.h \
peas-plugin-loader-python3-resources.c
peas-python3-resources.c
libpython3loader_la_LDFLAGS = \
$(LOADER_LIBTOOL_FLAGS) \
......@@ -31,22 +31,22 @@ libpython3loader_la_LIBADD = \
$(PYGOBJECT_LIBS) \
$(PYTHON3_LIBS)
peas-plugin-loader-python3-internal.pyc: $(srcdir)/../python/peas-plugin-loader-python-internal.py
peas-python3-internal.pyc: $(srcdir)/../python/peas-python-internal.py
$(AM_V_GEN) $(PYTHON3_BIN) $(srcdir)/../python/peas-python-compile.py $< $@
all-local: peas-plugin-loader-python3-internal.pyc
all-local: peas-python3-internal.pyc
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/peas-plugin-loader-python3.gresource.xml)
peas-plugin-loader-python3-resources.c: $(srcdir)/peas-plugin-loader-python3.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/peas-plugin-loader-python3.gresource.xml
loader_resources_deps = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/peas-python3.gresource.xml)
peas-python3-resources.c: $(srcdir)/peas-python3.gresource.xml $(loader_resources_deps)
$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --internal --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/peas-python3.gresource.xml
EXTRA_DIST = \
peas-plugin-loader-python3.gresource.xml \
peas-python3.gresource.xml \
$(loader_resources_deps)
CLEANFILES = \
peas-plugin-loader-python3-internal.pyc \
peas-plugin-loader-python3-resources.c
peas-python3-internal.pyc \
peas-python3-resources.c
gcov_sources = $(libpython3loader_la_SOURCES)
include $(top_srcdir)/Makefile.gcov
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gnome/libpeas/loaders/python3">
<file alias="internal.py">../python/peas-plugin-loader-python-internal.py</file>
<file alias="internal.py">../python/peas-python-internal.py</file>
</gresource>
</gresources>
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