summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGarrett Regier <garrettregier@gmail.com>2015-01-04 18:09:14 -0800
committerGarrett Regier <garrettregier@gmail.com>2015-01-20 01:23:07 -0800
commit637feef2fcd9c2ea1bf27b03466c5b25b59ecaba (patch)
tree5228aedc42b0c24910ef8cef17256b881f58ef9f
parent917dbb5a0e8c2d787daeec5c9e667fc794791c44 (diff)
downloadlibpeas-637feef2fcd9c2ea1bf27b03466c5b25b59ecaba.tar.gz
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
-rw-r--r--.gitignore4
-rw-r--r--loaders/python/Makefile.am24
-rw-r--r--loaders/python/peas-plugin-loader-python.c2
-rw-r--r--loaders/python/peas-python-internal.py (renamed from loaders/python/peas-plugin-loader-python-internal.py)0
-rw-r--r--loaders/python/peas-python.gresource.xml (renamed from loaders/python/peas-plugin-loader-python.gresource.xml)2
-rw-r--r--loaders/python3/Makefile.am18
-rw-r--r--loaders/python3/peas-python3.gresource.xml (renamed from loaders/python3/peas-plugin-loader-python3.gresource.xml)2
7 files changed, 26 insertions, 26 deletions
diff --git a/.gitignore b/.gitignore
index 0435143..9a7932a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
diff --git a/loaders/python/Makefile.am b/loaders/python/Makefile.am
index 843ea2b..c69ef3f 100644
--- a/loaders/python/Makefile.am
+++ b/loaders/python/Makefile.am
@@ -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
diff --git a/loaders/python/peas-plugin-loader-python.c b/loaders/python/peas-plugin-loader-python.c
index e4f4340..36f6172 100644
--- a/loaders/python/peas-plugin-loader-python.c
+++ b/loaders/python/peas-plugin-loader-python.c
@@ -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);
diff --git a/loaders/python/peas-plugin-loader-python-internal.py b/loaders/python/peas-python-internal.py
index 27838a8..27838a8 100644
--- a/loaders/python/peas-plugin-loader-python-internal.py
+++ b/loaders/python/peas-python-internal.py
diff --git a/loaders/python/peas-plugin-loader-python.gresource.xml b/loaders/python/peas-python.gresource.xml
index ebc8595..2e4a25d 100644
--- a/loaders/python/peas-plugin-loader-python.gresource.xml
+++ b/loaders/python/peas-python.gresource.xml
@@ -1,6 +1,6 @@
<?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>
diff --git a/loaders/python3/Makefile.am b/loaders/python3/Makefile.am
index 9c8756e..fb3ee29 100644
--- a/loaders/python3/Makefile.am
+++ b/loaders/python3/Makefile.am
@@ -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
diff --git a/loaders/python3/peas-plugin-loader-python3.gresource.xml b/loaders/python3/peas-python3.gresource.xml
index 314ac6a..af79914 100644
--- a/loaders/python3/peas-plugin-loader-python3.gresource.xml
+++ b/loaders/python3/peas-python3.gresource.xml
@@ -1,6 +1,6 @@
<?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>